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/core | |
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/core')
-rw-r--r-- | drivers/usb/core/hcd.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c index e2e00ba4e1e6..4bf914d00a14 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c | |||
@@ -1826,24 +1826,16 @@ int usb_add_hcd(struct usb_hcd *hcd, | |||
1826 | 1826 | ||
1827 | /* enable irqs just before we start the controller */ | 1827 | /* enable irqs just before we start the controller */ |
1828 | if (hcd->driver->irq) { | 1828 | if (hcd->driver->irq) { |
1829 | char buf[8], *bufp = buf; | ||
1830 | |||
1831 | #ifdef __sparc__ | ||
1832 | bufp = __irq_itoa(irqnum); | ||
1833 | #else | ||
1834 | sprintf(buf, "%d", irqnum); | ||
1835 | #endif | ||
1836 | |||
1837 | snprintf(hcd->irq_descr, sizeof(hcd->irq_descr), "%s:usb%d", | 1829 | snprintf(hcd->irq_descr, sizeof(hcd->irq_descr), "%s:usb%d", |
1838 | hcd->driver->description, hcd->self.busnum); | 1830 | hcd->driver->description, hcd->self.busnum); |
1839 | if ((retval = request_irq(irqnum, &usb_hcd_irq, irqflags, | 1831 | if ((retval = request_irq(irqnum, &usb_hcd_irq, irqflags, |
1840 | hcd->irq_descr, hcd)) != 0) { | 1832 | hcd->irq_descr, hcd)) != 0) { |
1841 | dev_err(hcd->self.controller, | 1833 | dev_err(hcd->self.controller, |
1842 | "request interrupt %s failed\n", bufp); | 1834 | "request interrupt %d failed\n", irqnum); |
1843 | goto err_request_irq; | 1835 | goto err_request_irq; |
1844 | } | 1836 | } |
1845 | hcd->irq = irqnum; | 1837 | hcd->irq = irqnum; |
1846 | dev_info(hcd->self.controller, "irq %s, %s 0x%08llx\n", bufp, | 1838 | dev_info(hcd->self.controller, "irq %d, %s 0x%08llx\n", irqnum, |
1847 | (hcd->driver->flags & HCD_MEMORY) ? | 1839 | (hcd->driver->flags & HCD_MEMORY) ? |
1848 | "io mem" : "io base", | 1840 | "io mem" : "io base", |
1849 | (unsigned long long)hcd->rsrc_start); | 1841 | (unsigned long long)hcd->rsrc_start); |