Merge branch 'master' into upstream

7 files changed, 41 insertions, 43 deletions

diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index 274b0138d442..e27778926eba 100644
--- a/drivers/net/3c59x.c
+++ b/drivers/net/3c59x.c
@@ -1382,17 +1382,12 @@ static int __devinit vortex_probe1(struct device *gendev,
         for (i = 0; i < 6; i++)
                 iowrite8(dev->dev_addr[i], ioaddr + i);
 
-#ifdef __sparc__
-        if (print_info)
-                printk(", IRQ %s\n", __irq_itoa(dev->irq));
-#else
         if (print_info)
                 printk(", IRQ %d\n", dev->irq);
         /* Tell them about an invalid IRQ. */
         if (dev->irq <= 0 || dev->irq >= NR_IRQS)
                 printk(KERN_WARNING " *** Warning: IRQ %d is unlikely to work! ***\n",
                            dev->irq);
-#endif
 
         EL3WINDOW(4);
         step = (ioread8(ioaddr + Wn4_NetDiag) & 0x1e) >> 1;
diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c
index b508812e97ac..23ff22ba5d31 100644
--- a/drivers/net/acenic.c
+++ b/drivers/net/acenic.c
@@ -579,11 +579,7 @@ static int __devinit acenic_probe_one(struct pci_dev *pdev,
         }
 
         printk("Gigabit Ethernet at 0x%08lx, ", dev->base_addr);
-#ifdef __sparc__
-        printk("irq %s\n", __irq_itoa(pdev->irq));
-#else
-        printk("irq %i\n", pdev->irq);
-#endif
+        printk("irq %d\n", pdev->irq);
 
 #ifdef CONFIG_ACENIC_OMIT_TIGON_I
         if ((readl(&ap->regs->HostCtrl) >> 28) == 4) {
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 04a53f1dfdbd..62b38a4494b8 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -2991,13 +2991,13 @@ static int nv_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
         netif_carrier_off(dev);
         if (netif_running(dev)) {
                 nv_disable_irq(dev);
-                spin_lock_bh(&dev->xmit_lock);
+                netif_tx_lock_bh(dev);
                 spin_lock(&np->lock);
                 /* stop engines */
                 nv_stop_rx(dev);
                 nv_stop_tx(dev);
                 spin_unlock(&np->lock);
-                spin_unlock_bh(&dev->xmit_lock);
+                netif_tx_unlock_bh(dev);
         }
 
         if (ecmd->autoneg == AUTONEG_ENABLE) {
@@ -3131,13 +3131,13 @@ static int nv_nway_reset(struct net_device *dev)
                 netif_carrier_off(dev);
                 if (netif_running(dev)) {
                         nv_disable_irq(dev);
-                        spin_lock_bh(&dev->xmit_lock);
+                        netif_tx_lock_bh(dev);
                         spin_lock(&np->lock);
                         /* stop engines */
                         nv_stop_rx(dev);
                         nv_stop_tx(dev);
                         spin_unlock(&np->lock);
-                        spin_unlock_bh(&dev->xmit_lock);
+                        netif_tx_unlock_bh(dev);
                         printk(KERN_INFO "%s: link down.\n", dev->name);
                 }
 
@@ -3244,7 +3244,7 @@ static int nv_set_ringparam(struct net_device *dev, struct ethtool_ringparam* ri
 
         if (netif_running(dev)) {
                 nv_disable_irq(dev);
-                spin_lock_bh(&dev->xmit_lock);
+                netif_tx_lock_bh(dev);
                 spin_lock(&np->lock);
                 /* stop engines */
                 nv_stop_rx(dev);
@@ -3303,7 +3303,7 @@ static int nv_set_ringparam(struct net_device *dev, struct ethtool_ringparam* ri
                 nv_start_rx(dev);
                 nv_start_tx(dev);
                 spin_unlock(&np->lock);
-                spin_unlock_bh(&dev->xmit_lock);
+                netif_tx_unlock_bh(dev);
                 nv_enable_irq(dev);
         }
         return 0;
@@ -3339,13 +3339,13 @@ static int nv_set_pauseparam(struct net_device *dev, struct ethtool_pauseparam*
         netif_carrier_off(dev);
         if (netif_running(dev)) {
                 nv_disable_irq(dev);
-                spin_lock_bh(&dev->xmit_lock);
+                netif_tx_lock_bh(dev);
                 spin_lock(&np->lock);
                 /* stop engines */
                 nv_stop_rx(dev);
                 nv_stop_tx(dev);
                 spin_unlock(&np->lock);
-                spin_unlock_bh(&dev->xmit_lock);
+                netif_tx_unlock_bh(dev);
         }
 
         np->pause_flags &= ~(NV_PAUSEFRAME_RX_REQ|NV_PAUSEFRAME_TX_REQ);
@@ -3729,7 +3729,7 @@ static void nv_self_test(struct net_device *dev, struct ethtool_test *test, u64
         if (test->flags & ETH_TEST_FL_OFFLINE) {
                 if (netif_running(dev)) {
                         netif_stop_queue(dev);
-                        spin_lock_bh(&dev->xmit_lock);
+                        netif_tx_lock_bh(dev);
                         spin_lock_irq(&np->lock);
                         nv_disable_hw_interrupts(dev, np->irqmask);
                         if (!(np->msi_flags & NV_MSI_X_ENABLED)) {
@@ -3745,7 +3745,7 @@ static void nv_self_test(struct net_device *dev, struct ethtool_test *test, u64
                         nv_drain_rx(dev);
                         nv_drain_tx(dev);
                         spin_unlock_irq(&np->lock);
-                        spin_unlock_bh(&dev->xmit_lock);
+                        netif_tx_unlock_bh(dev);
                 }
 
                 if (!nv_register_test(dev)) {
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index e1feb58bd661..1a2b9785e998 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -2120,7 +2120,7 @@ abort_linearize:
                 goto drop;
         }
 
-        if (skb_linearize(skb, GFP_ATOMIC))
+        if (skb_linearize(skb))
                 goto drop;
 
         mgp->tx_linearized++;
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h
index f72a4f57905a..bf776125ca38 100644
--- a/drivers/net/smc91x.h
+++ b/drivers/net/smc91x.h
@@ -260,15 +260,17 @@ SMC_outw(u16 val, void __iomem *ioaddr, int reg)
 #define RPC_LSA_DEFAULT         RPC_LED_TX_RX
 #define RPC_LSB_DEFAULT         RPC_LED_100_10
 
-#elif   defined(CONFIG_MACH_LPD7A400) || defined(CONFIG_MACH_LPD7A404)
+#elif   defined(CONFIG_MACH_LPD79520) \
+     || defined(CONFIG_MACH_LPD7A400) \
+     || defined(CONFIG_MACH_LPD7A404)
 
-/* The LPD7A40X_IOBARRIER is necessary to overcome a mismatch between
- * the way that the CPU handles chip selects and the way that the SMC
- * chip expects the chip select to operate.  Refer to
+/* The LPD7X_IOBARRIER is necessary to overcome a mismatch between the
+ * way that the CPU handles chip selects and the way that the SMC chip
+ * expects the chip select to operate.  Refer to
  * Documentation/arm/Sharp-LH/IOBarrier for details.  The read from
- * IOBARRIER is a byte as a least-common denominator of possible
- * regions to use as the barrier.  It would be wasteful to read 32
- * bits from a byte oriented region.
+ * IOBARRIER is a byte, in order that we read the least-common
+ * denominator.  It would be wasteful to read 32 bits from an 8-bit
+ * accessible region.
  *
  * There is no explicit protection against interrupts intervening
  * between the writew and the IOBARRIER.  In SMC ISR there is a
@@ -287,25 +289,35 @@ SMC_outw(u16 val, void __iomem *ioaddr, int reg)
 #define SMC_CAN_USE_16BIT       1
 #define SMC_CAN_USE_32BIT       0
 #define SMC_NOWAIT              0
-#define LPD7A40X_IOBARRIER      readb (IOBARRIER_VIRT)
+#define LPD7X_IOBARRIER         readb (IOBARRIER_VIRT)
 
-#define SMC_inw(a,r)            readw ((void*) ((a) + (r)))
-#define SMC_insw(a,r,p,l)       readsw ((void*) ((a) + (r)), p, l)
-#define SMC_outw(v,a,r)      ({ writew ((v), (a) + (r)); LPD7A40X_IOBARRIER; })
+#define SMC_inw(a,r)\
+   ({ unsigned short v = readw ((void*) ((a) + (r))); LPD7X_IOBARRIER; v; })
+#define SMC_outw(v,a,r)   ({ writew ((v), (a) + (r)); LPD7X_IOBARRIER; })
 
-#define SMC_outsw               LPD7A40X_SMC_outsw
+#define SMC_insw                LPD7_SMC_insw
+static inline void LPD7_SMC_insw (unsigned char* a, int r,
+                                  unsigned char* p, int l)
+{
+        unsigned short* ps = (unsigned short*) p;
+        while (l-- > 0) {
+                *ps++ = readw (a + r);
+                LPD7X_IOBARRIER;
+        }
+}
 
-static inline void LPD7A40X_SMC_outsw(unsigned long a, int r,
-                                     unsigned char* p, int l)
+#define SMC_outsw               LPD7_SMC_outsw
+static inline void LPD7_SMC_outsw (unsigned char* a, int r,
+                                   unsigned char* p, int l)
 {
         unsigned short* ps = (unsigned short*) p;
         while (l-- > 0) {
                 writew (*ps++, a + r);
-                LPD7A40X_IOBARRIER;
+                LPD7X_IOBARRIER;
         }
 }
 
-#define SMC_INTERRUPT_PREAMBLE  LPD7A40X_IOBARRIER
+#define SMC_INTERRUPT_PREAMBLE  LPD7X_IOBARRIER
 
 #define RPC_LSA_DEFAULT         RPC_LED_TX_RX
 #define RPC_LSB_DEFAULT         RPC_LED_100_10
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c
index 9f046cae2f71..bd5d2668a362 100644
--- a/drivers/net/sunhme.c
+++ b/drivers/net/sunhme.c
@@ -2221,13 +2221,8 @@ static int happy_meal_open(struct net_device *dev)
                 if (request_irq(dev->irq, &happy_meal_interrupt,
                                 SA_SHIRQ, dev->name, (void *)dev)) {
                         HMD(("EAGAIN\n"));
-#ifdef __sparc__
-                        printk(KERN_ERR "happy_meal(SBUS): Can't order irq %s to go.\n",
-                               __irq_itoa(dev->irq));
-#else
                         printk(KERN_ERR "happy_meal(SBUS): Can't order irq %d to go.\n",
                                dev->irq);
-#endif
 
                         return -EAGAIN;
                 }
diff --git a/drivers/net/sunlance.c b/drivers/net/sunlance.c
index b7d87d4690b4..6381243d8d00 100644
--- a/drivers/net/sunlance.c
+++ b/drivers/net/sunlance.c
@@ -936,7 +936,7 @@ static int lance_open(struct net_device *dev)
 
         if (request_irq(dev->irq, &lance_interrupt, SA_SHIRQ,
                         lancestr, (void *) dev)) {
-                printk(KERN_ERR "Lance: Can't get irq %s\n", __irq_itoa(dev->irq));
+                printk(KERN_ERR "Lance: Can't get irq %d\n", dev->irq);
                 return -EAGAIN;
         }