diff options
author | Olof Johansson <olof@lixom.net> | 2008-02-04 22:27:34 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-05 09:44:08 -0800 |
commit | ecb8a8472f6d314096f20885722f2033d2071719 (patch) | |
tree | 1b945f833ecceffc7e786c7a5e1efe55cb7d8867 /include/pcmcia/cs.h | |
parent | 7852375bbbfc7fb9c1117d73914aeb3baf917539 (diff) | |
download | linux-3.10-ecb8a8472f6d314096f20885722f2033d2071719.tar.gz linux-3.10-ecb8a8472f6d314096f20885722f2033d2071719.tar.bz2 linux-3.10-ecb8a8472f6d314096f20885722f2033d2071719.zip |
pcmcia: convert some internal-only ioaddr_t to unsigned int
Convert the io_req_t members to unsigned int, to allow use on machines with
more than 16 bits worth of IO ports (i.e. secondary busses on ppc64, etc).
There was only a couple of places in drivers where a change was needed. I
left printk formats alone (there are lots of %04x-style formats in there),
mostly to not change the format on the platforms that only have 16-bit io
addresses, but also because the padding doesn't really add all that much value
most of the time.
I found only one sprintf of an address, and upsized the string accordingly (I
doubt anyone will have anywhere near INT_MAX as irq value, but at least
there's room for it now).
Signed-off-by: Olof Johansson <olof@lixom.net>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Matthew Wilcox <matthew@wil.cx>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/pcmcia/cs.h')
-rw-r--r-- | include/pcmcia/cs.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/pcmcia/cs.h b/include/pcmcia/cs.h index d5838c30d20..87a260e3699 100644 --- a/include/pcmcia/cs.h +++ b/include/pcmcia/cs.h @@ -147,11 +147,11 @@ typedef struct config_req_t { /* For RequestIO and ReleaseIO */ typedef struct io_req_t { - ioaddr_t BasePort1; - ioaddr_t NumPorts1; + u_int BasePort1; + u_int NumPorts1; u_int Attributes1; - ioaddr_t BasePort2; - ioaddr_t NumPorts2; + u_int BasePort2; + u_int NumPorts2; u_int Attributes2; u_int IOAddrLines; } io_req_t; |