From rpurdie@rpsys.net Wed Sep 14 07:56:25 2005 Subject: USB: fix pxa2xx_udc compile warnings From: Richard Purdie To: David Brownell Date: Wed, 14 Sep 2005 15:54:08 +0100 Message-Id: <20050915015353.F0789EA570@adsl-69-107-32-110.dsl.pltn13.pacbell.net> This patch fixes several types in the PXA25x udc driver and hence fixes several compiler warnings. Signed-off-by: Richard Purdie Acked-by: David Brownell Signed-off-by: Greg Kroah-Hartman --- drivers/usb/gadget/pxa2xx_udc.c | 4 ++-- drivers/usb/gadget/pxa2xx_udc.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) --- gregkh-2.6.orig/drivers/usb/gadget/pxa2xx_udc.c 2005-08-28 16:41:01.000000000 -0700 +++ gregkh-2.6/drivers/usb/gadget/pxa2xx_udc.c 2005-09-16 17:34:27.000000000 -0700 @@ -422,7 +422,7 @@ static inline void ep0_idle (struct pxa2 } 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 @@ static int __exit pxa2xx_udc_remove(stru * 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); --- gregkh-2.6.orig/drivers/usb/gadget/pxa2xx_udc.h 2005-08-28 16:41:01.000000000 -0700 +++ gregkh-2.6/drivers/usb/gadget/pxa2xx_udc.h 2005-09-16 17:34:27.000000000 -0700 @@ -69,11 +69,11 @@ struct pxa2xx_ep { * 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)