aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/wireless/rt2x00/rt2800pci.h8
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00pci.h15
2 files changed, 11 insertions, 12 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800pci.h b/drivers/net/wireless/rt2x00/rt2800pci.h
index fecb71c05c1e..586eb81ad76a 100644
--- a/drivers/net/wireless/rt2x00/rt2800pci.h
+++ b/drivers/net/wireless/rt2x00/rt2800pci.h
@@ -37,10 +37,10 @@ struct rt2800_ops {
37 37
38 void (*register_multiread)(struct rt2x00_dev *rt2x00dev, 38 void (*register_multiread)(struct rt2x00_dev *rt2x00dev,
39 const unsigned int offset, 39 const unsigned int offset,
40 void *value, const u16 length); 40 void *value, const u32 length);
41 void (*register_multiwrite)(struct rt2x00_dev *rt2x00dev, 41 void (*register_multiwrite)(struct rt2x00_dev *rt2x00dev,
42 const unsigned int offset, 42 const unsigned int offset,
43 const void *value, const u16 length); 43 const void *value, const u32 length);
44 44
45 int (*regbusy_read)(struct rt2x00_dev *rt2x00dev, 45 int (*regbusy_read)(struct rt2x00_dev *rt2x00dev,
46 const unsigned int offset, 46 const unsigned int offset,
@@ -76,7 +76,7 @@ static inline void rt2800_register_write_lock(struct rt2x00_dev *rt2x00dev,
76 76
77static inline void rt2800_register_multiread(struct rt2x00_dev *rt2x00dev, 77static inline void rt2800_register_multiread(struct rt2x00_dev *rt2x00dev,
78 const unsigned int offset, 78 const unsigned int offset,
79 void *value, const u16 length) 79 void *value, const u32 length)
80{ 80{
81 const struct rt2800_ops *rt2800ops = rt2x00dev->priv; 81 const struct rt2800_ops *rt2800ops = rt2x00dev->priv;
82 82
@@ -86,7 +86,7 @@ static inline void rt2800_register_multiread(struct rt2x00_dev *rt2x00dev,
86static inline void rt2800_register_multiwrite(struct rt2x00_dev *rt2x00dev, 86static inline void rt2800_register_multiwrite(struct rt2x00_dev *rt2x00dev,
87 const unsigned int offset, 87 const unsigned int offset,
88 const void *value, 88 const void *value,
89 const u16 length) 89 const u32 length)
90{ 90{
91 const struct rt2800_ops *rt2800ops = rt2x00dev->priv; 91 const struct rt2800_ops *rt2800ops = rt2x00dev->priv;
92 92
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
56static inline void 56static inline void rt2x00pci_register_multiread(struct rt2x00_dev *rt2x00dev,
57rt2x00pci_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
71static inline void 70static inline void rt2x00pci_register_multiwrite(struct rt2x00_dev *rt2x00dev,
72rt2x00pci_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}