diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2005-11-20 16:35:04 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-11-20 16:35:04 -0800 |
commit | af1e85a51b90c33285e3487409edc11f3850c735 (patch) | |
tree | 4b201e9263e519855781546f85611216e321c609 /usb | |
parent | 3d598405af1b25acadbe84b3e0c40a2476f2e5df (diff) | |
download | patches-af1e85a51b90c33285e3487409edc11f3850c735.tar.gz |
refresh of diff for 2.6.15-rc2
Diffstat (limited to 'usb')
-rw-r--r-- | usb/isp116x-hcd-cleanup.patch | 57 |
1 files changed, 28 insertions, 29 deletions
diff --git a/usb/isp116x-hcd-cleanup.patch b/usb/isp116x-hcd-cleanup.patch index 8b4c150b58340..1621512681754 100644 --- a/usb/isp116x-hcd-cleanup.patch +++ b/usb/isp116x-hcd-cleanup.patch @@ -35,10 +35,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/usb/host/isp116x.h | 83 +++++-- 3 files changed, 230 insertions(+), 288 deletions(-) ---- ---- gregkh-2.6.orig/drivers/usb/host/isp116x.h -+++ gregkh-2.6/drivers/usb/host/isp116x.h -@@ -259,7 +259,7 @@ struct isp116x { +--- gregkh-2.6.orig/drivers/usb/host/isp116x.h 2005-11-20 16:31:05.000000000 -0800 ++++ gregkh-2.6/drivers/usb/host/isp116x.h 2005-11-20 16:32:52.000000000 -0800 +@@ -259,7 +259,7 @@ struct isp116x_platform_data *board; @@ -47,7 +46,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> unsigned long stat1, stat2, stat4, stat8, stat16; /* HC registers */ -@@ -450,7 +450,7 @@ static void isp116x_write_reg32(struct i +@@ -450,7 +450,7 @@ isp116x_write_data32(isp116x, (u32) val); } @@ -56,7 +55,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if ((r) < 0x20) { \ DBG("%-12s[%02x]: %08x\n", #r, \ r, isp116x_read_reg32(d, r)); \ -@@ -459,35 +459,60 @@ static void isp116x_write_reg32(struct i +@@ -459,35 +459,60 @@ r, isp116x_read_reg16(d, r)); \ } \ } @@ -144,8 +143,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } #if defined(URB_TRACE) ---- gregkh-2.6.orig/drivers/usb/host/isp116x-hcd.c -+++ gregkh-2.6/drivers/usb/host/isp116x-hcd.c +--- gregkh-2.6.orig/drivers/usb/host/isp116x-hcd.c 2005-11-20 16:32:51.000000000 -0800 ++++ gregkh-2.6/drivers/usb/host/isp116x-hcd.c 2005-11-20 16:32:52.000000000 -0800 @@ -55,19 +55,13 @@ /* enqueuing/finishing log of urbs */ //#define URB_TRACE @@ -184,7 +183,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define DRIVER_DESC "ISP116x USB Host Controller Driver" MODULE_DESCRIPTION(DRIVER_DESC); -@@ -305,9 +295,8 @@ static void postproc_atl_queue(struct is +@@ -305,9 +295,8 @@ udev = urb->dev; ptd = &ep->ptd; cc = PTD_GET_CC(ptd); @@ -195,7 +194,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* Data underrun is special. For allowed underrun we clear the error and continue as normal. For -@@ -420,7 +409,7 @@ static void postproc_atl_queue(struct is +@@ -420,7 +409,7 @@ ep->nextpid = 0; break; default: @@ -204,7 +203,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } spin_unlock(&urb->lock); } -@@ -628,8 +617,12 @@ static irqreturn_t isp116x_irq(struct us +@@ -628,8 +617,12 @@ u32 intstat = isp116x_read_reg32(isp116x, HCINTSTAT); isp116x_write_reg32(isp116x, HCINTSTAT, intstat); if (intstat & HCINT_UE) { @@ -219,7 +218,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } if (intstat & HCINT_RHSC) /* When root hub or any of its ports is going -@@ -640,7 +633,6 @@ static irqreturn_t isp116x_irq(struct us +@@ -640,7 +633,6 @@ if (intstat & HCINT_RD) { DBG("---- remote wakeup\n"); usb_hcd_resume_root_hub(hcd); @@ -227,7 +226,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } irqstat &= ~HCuPINT_OPR; ret = IRQ_HANDLED; -@@ -651,6 +643,7 @@ static irqreturn_t isp116x_irq(struct us +@@ -651,6 +643,7 @@ } isp116x_write_reg16(isp116x, HCuPINTENB, isp116x->irqenb); @@ -235,7 +234,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> spin_unlock(&isp116x->lock); return ret; } -@@ -724,6 +717,7 @@ static int isp116x_urb_enqueue(struct us +@@ -724,6 +717,7 @@ spin_lock_irqsave(&isp116x->lock, flags); if (!HC_IS_RUNNING(hcd->state)) { @@ -243,7 +242,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> ret = -ENODEV; goto fail; } -@@ -888,7 +882,7 @@ static void isp116x_endpoint_disable(str +@@ -888,7 +882,7 @@ struct usb_host_endpoint *hep) { int i; @@ -252,7 +251,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (!ep) return; -@@ -916,8 +910,6 @@ static int isp116x_get_frame(struct usb_ +@@ -916,8 +910,6 @@ return (int)fmnum; } @@ -261,7 +260,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* Adapted from ohci-hub.c. Currently we don't support autosuspend. */ -@@ -968,11 +960,10 @@ static void isp116x_hub_descriptor(struc +@@ -968,11 +960,10 @@ desc->bHubContrCurrent = 0; desc->bNbrPorts = (u8) (reg & 0x3); /* Power switching, device type, overcurrent. */ @@ -275,7 +274,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> desc->bitmap[1] = ~0; } -@@ -1159,145 +1150,9 @@ static int isp116x_hub_control(struct us +@@ -1159,145 +1150,9 @@ return ret; } @@ -422,7 +421,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static void dump_irq(struct seq_file *s, char *label, u16 mask) { -@@ -1321,13 +1176,9 @@ static void dump_int(struct seq_file *s, +@@ -1321,13 +1176,9 @@ mask & HCINT_SF ? " sof" : "", mask & HCINT_SO ? " so" : ""); } @@ -437,7 +436,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> seq_printf(s, "%s\n%s version %s\n", isp116x_to_hcd(isp116x)->product_desc, hcd_name, -@@ -1343,105 +1194,50 @@ static int proc_isp116x_show(struct seq_ +@@ -1343,105 +1194,50 @@ } spin_lock_irq(&isp116x->lock); @@ -562,7 +561,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /*-----------------------------------------------------------------*/ -@@ -1476,7 +1272,7 @@ static int isp116x_reset(struct usb_hcd +@@ -1476,7 +1272,7 @@ struct isp116x *isp116x = hcd_to_isp116x(hcd); unsigned long t; u16 clkrdy = 0; @@ -571,7 +570,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> ret = isp116x_sw_reset(isp116x); if (ret) -@@ -1492,7 +1288,7 @@ static int isp116x_reset(struct usb_hcd +@@ -1492,7 +1288,7 @@ break; } if (!clkrdy) { @@ -580,7 +579,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* After sw_reset the clock won't report to be ready, if H_WAKEUP pin is high. */ ERR("Please make sure that the H_WAKEUP pin is pulled low!\n"); -@@ -1610,12 +1406,128 @@ static int isp116x_start(struct usb_hcd +@@ -1610,12 +1406,128 @@ isp116x_write_reg32(isp116x, HCRHPORT1, RH_PS_CCS); isp116x_write_reg32(isp116x, HCRHPORT2, RH_PS_CCS); @@ -711,7 +710,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static struct hc_driver isp116x_hc_driver = { .description = hcd_name, -@@ -1745,12 +1657,19 @@ static int __init isp116x_probe(struct p +@@ -1745,12 +1657,19 @@ } ret = usb_add_hcd(hcd, irq, SA_INTERRUPT); @@ -733,7 +732,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> err6: usb_put_hcd(hcd); err5: -@@ -1772,13 +1691,9 @@ static int __init isp116x_probe(struct p +@@ -1772,13 +1691,9 @@ */ static int isp116x_suspend(struct platform_device *dev, pm_message_t state) { @@ -749,7 +748,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } /* -@@ -1786,13 +1701,9 @@ static int isp116x_suspend(struct platfo +@@ -1786,13 +1701,9 @@ */ static int isp116x_resume(struct platform_device *dev) { @@ -765,9 +764,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } #else ---- gregkh-2.6.orig/MAINTAINERS -+++ gregkh-2.6/MAINTAINERS -@@ -2598,6 +2598,12 @@ L: linux-usb-users@lists.sourceforge.net +--- gregkh-2.6.orig/MAINTAINERS 2005-11-20 16:32:28.000000000 -0800 ++++ gregkh-2.6/MAINTAINERS 2005-11-20 16:32:52.000000000 -0800 +@@ -2613,6 +2613,12 @@ L: linux-usb-devel@lists.sourceforge.net S: Maintained |