wan: dscc4: use msecs_to_jiffies for conversions (cbab1510) · Commits · 戴 / test

API compliance scanning with coccinelle flagged: ./drivers/net/wan/dscc4.c:1036:1-33: WARNING: timeout (10) seems HZ dependent ./drivers/net/wan/dscc4.c:554:2-34: WARNING: timeout (10) seems HZ dependent ./drivers/net/wan/dscc4.c:599:2-34: WARNING: timeout (10) seems HZ dependent Numeric constants passed to schedule_timeout_*() make the effective timeout HZ dependent which does not seem to be the intent here. Fixed up by converting the constant to jiffies with msecs_to_jiffies(), passing 100ms (assuming HZ==100 in the original code). Signed-off-by:

Nicholas Mc Guire <hofrat@osadl.org> Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/wan/dscc4.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -551,7 +551,7 @@ static int dscc4_wait_ack_cec(struct dscc4_dev_priv *dpriv,
		msg, i);
		goto done;
		}
		schedule_timeout_uninterruptible(10);
		schedule_timeout_uninterruptible(msecs_to_jiffies(100));
		rmb();
		} while (++i > 0);
		netdev_err(dev, "%s timeout\n", msg);
		@@ -596,7 +596,7 @@ static inline int dscc4_xpr_ack(struct dscc4_dev_priv *dpriv)
		(dpriv->iqtx[cur] & cpu_to_le32(Xpr)))
		break;
		smp_rmb();
		schedule_timeout_uninterruptible(10);
		schedule_timeout_uninterruptible(msecs_to_jiffies(100));
		} while (++i > 0);

		return (i >= 0 ) ? i : -EAGAIN;
		@@ -1033,7 +1033,7 @@ static void dscc4_pci_reset(struct pci_dev pdev, void __iomem ioaddr)
		/* Flush posted writes */
		readl(ioaddr + GSTAR);

		schedule_timeout_uninterruptible(10);
		schedule_timeout_uninterruptible(msecs_to_jiffies(100));

		for (i = 0; i < 16; i++)
		pci_write_config_dword(pdev, i << 2, dscc4_pci_config_store[i]);

Admin message