Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Update defconfig.
  [SPARC64]: Don't double-export synchronize_irq.
  [SPARC64]: Move over to GENERIC_HARDIRQS.
  [SPARC64]: Virtualize IRQ numbers.
  [SPARC64]: Kill ino_bucket->pil
  [SPARC]: Kill __irq_itoa().
  [SPARC64]: bp->pil can never be zero
  [SPARC64]: Send all device interrupts via one PIL.
  [SPARC]: Fix iommu_flush_iotlb end address
  [SPARC]: Mark smp init functions as cpuinit
  [SPARC]: Add missing rw can_lock macros
  [SPARC]: Setup cpu_possible_map
  [SPARC]: Add topology_init()

1 files changed, 4 insertions, 10 deletions

diff --git a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/net2280.c
index 0b9293493957..020d3c42b1af 100644
--- a/drivers/usb/gadget/net2280.c
+++ b/drivers/usb/gadget/net2280.c
@@ -2822,7 +2822,6 @@ static int net2280_probe (struct pci_dev *pdev, const struct pci_device_id *id)
         unsigned long           resource, len;
         void                    __iomem *base = NULL;
         int                     retval, i;
-        char                    buf [8], *bufp;
 
         /* if you want to support more than one controller in a system,
          * usb_gadget_driver_{register,unregister}() must change.
@@ -2896,15 +2895,10 @@ static int net2280_probe (struct pci_dev *pdev, const struct pci_device_id *id)
                 retval = -ENODEV;
                 goto done;
         }
-#ifndef __sparc__
-        scnprintf (buf, sizeof buf, "%d", pdev->irq);
-        bufp = buf;
-#else
-        bufp = __irq_itoa(pdev->irq);
-#endif
+
         if (request_irq (pdev->irq, net2280_irq, SA_SHIRQ, driver_name, dev)
                         != 0) {
-                ERROR (dev, "request interrupt %s failed\n", bufp);
+                ERROR (dev, "request interrupt %d failed\n", pdev->irq);
                 retval = -EBUSY;
                 goto done;
         }
@@ -2953,8 +2947,8 @@ static int net2280_probe (struct pci_dev *pdev, const struct pci_device_id *id)
 
         /* done */
         INFO (dev, "%s\n", driver_desc);
-        INFO (dev, "irq %s, pci mem %p, chip rev %04x\n",
-                        bufp, base, dev->chiprev);
+        INFO (dev, "irq %d, pci mem %p, chip rev %04x\n",
+                        pdev->irq, base, dev->chiprev);
         INFO (dev, "version: " DRIVER_VERSION "; dma %s\n",
                         use_dma
                                 ? (use_dma_chaining ? "chaining" : "enabled")