These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / net / wan / dscc4.c

diff --git a/kernel/drivers/net/wan/dscc4.c b/kernel/drivers/net/wan/dscc4.c
index 0822356..7a72407 100644 (file)
--- a/kernel/drivers/net/wan/dscc4.c
+++ b/kernel/drivers/net/wan/dscc4.c
@@ -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]);
@@ -1046,7 +1046,6 @@ static void dscc4_pci_reset(struct pci_dev *pdev, void __iomem *ioaddr)
 static int dscc4_open(struct net_device *dev)
 {
        struct dscc4_dev_priv *dpriv = dscc4_priv(dev);
-       struct dscc4_pci_priv *ppriv;
        int ret = -EAGAIN;
 
        if ((dscc4_loopback_check(dpriv) < 0))
@@ -1055,8 +1054,6 @@ static int dscc4_open(struct net_device *dev)
        if ((ret = hdlc_open(dev)))
                goto err;
 
-       ppriv = dpriv->pci_priv;
-
        /*
         * Due to various bugs, there is no way to reliably reset a
         * specific port (manufacturer's dependent special PCI #RST wiring