2.6.15-git2 refresh and new usb build fix patch

2 files changed, 59 insertions, 28 deletions

diff --git a/usb/isp116x-hcd-cleanup.patch b/usb/isp116x-hcd-cleanup.patch
index 839ddc0775e15..8b4c150b58340 100644
--- a/usb/isp116x-hcd-cleanup.patch
+++ b/usb/isp116x-hcd-cleanup.patch
@@ -35,9 +35,10 @@ 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	2005-11-12 21:03:01.000000000 -0800
-+++ gregkh-2.6/drivers/usb/host/isp116x.h	2005-11-12 21:07:01.000000000 -0800
-@@ -259,7 +259,7 @@
+---
+--- gregkh-2.6.orig/drivers/usb/host/isp116x.h
++++ gregkh-2.6/drivers/usb/host/isp116x.h
+@@ -259,7 +259,7 @@ struct isp116x {
  
  	struct isp116x_platform_data *board;
  
@@ -46,7 +47,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	unsigned long stat1, stat2, stat4, stat8, stat16;
  
  	/* HC registers */
-@@ -450,7 +450,7 @@
+@@ -450,7 +450,7 @@ static void isp116x_write_reg32(struct i
  	isp116x_write_data32(isp116x, (u32) val);
  }
  
@@ -55,7 +56,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 @@
+@@ -459,35 +459,60 @@ static void isp116x_write_reg32(struct i
  			r, isp116x_read_reg16(d, r));	    	\
  	}							\
  }
@@ -143,8 +144,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  }
  
  #if defined(URB_TRACE)
---- gregkh-2.6.orig/drivers/usb/host/isp116x-hcd.c	2005-11-12 21:07:01.000000000 -0800
-+++ gregkh-2.6/drivers/usb/host/isp116x-hcd.c	2005-11-12 21:07:01.000000000 -0800
+--- gregkh-2.6.orig/drivers/usb/host/isp116x-hcd.c
++++ gregkh-2.6/drivers/usb/host/isp116x-hcd.c
 @@ -55,19 +55,13 @@
  /* enqueuing/finishing log of urbs */
  //#define URB_TRACE
@@ -183,7 +184,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 @@
+@@ -305,9 +295,8 @@ static void postproc_atl_queue(struct is
  		udev = urb->dev;
  		ptd = &ep->ptd;
  		cc = PTD_GET_CC(ptd);
@@ -194,7 +195,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 @@
+@@ -420,7 +409,7 @@ static void postproc_atl_queue(struct is
  			ep->nextpid = 0;
  			break;
  		default:
@@ -203,7 +204,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  		}
  		spin_unlock(&urb->lock);
  	}
