diff options
Diffstat (limited to 'drivers/usb/gadget/goku_udc.c')
-rw-r--r-- | drivers/usb/gadget/goku_udc.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/usb/gadget/goku_udc.c b/drivers/usb/gadget/goku_udc.c index 66b81bbf6bee..5378c1757292 100644 --- a/drivers/usb/gadget/goku_udc.c +++ b/drivers/usb/gadget/goku_udc.c | |||
@@ -1850,7 +1850,6 @@ static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id) | |||
1850 | unsigned long resource, len; | 1850 | unsigned long resource, len; |
1851 | void __iomem *base = NULL; | 1851 | void __iomem *base = NULL; |
1852 | int retval; | 1852 | int retval; |
1853 | char buf [8], *bufp; | ||
1854 | 1853 | ||
1855 | /* if you want to support more than one controller in a system, | 1854 | /* if you want to support more than one controller in a system, |
1856 | * usb_gadget_driver_{register,unregister}() must change. | 1855 | * usb_gadget_driver_{register,unregister}() must change. |
@@ -1913,20 +1912,14 @@ static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id) | |||
1913 | pci_set_drvdata(pdev, dev); | 1912 | pci_set_drvdata(pdev, dev); |
1914 | INFO(dev, "%s\n", driver_desc); | 1913 | INFO(dev, "%s\n", driver_desc); |
1915 | INFO(dev, "version: " DRIVER_VERSION " %s\n", dmastr()); | 1914 | INFO(dev, "version: " DRIVER_VERSION " %s\n", dmastr()); |
1916 | #ifndef __sparc__ | 1915 | INFO(dev, "irq %d, pci mem %p\n", pdev->irq, base); |
1917 | scnprintf(buf, sizeof buf, "%d", pdev->irq); | ||
1918 | bufp = buf; | ||
1919 | #else | ||
1920 | bufp = __irq_itoa(pdev->irq); | ||
1921 | #endif | ||
1922 | INFO(dev, "irq %s, pci mem %p\n", bufp, base); | ||
1923 | 1916 | ||
1924 | /* init to known state, then setup irqs */ | 1917 | /* init to known state, then setup irqs */ |
1925 | udc_reset(dev); | 1918 | udc_reset(dev); |
1926 | udc_reinit (dev); | 1919 | udc_reinit (dev); |
1927 | if (request_irq(pdev->irq, goku_irq, SA_SHIRQ/*|SA_SAMPLE_RANDOM*/, | 1920 | if (request_irq(pdev->irq, goku_irq, SA_SHIRQ/*|SA_SAMPLE_RANDOM*/, |
1928 | driver_name, dev) != 0) { | 1921 | driver_name, dev) != 0) { |
1929 | DBG(dev, "request interrupt %s failed\n", bufp); | 1922 | DBG(dev, "request interrupt %d failed\n", pdev->irq); |
1930 | retval = -EBUSY; | 1923 | retval = -EBUSY; |
1931 | goto done; | 1924 | goto done; |
1932 | } | 1925 | } |