Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ba08e82 authored by Richard Purdie's avatar Richard Purdie Committed by Linus Torvalds
Browse files

[PATCH] USB: fix pxa2xx_udc compile warnings 



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

Signed-off-by: default avatarRichard Purdie <rpurdie@rpsys.net>
Acked-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 72a755fc

drivers/usb/gadget/pxa2xx_udc.c

+2 −2
Original line number Diff line number Diff line
@@ -422,7 +422,7 @@ static inline void ep0_idle (struct pxa2xx_udc *dev) 
}



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(struct device *_dev) 
 * 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);

drivers/usb/gadget/pxa2xx_udc.h

+4 −4
Original line number Diff line number Diff line
@@ -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)