diff options
| author | Bryan Wu <cooloney@kernel.org> | 2009-11-16 16:19:20 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-11 11:55:24 -0800 |
| commit | 92dea9f3c92a96fce8f355151d536f5b1d07589e (patch) | |
| tree | cef37442e412d5d8179116a21bce1212436778d7 /drivers/usb/musb/musb_regs.h | |
| parent | 04f4086fdc10e60e790d5fc070c33c8905d1d32e (diff) | |
| download | kernel_samsung_smdk4412-92dea9f3c92a96fce8f355151d536f5b1d07589e.zip kernel_samsung_smdk4412-92dea9f3c92a96fce8f355151d536f5b1d07589e.tar.gz kernel_samsung_smdk4412-92dea9f3c92a96fce8f355151d536f5b1d07589e.tar.bz2 | |
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
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/musb/musb_regs.h')
| -rw-r--r-- | drivers/usb/musb/musb_regs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/musb/musb_regs.h b/drivers/usb/musb/musb_regs.h index cc1d71b..473a94e 100644 --- a/drivers/usb/musb/musb_regs.h +++ b/drivers/usb/musb/musb_regs.h @@ -465,9 +465,9 @@ static inline u16 musb_read_hwvers(void __iomem *mbase) 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, |