[PATCH -next] pcmcia: fix controller printk warnings

[Wolfram Sang]

On Thu, Sep 17, 2009 at 02:14:23PM -0700, Randy Dunlap wrote:
> From: Randy Dunlap <randy.dunlap at oracle.com>
> 
> Fix new pcmcia printk format warnings:
> 
> drivers/pcmcia/i82365.c:1055: warning: format '%#x' expects type 'unsigned int', but argument 6 has type 'phys_addr_t'
> drivers/pcmcia/i82365.c:1055: warning: format '%#x' expects type 'unsigned int', but argument 7 has type 'phys_addr_t'
> drivers/pcmcia/tcic.c:734: warning: format '%#x' expects type 'unsigned int', but argument 6 has type 'phys_addr_t'
> drivers/pcmcia/tcic.c:734: warning: format '%#x' expects type 'unsigned int', but argument 7 has type 'phys_addr_t'
> 
> Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
Acked-by: Wolfram Sang <w.sang at pengutronix.de>

I spotted another four drivers needing a similar patch (soc_common, m32r_* and
m8xx_pcmcia). Do you want to add them, shall I make a patch on top of this one
or incorporate all into one patch?

> ---
>  drivers/pcmcia/i82365.c |    4 ++--
>  drivers/pcmcia/tcic.c   |    4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> --- linux-next-20090917.orig/drivers/pcmcia/tcic.c
> +++ linux-next-20090917/drivers/pcmcia/tcic.c
> @@ -732,8 +732,8 @@ static int tcic_set_io_map(struct pcmcia
>      u_short base, len, ioctl;
>      
>      debug(1, "SetIOMap(%d, %d, %#2.2x, %d ns, "
> -	  "%#x-%#x)\n", psock, io->map, io->flags,
> -	  io->speed, io->start, io->stop);
> +	  "%#llx-%#llx)\n", psock, io->map, io->flags, io->speed,
> +	  (unsigned long long)io->start, (unsigned long long)io->stop);
>      if ((io->map > 1) || (io->start > 0xffff) || (io->stop > 0xffff) ||
>  	(io->stop < io->start)) return -EINVAL;
>      tcic_setw(TCIC_ADDR+2, TCIC_ADR2_INDREG | (psock << TCIC_SS_SHFT));
> --- linux-next-20090917.orig/drivers/pcmcia/i82365.c
> +++ linux-next-20090917/drivers/pcmcia/i82365.c
> @@ -1053,8 +1053,8 @@ static int i365_set_io_map(u_short sock,
>      u_char map, ioctl;
>      
>      debug(1, "SetIOMap(%d, %d, %#2.2x, %d ns, "
> -	  "%#x-%#x)\n", sock, io->map, io->flags,
> -	  io->speed, io->start, io->stop);
> +	  "%#llx-%#llx)\n", sock, io->map, io->flags, io->speed,
> +	  (unsigned long long)io->start, (unsigned long long)io->stop);
>      map = io->map;
>      if ((map > 1) || (io->start > 0xffff) || (io->stop > 0xffff) ||
>  	(io->stop < io->start)) return -EINVAL;

-- 
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-pcmcia/attachments/20090918/656e857c/attachment.sig>