diff options
author | David S. Miller <davem@davemloft.net> | 2006-06-20 04:21:29 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2006-06-20 04:21:29 -0400 |
commit | c6387a48cf5958e43c201fc27a158c328927531a (patch) | |
tree | a6c24951d6c86ac47bd3f0ba198adbfffd03291b /drivers/usb/gadget/net2280.c | |
parent | 6a76267f0e52d920e6bb6da75541e6116d7304da (diff) |
[SPARC]: Kill __irq_itoa().
This ugly hack was long overdue to die.
It was a way to print out Sparc interrupts in a more freindly format,
since IRQ numbers were arbitrary opaque 32-bit integers which vectored
into PIL levels. These 32-bit integers were not necessarily in the
0-->NR_IRQS range, but the PILs they vectored to were.
The idea now is that we will increase NR_IRQS a little bit and use a
virtual<-->real IRQ number mapping scheme similar to PowerPC.
That makes this IRQ printing hack irrelevant, and furthermore only a
handful of drivers actually used __irq_itoa() making it even less
useful.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/usb/gadget/net2280.c')
-rw-r--r-- | drivers/usb/gadget/net2280.c | 14 |
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) | |||
2822 | unsigned long resource, len; | 2822 | unsigned long resource, len; |
2823 | void __iomem *base = NULL; | 2823 | void __iomem *base = NULL; |
2824 | int retval, i; | 2824 | int retval, i; |
2825 | char buf [8], *bufp; | ||
2826 | 2825 | ||
2827 | /* if you want to support more than one controller in a system, | 2826 | /* if you want to support more than one controller in a system, |
2828 | * usb_gadget_driver_{register,unregister}() must change. | 2827 | * 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) | |||
2896 | retval = -ENODEV; | 2895 | retval = -ENODEV; |
2897 | goto done; | 2896 | goto done; |
2898 | } | 2897 | } |
2899 | #ifndef __sparc__ | 2898 | |
2900 | scnprintf (buf, sizeof buf, "%d", pdev->irq); | ||
2901 | bufp = buf; | ||
2902 | #else | ||
2903 | bufp = __irq_itoa(pdev->irq); | ||
2904 | #endif | ||
2905 | if (request_irq (pdev->irq, net2280_irq, SA_SHIRQ, driver_name, dev) | 2899 | if (request_irq (pdev->irq, net2280_irq, SA_SHIRQ, driver_name, dev) |
2906 | != 0) { | 2900 | != 0) { |
2907 | ERROR (dev, "request interrupt %s failed\n", bufp); | 2901 | ERROR (dev, "request interrupt %d failed\n", pdev->irq); |
2908 | retval = -EBUSY; | 2902 | retval = -EBUSY; |
2909 | goto done; | 2903 | goto done; |
2910 | } | 2904 | } |
@@ -2953,8 +2947,8 @@ static int net2280_probe (struct pci_dev *pdev, const struct pci_device_id *id) | |||
2953 | 2947 | ||
2954 | /* done */ | 2948 | /* done */ |
2955 | INFO (dev, "%s\n", driver_desc); | 2949 | INFO (dev, "%s\n", driver_desc); |
2956 | INFO (dev, "irq %s, pci mem %p, chip rev %04x\n", | 2950 | INFO (dev, "irq %d, pci mem %p, chip rev %04x\n", |
2957 | bufp, base, dev->chiprev); | 2951 | pdev->irq, base, dev->chiprev); |
2958 | INFO (dev, "version: " DRIVER_VERSION "; dma %s\n", | 2952 | INFO (dev, "version: " DRIVER_VERSION "; dma %s\n", |
2959 | use_dma | 2953 | use_dma |
2960 | ? (use_dma_chaining ? "chaining" : "enabled") | 2954 | ? (use_dma_chaining ? "chaining" : "enabled") |