pcmcia: fix controller printk format warnings (01373046) · Commits · 戴 / test

Fix new pcmcia printk format warnings: [This has now moved from linux-next to mainline. Originally sent 2009-SEP-17.] 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@oracle.com> Signed-off-by:

Dominik Brodowski <linux@dominikbrodowski.net>

drivers/pcmcia/i82365.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1053,8 +1053,8 @@ static int i365_set_io_map(u_short sock, struct pccard_io_map *io)
		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;

drivers/pcmcia/tcic.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -732,8 +732,8 @@ static int tcic_set_io_map(struct pcmcia_socket sock, struct pccard_io_map io)
		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));

Admin message