Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / drivers / net / smc91x.c

diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c
index d0ef80a..f2051b2 100644 (file)
--- a/drivers/net/smc91x.c
+++ b/drivers/net/smc91x.c
@@ -132,6 +132,7 @@ module_param(watchdog, int, 0400);
 MODULE_PARM_DESC(watchdog, "transmit timeout in milliseconds");
 
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:smc91x");
 
 /*
  * The internal workings of the driver.  If you are changing anything
@@ -1015,15 +1016,8 @@ static void smc_phy_powerdown(struct net_device *dev)
 
        /* We need to ensure that no calls to smc_phy_configure are
           pending.
-
-          flush_scheduled_work() cannot be called because we are
-          running with the netlink semaphore held (from
-          devinet_ioctl()) and the pending work queue contains
-          linkwatch_event() (scheduled by netif_carrier_off()
-          above). linkwatch_event() also wants the netlink semaphore.
        */
-       while(lp->work_pending)
-               yield();
+       cancel_work_sync(&lp->phy_configure);
 
        bmcr = smc_phy_read(dev, phy, MII_BMCR);
        smc_phy_write(dev, phy, MII_BMCR, bmcr | BMCR_PDOWN);
@@ -1160,7 +1154,6 @@ static void smc_phy_configure(struct work_struct *work)
 smc_phy_configure_exit:
        SMC_SELECT_BANK(lp, 2);
        spin_unlock_irq(&lp->lock);
-       lp->work_pending = 0;
 }
 
 /*
@@ -1326,9 +1319,11 @@ static irqreturn_t smc_interrupt(int irq, void *dev_id)
        SMC_SET_INT_MASK(lp, mask);
        spin_unlock(&lp->lock);
 
+#ifndef CONFIG_NET_POLL_CONTROLLER
        if (timeout == MAX_IRQ_LOOPS)
                PRINTK("%s: spurious interrupt (mask = 0x%02x)\n",
                       dev->name, mask);
+#endif
        DBG(3, "%s: Interrupt done (%d loops)\n",
               dev->name, MAX_IRQ_LOOPS - timeout);
 
@@ -1386,11 +1381,8 @@ static void smc_timeout(struct net_device *dev)
         * smc_phy_configure() calls msleep() which calls schedule_timeout()
         * which calls schedule().  Hence we use a work queue.
         */
-       if (lp->phy_type != 0) {
-               if (schedule_work(&lp->phy_configure)) {
-                       lp->work_pending = 1;
-               }
-       }
+       if (lp->phy_type != 0)
+               schedule_work(&lp->phy_configure);
 
        /* We can accept TX packets again */
        dev->trans_start = jiffies;
@@ -1997,6 +1989,8 @@ err_out:
 
 static int smc_enable_device(struct platform_device *pdev)
 {
+       struct net_device *ndev = platform_get_drvdata(pdev);
+       struct smc_local *lp = netdev_priv(ndev);
        unsigned long flags;
        unsigned char ecor, ecsr;
        void __iomem *addr;
@@ -2039,7 +2033,7 @@ static int smc_enable_device(struct platform_device *pdev)
         * Set the appropriate byte/word mode.
         */
        ecsr = readb(addr + (ECSR << SMC_IO_SHIFT)) & ~ECSR_IOIS8;
-       if (!SMC_CAN_USE_16BIT)
+       if (!SMC_16BIT(lp))
                ecsr |= ECSR_IOIS8;
        writeb(ecsr, addr + (ECSR << SMC_IO_SHIFT));
        local_irq_restore(flags);
@@ -2124,10 +2118,11 @@ static void smc_release_datacs(struct platform_device *pdev, struct net_device *
  */
 static int smc_drv_probe(struct platform_device *pdev)
 {
+       struct smc91x_platdata *pd = pdev->dev.platform_data;
+       struct smc_local *lp;
        struct net_device *ndev;
        struct resource *res, *ires;
        unsigned int __iomem *addr;
-       unsigned long irq_flags = SMC_IRQ_FLAGS;
        int ret;
 
        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "smc91x-regs");
@@ -2152,6 +2147,27 @@ static int smc_drv_probe(struct platform_device *pdev)
        }
        SET_NETDEV_DEV(ndev, &pdev->dev);
 
+       /* get configuration from platform data, only allow use of
+        * bus width if both SMC_CAN_USE_xxx and SMC91X_USE_xxx are set.
+        */
+
+       lp = netdev_priv(ndev);
+       lp->cfg.irq_flags = SMC_IRQ_FLAGS;
+
+#ifdef SMC_DYNAMIC_BUS_CONFIG
+       if (pd)
+               memcpy(&lp->cfg, pd, sizeof(lp->cfg));
+       else {
+               lp->cfg.flags = SMC91X_USE_8BIT;
+               lp->cfg.flags |= SMC91X_USE_16BIT;
+               lp->cfg.flags |= SMC91X_USE_32BIT;
+       }
+
+       lp->cfg.flags &= ~(SMC_CAN_USE_8BIT ? 0 : SMC91X_USE_8BIT);
+       lp->cfg.flags &= ~(SMC_CAN_USE_16BIT ? 0 : SMC91X_USE_16BIT);
+       lp->cfg.flags &= ~(SMC_CAN_USE_32BIT ? 0 : SMC91X_USE_32BIT);
+#endif
+
        ndev->dma = (unsigned char)-1;
 
        ires = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
@@ -2162,7 +2178,7 @@ static int smc_drv_probe(struct platform_device *pdev)
 
        ndev->irq = ires->start;
        if (SMC_IRQ_FLAGS == -1)
-               irq_flags = ires->flags & IRQF_TRIGGER_MASK;
+               lp->cfg.irq_flags = ires->flags & IRQF_TRIGGER_MASK;
 
        ret = smc_request_attrib(pdev);
        if (ret)
@@ -2170,6 +2186,7 @@ static int smc_drv_probe(struct platform_device *pdev)
 #if defined(CONFIG_SA1100_ASSABET)
        NCR_0 |= NCR_ENET_OSC_EN;
 #endif
+       platform_set_drvdata(pdev, ndev);
        ret = smc_enable_device(pdev);
        if (ret)
                goto out_release_attrib;
@@ -2188,8 +2205,7 @@ static int smc_drv_probe(struct platform_device *pdev)
        }
 #endif
 
-       platform_set_drvdata(pdev, ndev);
-       ret = smc_probe(ndev, addr, irq_flags);
+       ret = smc_probe(ndev, addr, lp->cfg.irq_flags);
        if (ret != 0)
                goto out_iounmap;
 
@@ -2282,6 +2298,7 @@ static struct platform_driver smc_driver = {
        .resume         = smc_drv_resume,
        .driver         = {
                .name   = CARDNAME,
+               .owner  = THIS_MODULE,
        },
 };