diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-11-04 12:35:25 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-11-06 16:48:54 -0500 |
commit | 473196bd9935f0efd4c5f1cda28229e7dcff564c (patch) | |
tree | f36c6c10423bd9e13cb8c5fab09a1647681d9e72 /drivers/net/wireless/rt2x00/rt2x00pci.h | |
parent | f255b92b570325dfbd4c4a791a0eda7999e67fe7 (diff) |
rt2x00: fix rt2x00pci_register_multi[read,write]() arguments
Change type of 'length' argument from u16 to u32 (all arguments
match rt2x00usb_register_multi[read,write]() ones now).
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Acked-by: Ivo van Doorn <IvDoorn@gmail.com>
Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00pci.h')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00pci.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.h b/drivers/net/wireless/rt2x00/rt2x00pci.h index 15a12487e04b..f5af4b40308d 100644 --- a/drivers/net/wireless/rt2x00/rt2x00pci.h +++ b/drivers/net/wireless/rt2x00/rt2x00pci.h | |||
@@ -53,10 +53,9 @@ static inline void rt2x00pci_register_read(struct rt2x00_dev *rt2x00dev, | |||
53 | *value = readl(rt2x00dev->csr.base + offset); | 53 | *value = readl(rt2x00dev->csr.base + offset); |
54 | } | 54 | } |
55 | 55 | ||
56 | static inline void | 56 | static inline void rt2x00pci_register_multiread(struct rt2x00_dev *rt2x00dev, |
57 | rt2x00pci_register_multiread(struct rt2x00_dev *rt2x00dev, | 57 | const unsigned int offset, |
58 | const unsigned int offset, | 58 | void *value, const u32 length) |
59 | void *value, const u16 length) | ||
60 | { | 59 | { |
61 | memcpy_fromio(value, rt2x00dev->csr.base + offset, length); | 60 | memcpy_fromio(value, rt2x00dev->csr.base + offset, length); |
62 | } | 61 | } |
@@ -68,10 +67,10 @@ static inline void rt2x00pci_register_write(struct rt2x00_dev *rt2x00dev, | |||
68 | writel(value, rt2x00dev->csr.base + offset); | 67 | writel(value, rt2x00dev->csr.base + offset); |
69 | } | 68 | } |
70 | 69 | ||
71 | static inline void | 70 | static inline void rt2x00pci_register_multiwrite(struct rt2x00_dev *rt2x00dev, |
72 | rt2x00pci_register_multiwrite(struct rt2x00_dev *rt2x00dev, | 71 | const unsigned int offset, |
73 | const unsigned int offset, | 72 | const void *value, |
74 | const void *value, const u16 length) | 73 | const u32 length) |
75 | { | 74 | { |
76 | memcpy_toio(rt2x00dev->csr.base + offset, value, length); | 75 | memcpy_toio(rt2x00dev->csr.base + offset, value, length); |
77 | } | 76 | } |