[patch 12/18] USB: fix pxa2xx_udc compile warnings

[Greg KH <gregkh@suse.de>]

[-- Attachment #1: usb-pxa2xx_udc-build-fix.patch --]
[-- Type: text/plain, Size: 1860 bytes --]

From: Richard Purdie <rpurdie@rpsys.net>

This patch fixes several types in the PXA25x udc driver and hence fixes
several compiler warnings.

Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Acked-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>


---
 drivers/usb/gadget/pxa2xx_udc.c |    4 ++--
 drivers/usb/gadget/pxa2xx_udc.h |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

--- scsi-2.6.orig/drivers/usb/gadget/pxa2xx_udc.c	2005-09-20 06:00:03.000000000 -0700
+++ scsi-2.6/drivers/usb/gadget/pxa2xx_udc.c	2005-09-21 17:29:43.000000000 -0700
@@ -422,7 +422,7 @@
 }
 
 static int
-write_packet(volatile u32 *uddr, struct pxa2xx_request *req, unsigned max)
+write_packet(volatile unsigned long *uddr, struct pxa2xx_request *req, unsigned max)
 {
 	u8		*buf;
 	unsigned	length, count;
@@ -2602,7 +2602,7 @@
  * VBUS IRQs should probably be ignored so that the PXA device just acts
  * "dead" to USB hosts until system resume.
  */
-static int pxa2xx_udc_suspend(struct device *dev, u32 state, u32 level)
+static int pxa2xx_udc_suspend(struct device *dev, pm_message_t state, u32 level)
 {
 	struct pxa2xx_udc	*udc = dev_get_drvdata(dev);
 
--- scsi-2.6.orig/drivers/usb/gadget/pxa2xx_udc.h	2005-09-20 06:00:03.000000000 -0700
+++ scsi-2.6/drivers/usb/gadget/pxa2xx_udc.h	2005-09-21 17:29:43.000000000 -0700
@@ -69,11 +69,11 @@
 	 * UDDR = UDC Endpoint Data Register (the fifo)
 	 * DRCM = DMA Request Channel Map
 	 */
-	volatile u32				*reg_udccs;
-	volatile u32				*reg_ubcr;
-	volatile u32				*reg_uddr;
+	volatile unsigned long			*reg_udccs;
+	volatile unsigned long			*reg_ubcr;
+	volatile unsigned long			*reg_uddr;
 #ifdef USE_DMA
-	volatile u32				*reg_drcmr;
+	volatile unsigned long			*reg_drcmr;
 #define	drcmr(n)  .reg_drcmr = & DRCMR ## n ,
 #else
 #define	drcmr(n)  

--