Title: [4209] trunk/drivers/usb/host: Apply Patch [#3581] isp1362 issues
- Revision
- 4209
- Author
- hennerich
- Date
- 2008-02-01 06:24:17 -0600 (Fri, 01 Feb 2008)
Log Message
Apply Patch [#3581] isp1362 issues
Submitted By: Vitja Makarov
isp1362 couldn't be compile as module, as it use usb_alloc_dev()
that isn't exported. So this patch:
1. use of usb_alloc_dev() removed
2. renamed deprecated interrupt flags
Diffstat
isp1362-hcd.c | 15 +--------------
isp1362.h | 4 +++-
2 files changed, 4 insertions(+), 15 deletions(-)
Modified Paths
Diff
Modified: trunk/drivers/usb/host/isp1362-hcd.c (4208 => 4209)
--- trunk/drivers/usb/host/isp1362-hcd.c 2008-02-01 10:06:38 UTC (rev 4208)
+++ trunk/drivers/usb/host/isp1362-hcd.c 2008-02-01 12:24:17 UTC (rev 4209)
@@ -1692,10 +1692,6 @@
}
tmp = isp1362_hcd->rhport[--wIndex];
put_unaligned (cpu_to_le32(tmp), (__le32 *) buf);
-#ifndef VERBOSE
- if (*(u16 *) (buf + 2)) /* only if wPortChange is interesting */
-#endif
- DBG(0, "GetPortStatus: port[%d] %08x\n", wIndex + 1, tmp);
break;
case ClearPortFeature:
DBG(0, "ClearPortFeature: ");
@@ -2623,7 +2619,6 @@
int ret;
struct isp1362_hcd *isp1362_hcd = hcd_to_isp1362_hcd(hcd);
struct isp1362_platform_data *board = isp1362_hcd->board;
- struct usb_device *udev;
u16 hwcfg;
u16 chipid;
unsigned long flags;
@@ -2714,15 +2709,7 @@
spin_unlock_irqrestore(&isp1362_hcd->lock, flags);
- udev = usb_alloc_dev(NULL, &hcd->self, 0);
- if (!udev) {
- isp1362_hc_stop(hcd);
- return -ENOMEM;
- }
-
isp1362_hcd->hc_control = OHCI_USB_OPER;
-
- udev->speed = USB_SPEED_FULL;
hcd->state = HC_STATE_RUNNING;
spin_lock_irqsave(&isp1362_hcd->lock, flags);
@@ -2905,7 +2892,7 @@
}
#endif
- retval = usb_add_hcd(hcd, irq, IRQF_TRIGGER_LOW | SA_INTERRUPT | SA_SHIRQ);
+ retval = usb_add_hcd(hcd, irq, IRQF_TRIGGER_LOW | IRQF_DISABLED | IRQF_SHARED);
if (retval != 0) {
goto err6;
}
Modified: trunk/drivers/usb/host/isp1362.h (4208 => 4209)
--- trunk/drivers/usb/host/isp1362.h 2008-02-01 10:06:38 UTC (rev 4208)
+++ trunk/drivers/usb/host/isp1362.h 2008-02-01 12:24:17 UTC (rev 4209)
@@ -41,7 +41,9 @@
#define USE_PLATFORM_DELAY 0
#define USE_NDELAY 1
-#define DUMMY_DELAY_ACCESS bfin_read16(ASYNC_BANK0_BASE)
+#define DUMMY_DELAY_ACCESS do { bfin_read16(ASYNC_BANK0_BASE); bfin_read16(ASYNC_BANK0_BASE); \
+ bfin_read16(ASYNC_BANK0_BASE); \
+ } while (0)
#undef insw
#undef outsw
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
http://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