-@@ -628,8 +617,12 @@
+@@ -628,8 +617,12 @@ static irqreturn_t isp116x_irq(struct us
  		u32 intstat = isp116x_read_reg32(isp116x, HCINTSTAT);
  		isp116x_write_reg32(isp116x, HCINTSTAT, intstat);
  		if (intstat & HCINT_UE) {
@@ -218,7 +219,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 @@
+@@ -640,7 +633,6 @@ static irqreturn_t isp116x_irq(struct us
  		if (intstat & HCINT_RD) {
  			DBG("---- remote wakeup\n");
  			usb_hcd_resume_root_hub(hcd);
@@ -226,7 +227,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  		}
  		irqstat &= ~HCuPINT_OPR;
  		ret = IRQ_HANDLED;
-@@ -651,6 +643,7 @@
+@@ -651,6 +643,7 @@ static irqreturn_t isp116x_irq(struct us
  	}
  
  	isp116x_write_reg16(isp116x, HCuPINTENB, isp116x->irqenb);
@@ -234,7 +235,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	spin_unlock(&isp116x->lock);
  	return ret;
  }
-@@ -724,6 +717,7 @@
+@@ -724,6 +717,7 @@ static int isp116x_urb_enqueue(struct us
  
  	spin_lock_irqsave(&isp116x->lock, flags);
  	if (!HC_IS_RUNNING(hcd->state)) {
@@ -242,7 +243,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  		ret = -ENODEV;
  		goto fail;
  	}
-@@ -888,7 +882,7 @@
+@@ -888,7 +882,7 @@ static void isp116x_endpoint_disable(str
  				     struct usb_host_endpoint *hep)
  {
  	int i;
@@ -251,7 +252,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  	if (!ep)
  		return;
-@@ -916,8 +910,6 @@
+@@ -916,8 +910,6 @@ static int isp116x_get_frame(struct usb_
  	return (int)fmnum;
  }
  
@@ -260,7 +261,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 @@
+@@ -968,11 +960,10 @@ static void isp116x_hub_descriptor(struc
  	desc->bHubContrCurrent = 0;
  	desc->bNbrPorts = (u8) (reg & 0x3);
  	/* Power switching, device type, overcurrent. */
@@ -274,7 +275,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	desc->bitmap[1] = ~0;
  }
  
-@@ -1159,145 +1150,9 @@
+@@ -1159,145 +1150,9 @@ static int isp116x_hub_control(struct us
  	return ret;
  }
  
@@ -421,7 +422,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 @@
+@@ -1321,13 +1176,9 @@ static void dump_int(struct seq_file *s,
  		   mask & HCINT_SF ? " sof" : "", mask & HCINT_SO ? " so" : "");
  }
  
@@ -436,7 +437,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 @@
+@@ -1343,105 +1194,50 @@ static int proc_isp116x_show(struct seq_
  	}
  
  	spin_lock_irq(&isp116x->lock);
@@ -561,7 +562,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  /*-----------------------------------------------------------------*/
  
-@@ -1476,7 +1272,7 @@
+@@ -1476,7 +1272,7 @@ static int isp116x_reset(struct usb_hcd 
  	struct isp116x *isp116x = hcd_to_isp116x(hcd);
  	unsigned long t;
  	u16 clkrdy = 0;
@@ -570,7 +571,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  	ret = isp116x_sw_reset(isp116x);
  	if (ret)
-@@ -1492,7 +1288,7 @@
+@@ -1492,7 +1288,7 @@ static int isp116x_reset(struct usb_hcd 
  			break;
  	}
  	if (!clkrdy) {
@@ -579,7 +580,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 @@
+@@ -1610,12 +1406,128 @@ static int isp116x_start(struct usb_hcd 
  	isp116x_write_reg32(isp116x, HCRHPORT1, RH_PS_CCS);
  	isp116x_write_reg32(isp116x, HCRHPORT2, RH_PS_CCS);
  
@@ -710,7 +711,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  static struct hc_driver isp116x_hc_driver = {
  	.description = hcd_name,
-@@ -1745,12 +1657,19 @@
+@@ -1745,12 +1657,19 @@ static int __init isp116x_probe(struct p
  	}
  
  	ret = usb_add_hcd(hcd, irq, SA_INTERRUPT);
@@ -732,7 +733,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
        err6:
  	usb_put_hcd(hcd);
        err5:
-@@ -1772,13 +1691,9 @@
+@@ -1772,13 +1691,9 @@ static int __init isp116x_probe(struct p
  */
  static int isp116x_suspend(struct platform_device *dev, pm_message_t state)
  {
@@ -748,7 +749,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  }
  
  /*
-@@ -1786,13 +1701,9 @@
+@@ -1786,13 +1701,9 @@ static int isp116x_suspend(struct platfo
  */
  static int isp116x_resume(struct platform_device *dev)
  {
@@ -764,9 +765,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  }
  
  #else
---- gregkh-2.6.orig/MAINTAINERS	2005-11-12 21:06:42.000000000 -0800
-+++ gregkh-2.6/MAINTAINERS	2005-11-12 21:07:01.000000000 -0800
-@@ -2588,6 +2588,12 @@
+--- gregkh-2.6.orig/MAINTAINERS
++++ gregkh-2.6/MAINTAINERS
+@@ -2598,6 +2598,12 @@ L:	linux-usb-users@lists.sourceforge.net
  L:	linux-usb-devel@lists.sourceforge.net
  S:	Maintained
  
diff --git a/usb/usb-fix-dummy_hcd-breakage.patch b/usb/usb-fix-dummy_hcd-breakage.patch
new file mode 100644
index 0000000000000..2c7061fae869b
--- /dev/null
+++ b/usb/usb-fix-dummy_hcd-breakage.patch
@@ -0,0 +1,30 @@
+From: Greg Kroah-Hartman <gregkh@suse.de>
+Date: Mon Nov 14 11:43:50 2005 -0800
+Subject: USB: fix build breakage in dummy_hcd.c
+
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/gadget/dummy_hcd.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- gregkh-2.6.orig/drivers/usb/gadget/dummy_hcd.c
++++ gregkh-2.6/drivers/usb/gadget/dummy_hcd.c
+@@ -944,7 +944,7 @@ static int dummy_udc_suspend (struct pla
+ 	set_link_state (dum);
+ 	spin_unlock_irq (&dum->lock);
+ 
+-	dev->power.power_state = state;
++	dev->dev.power.power_state = state;
+ 	usb_hcd_poll_rh_status (dummy_to_hcd (dum));
+ 	return 0;
+ }
+@@ -1904,7 +1904,7 @@ static int dummy_hcd_probe (struct platf
+ 	struct usb_hcd		*hcd;
+ 	int			retval;
+ 
+-	dev_info (dev, "%s, driver " DRIVER_VERSION "\n", driver_desc);
++	dev_info(&dev->dev, "%s, driver " DRIVER_VERSION "\n", driver_desc);
+ 
+ 	hcd = usb_create_hcd (&dummy_hcd, &dev->dev, dev->dev.bus_id);
+ 	if (!hcd)