Commit 92dea9f3 authored Nov 16, 2009 by Bryan Wu Committed by Greg Kroah-Hartman Dec 11, 2009

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>

parent 04f4086f

drivers/usb/musb/musb_regs.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -465,9 +465,9 @@ static inline u16 musb_read_hwvers(void __iomem *mbase)
	return 0;		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,		static inline void musb_write_rxfunaddr(void __iomem *ep_target_regs,