tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

pcmcia: Fix possible printk format warnings

Fix more possible warnings introduced by my commit
1d80766554322236aee50d6023693b3210b9cf38 as fixed by the previous patch from
Randy Dunlap. Not tested due to no hardware.

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

authored by

Wolfram Sang and committed by
Dominik Brodowski 5f784336 c5e09528

+24 -16
+6 -4
drivers/pcmcia/m32r_cfc.c
··· 537 537 u_char map; 538 538 539 539 debug(3, "m32r_cfc: SetIOMap(%d, %d, %#2.2x, %d ns, " 540 - "%#lx-%#lx)\n", sock, io->map, io->flags, 541 - io->speed, io->start, io->stop); 540 + "%#llx-%#llx)\n", sock, io->map, io->flags, 541 + io->speed, (unsigned long long)io->start, 542 + (unsigned long long)io->stop); 542 543 map = io->map; 543 544 544 545 return 0; ··· 555 554 pcc_socket_t *t = &socket[sock]; 556 555 557 556 debug(3, "m32r_cfc: SetMemMap(%d, %d, %#2.2x, %d ns, " 558 - "%#lx, %#x)\n", sock, map, mem->flags, 559 - mem->speed, mem->static_start, mem->card_start); 557 + "%#llx, %#x)\n", sock, map, mem->flags, 558 + mem->speed, (unsigned long long)mem->static_start, 559 + mem->card_start); 560 560 561 561 /* 562 562 * sanity check
+6 -4
drivers/pcmcia/m32r_pcc.c
··· 492 492 u_char map; 493 493 494 494 debug(3, "m32r-pcc: SetIOMap(%d, %d, %#2.2x, %d ns, " 495 - "%#x-%#x)\n", sock, io->map, io->flags, 496 - io->speed, io->start, io->stop); 495 + "%#llx-%#llx)\n", sock, io->map, io->flags, 496 + io->speed, (unsigned long long)io->start, 497 + (unsigned long long)io->stop); 497 498 map = io->map; 498 499 499 500 return 0; ··· 516 515 #endif 517 516 518 517 debug(3, "m32r-pcc: SetMemMap(%d, %d, %#2.2x, %d ns, " 519 - "%#lx, %#x)\n", sock, map, mem->flags, 520 - mem->speed, mem->static_start, mem->card_start); 518 + "%#llx, %#x)\n", sock, map, mem->flags, 519 + mem->speed, (unsigned long long)mem->static_start, 520 + mem->card_start); 521 521 522 522 /* 523 523 * sanity check
+9 -6
drivers/pcmcia/m8xx_pcmcia.c
··· 975 975 #define M8XX_BASE (PCMCIA_IO_WIN_BASE + io->start) 976 976 977 977 dprintk("SetIOMap(%d, %d, %#2.2x, %d ns, " 978 - "%#4.4x-%#4.4x)\n", lsock, io->map, io->flags, 979 - io->speed, io->start, io->stop); 978 + "%#4.4llx-%#4.4llx)\n", lsock, io->map, io->flags, 979 + io->speed, (unsigned long long)io->start, 980 + (unsigned long long)io->stop); 980 981 981 982 if ((io->map >= PCMCIA_IO_WIN_NO) || (io->start > 0xffff) 982 983 || (io->stop > 0xffff) || (io->stop < io->start)) ··· 1056 1055 pcmconf8xx_t *pcmcia = s->pcmcia; 1057 1056 1058 1057 dprintk("SetMemMap(%d, %d, %#2.2x, %d ns, " 1059 - "%#5.5lx, %#5.5x)\n", lsock, mem->map, mem->flags, 1060 - mem->speed, mem->static_start, mem->card_start); 1058 + "%#5.5llx, %#5.5x)\n", lsock, mem->map, mem->flags, 1059 + mem->speed, (unsigned long long)mem->static_start, 1060 + mem->card_start); 1061 1061 1062 1062 if ((mem->map >= PCMCIA_MEM_WIN_NO) 1063 1063 // || ((mem->s) >= PCMCIA_MEM_WIN_SIZE) ··· 1109 1107 } 1110 1108 1111 1109 dprintk("SetMemMap(%d, %d, %#2.2x, %d ns, " 1112 - "%#5.5lx, %#5.5x)\n", lsock, mem->map, mem->flags, 1113 - mem->speed, mem->static_start, mem->card_start); 1110 + "%#5.5llx, %#5.5x)\n", lsock, mem->map, mem->flags, 1111 + mem->speed, (unsigned long long)mem->static_start, 1112 + mem->card_start); 1114 1113 1115 1114 /* copy the struct and modify the copy */ 1116 1115
+3 -2
drivers/pcmcia/soc_common.c
··· 336 336 struct soc_pcmcia_socket *skt = to_soc_pcmcia_socket(sock); 337 337 unsigned short speed = map->speed; 338 338 339 - debug(skt, 2, "map %u speed %u start 0x%08x stop 0x%08x\n", 340 - map->map, map->speed, map->start, map->stop); 339 + debug(skt, 2, "map %u speed %u start 0x%08llx stop 0x%08llx\n", 340 + map->map, map->speed, (unsigned long long)map->start, 341 + (unsigned long long)map->stop); 341 342 debug(skt, 2, "flags: %s%s%s%s%s%s%s%s\n", 342 343 (map->flags==0)?"<NONE>":"", 343 344 (map->flags&MAP_ACTIVE)?"ACTIVE ":"",