Commit 5f784336 authored by Wolfram Sang's avatar Wolfram Sang Committed by Dominik Brodowski

pcmcia: Fix possible printk format warnings

Fix more possible warnings introduced by my commit
1d807665 as fixed by the previous patch from
Randy Dunlap. Not tested due to no hardware.
Signed-off-by: default avatarWolfram Sang <w.sang@pengutronix.de>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent c5e09528
...@@ -537,8 +537,9 @@ static int _pcc_set_io_map(u_short sock, struct pccard_io_map *io) ...@@ -537,8 +537,9 @@ static int _pcc_set_io_map(u_short sock, struct pccard_io_map *io)
u_char map; u_char map;
debug(3, "m32r_cfc: SetIOMap(%d, %d, %#2.2x, %d ns, " debug(3, "m32r_cfc: SetIOMap(%d, %d, %#2.2x, %d ns, "
"%#lx-%#lx)\n", sock, io->map, io->flags, "%#llx-%#llx)\n", sock, io->map, io->flags,
io->speed, io->start, io->stop); io->speed, (unsigned long long)io->start,
(unsigned long long)io->stop);
map = io->map; map = io->map;
return 0; return 0;
...@@ -554,8 +555,9 @@ static int _pcc_set_mem_map(u_short sock, struct pccard_mem_map *mem) ...@@ -554,8 +555,9 @@ static int _pcc_set_mem_map(u_short sock, struct pccard_mem_map *mem)
pcc_socket_t *t = &socket[sock]; pcc_socket_t *t = &socket[sock];
debug(3, "m32r_cfc: SetMemMap(%d, %d, %#2.2x, %d ns, " debug(3, "m32r_cfc: SetMemMap(%d, %d, %#2.2x, %d ns, "
"%#lx, %#x)\n", sock, map, mem->flags, "%#llx, %#x)\n", sock, map, mem->flags,
mem->speed, mem->static_start, mem->card_start); mem->speed, (unsigned long long)mem->static_start,
mem->card_start);
/* /*
* sanity check * sanity check
......
...@@ -492,8 +492,9 @@ static int _pcc_set_io_map(u_short sock, struct pccard_io_map *io) ...@@ -492,8 +492,9 @@ static int _pcc_set_io_map(u_short sock, struct pccard_io_map *io)
u_char map; u_char map;
debug(3, "m32r-pcc: SetIOMap(%d, %d, %#2.2x, %d ns, " debug(3, "m32r-pcc: SetIOMap(%d, %d, %#2.2x, %d ns, "
"%#x-%#x)\n", sock, io->map, io->flags, "%#llx-%#llx)\n", sock, io->map, io->flags,
io->speed, io->start, io->stop); io->speed, (unsigned long long)io->start,
(unsigned long long)io->stop);
map = io->map; map = io->map;
return 0; return 0;
...@@ -515,8 +516,9 @@ static int _pcc_set_mem_map(u_short sock, struct pccard_mem_map *mem) ...@@ -515,8 +516,9 @@ static int _pcc_set_mem_map(u_short sock, struct pccard_mem_map *mem)
#endif #endif
debug(3, "m32r-pcc: SetMemMap(%d, %d, %#2.2x, %d ns, " debug(3, "m32r-pcc: SetMemMap(%d, %d, %#2.2x, %d ns, "
"%#lx, %#x)\n", sock, map, mem->flags, "%#llx, %#x)\n", sock, map, mem->flags,
mem->speed, mem->static_start, mem->card_start); mem->speed, (unsigned long long)mem->static_start,
mem->card_start);
/* /*
* sanity check * sanity check
......
...@@ -975,8 +975,9 @@ static int m8xx_set_io_map(struct pcmcia_socket *sock, struct pccard_io_map *io) ...@@ -975,8 +975,9 @@ static int m8xx_set_io_map(struct pcmcia_socket *sock, struct pccard_io_map *io)
#define M8XX_BASE (PCMCIA_IO_WIN_BASE + io->start) #define M8XX_BASE (PCMCIA_IO_WIN_BASE + io->start)
dprintk("SetIOMap(%d, %d, %#2.2x, %d ns, " dprintk("SetIOMap(%d, %d, %#2.2x, %d ns, "
"%#4.4x-%#4.4x)\n", lsock, io->map, io->flags, "%#4.4llx-%#4.4llx)\n", lsock, io->map, io->flags,
io->speed, io->start, io->stop); io->speed, (unsigned long long)io->start,
(unsigned long long)io->stop);
if ((io->map >= PCMCIA_IO_WIN_NO) || (io->start > 0xffff) if ((io->map >= PCMCIA_IO_WIN_NO) || (io->start > 0xffff)
|| (io->stop > 0xffff) || (io->stop < io->start)) || (io->stop > 0xffff) || (io->stop < io->start))
...@@ -1055,8 +1056,9 @@ static int m8xx_set_mem_map(struct pcmcia_socket *sock, ...@@ -1055,8 +1056,9 @@ static int m8xx_set_mem_map(struct pcmcia_socket *sock,
pcmconf8xx_t *pcmcia = s->pcmcia; pcmconf8xx_t *pcmcia = s->pcmcia;
dprintk("SetMemMap(%d, %d, %#2.2x, %d ns, " dprintk("SetMemMap(%d, %d, %#2.2x, %d ns, "
"%#5.5lx, %#5.5x)\n", lsock, mem->map, mem->flags, "%#5.5llx, %#5.5x)\n", lsock, mem->map, mem->flags,
mem->speed, mem->static_start, mem->card_start); mem->speed, (unsigned long long)mem->static_start,
mem->card_start);
if ((mem->map >= PCMCIA_MEM_WIN_NO) if ((mem->map >= PCMCIA_MEM_WIN_NO)
// || ((mem->s) >= PCMCIA_MEM_WIN_SIZE) // || ((mem->s) >= PCMCIA_MEM_WIN_SIZE)
...@@ -1107,8 +1109,9 @@ static int m8xx_set_mem_map(struct pcmcia_socket *sock, ...@@ -1107,8 +1109,9 @@ static int m8xx_set_mem_map(struct pcmcia_socket *sock,
} }
dprintk("SetMemMap(%d, %d, %#2.2x, %d ns, " dprintk("SetMemMap(%d, %d, %#2.2x, %d ns, "
"%#5.5lx, %#5.5x)\n", lsock, mem->map, mem->flags, "%#5.5llx, %#5.5x)\n", lsock, mem->map, mem->flags,
mem->speed, mem->static_start, mem->card_start); mem->speed, (unsigned long long)mem->static_start,
mem->card_start);
/* copy the struct and modify the copy */ /* copy the struct and modify the copy */
......
...@@ -336,8 +336,9 @@ soc_common_pcmcia_set_io_map(struct pcmcia_socket *sock, struct pccard_io_map *m ...@@ -336,8 +336,9 @@ soc_common_pcmcia_set_io_map(struct pcmcia_socket *sock, struct pccard_io_map *m
struct soc_pcmcia_socket *skt = to_soc_pcmcia_socket(sock); struct soc_pcmcia_socket *skt = to_soc_pcmcia_socket(sock);
unsigned short speed = map->speed; unsigned short speed = map->speed;
debug(skt, 2, "map %u speed %u start 0x%08x stop 0x%08x\n", debug(skt, 2, "map %u speed %u start 0x%08llx stop 0x%08llx\n",
map->map, map->speed, map->start, map->stop); map->map, map->speed, (unsigned long long)map->start,
(unsigned long long)map->stop);
debug(skt, 2, "flags: %s%s%s%s%s%s%s%s\n", debug(skt, 2, "flags: %s%s%s%s%s%s%s%s\n",
(map->flags==0)?"<NONE>":"", (map->flags==0)?"<NONE>":"",
(map->flags&MAP_ACTIVE)?"ACTIVE ":"", (map->flags&MAP_ACTIVE)?"ACTIVE ":"",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment