Re: [PATCH] usb: musb: - kill the compile warning

[Felipe Balbi]

On Fri, Feb 06, 2009 at 06:23:30PM +0800, Bryan Wu wrote:
> drivers/usb/musb/musb_core.c:1433: warning: assignment makes pointer
> from integer without a cast
> 	hw_ep->target_regs = musb_read_target_reg_base(i, mbase);
> 
> static inline u16 musb_read_target_reg_base(u8 i, void __iomem *mbase);
> 
> this is a common bug, but a bug still ?  mbase is a 32/64 bit pointer,
> but we return a u16 to assign to a pointer ?  seems odd :)
> 
> So return right pointer in the stub.
> 
> Cc: Mike Frysinger <vapier.adi@xxxxxxxxx>
> Signed-off-by: Bryan Wu <cooloney@xxxxxxxxxx>
> ---
>  drivers/usb/musb/musb_regs.h |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/usb/musb/musb_regs.h b/drivers/usb/musb/musb_regs.h
> index de3b2f1..c2f6a16 100644
> --- a/drivers/usb/musb/musb_regs.h
> +++ b/drivers/usb/musb/musb_regs.h
> @@ -333,7 +333,7 @@ static inline u16 musb_read_hwvers(void __iomem *mbase)
>  
>  static inline void __iomem *musb_read_target_reg_base(u8 i, void __iomem *mbase)
>  {
> -	return (MUSB_BUSCTL_OFFSET(i, 0) + mbase);
> +	return (void __iomem *)(MUSB_BUSCTL_OFFSET(i, 0) + mbase);

please don't cast, we don't get this warning in non-blackfin builds
(well, omap at least)

> @@ -473,9 +473,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;

this looks fine

-- 
balbi
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/