git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
usb
/
gadget
/
goku_udc.c
diff --git
a/drivers/usb/gadget/goku_udc.c
b/drivers/usb/gadget/goku_udc.c
index
66b81bb
..
7cf2999
100644
(file)
--- a/
drivers/usb/gadget/goku_udc.c
+++ b/
drivers/usb/gadget/goku_udc.c
@@
-24,7
+24,6
@@
// #define VERBOSE /* extra debug messages (success too) */
// #define USB_TRACE /* packet-level success messages */
// #define VERBOSE /* extra debug messages (success too) */
// #define USB_TRACE /* packet-level success messages */
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
@@
-1850,7
+1849,6
@@
static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id)
unsigned long resource, len;
void __iomem *base = NULL;
int retval;
unsigned long resource, len;
void __iomem *base = NULL;
int retval;
- char buf [8], *bufp;
/* if you want to support more than one controller in a system,
* usb_gadget_driver_{register,unregister}() must change.
/* if you want to support more than one controller in a system,
* usb_gadget_driver_{register,unregister}() must change.
@@
-1913,20
+1911,14
@@
static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id)
pci_set_drvdata(pdev, dev);
INFO(dev, "%s\n", driver_desc);
INFO(dev, "version: " DRIVER_VERSION " %s\n", dmastr());
pci_set_drvdata(pdev, dev);
INFO(dev, "%s\n", driver_desc);
INFO(dev, "version: " DRIVER_VERSION " %s\n", dmastr());
-#ifndef __sparc__
- scnprintf(buf, sizeof buf, "%d", pdev->irq);
- bufp = buf;
-#else
- bufp = __irq_itoa(pdev->irq);
-#endif
- INFO(dev, "irq %s, pci mem %p\n", bufp, base);
+ INFO(dev, "irq %d, pci mem %p\n", pdev->irq, base);
/* init to known state, then setup irqs */
udc_reset(dev);
udc_reinit (dev);
/* init to known state, then setup irqs */
udc_reset(dev);
udc_reinit (dev);
- if (request_irq(pdev->irq, goku_irq,
SA_SHIRQ/*|SA
_SAMPLE_RANDOM*/,
+ if (request_irq(pdev->irq, goku_irq,
IRQF_SHARED/*|IRQF
_SAMPLE_RANDOM*/,
driver_name, dev) != 0) {
driver_name, dev) != 0) {
- DBG(dev, "request interrupt %
s failed\n", bufp
);
+ DBG(dev, "request interrupt %
d failed\n", pdev->irq
);
retval = -EBUSY;
goto done;
}
retval = -EBUSY;
goto done;
}