Title: [7366] trunk/drivers/usb/musb/musb_regs.h: USB: musb: kill compile warning for Blackfin systems
Revision
7366
Author
vapier
Date
2009-09-16 19:34:47 -0400 (Wed, 16 Sep 2009)

Log Message

USB: musb: kill compile warning for Blackfin systems

The Blackfin version of musb_read_target_reg_base() returns a u16 when the
common code expects a (void __iomem *), so update the Blackfin function to
return the right value.  This fixes the compile warning:

drivers/usb/musb/musb_core.c: In function 'musb_core_init':
drivers/usb/musb/musb_core.c:1448: warning: assignment makes pointer from
	integer without a cast

Modified Paths

Diff

Modified: trunk/drivers/usb/musb/musb_regs.h (7365 => 7366)


--- trunk/drivers/usb/musb/musb_regs.h	2009-09-16 23:34:12 UTC (rev 7365)
+++ trunk/drivers/usb/musb/musb_regs.h	2009-09-16 23:34:47 UTC (rev 7366)
@@ -474,9 +474,9 @@
 	return 0;
 }
 
-static inline u16 musb_read_target_reg_base(u8 i, void __iomem *mbase)
+static inline void __iomem *musb_read_target_reg_base(u8 i, void __iomem *mbase)
 {
-	return 0;
+	return NULL;
 }
 
 static inline void musb_write_rxfunaddr(void __iomem *ep_target_regs,
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits

Reply via email to