Commit 473196bd authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by John W. Linville

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: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Acked-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Acked-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f255b92b
...@@ -37,10 +37,10 @@ struct rt2800_ops { ...@@ -37,10 +37,10 @@ struct rt2800_ops {
void (*register_multiread)(struct rt2x00_dev *rt2x00dev, void (*register_multiread)(struct rt2x00_dev *rt2x00dev,
const unsigned int offset, const unsigned int offset,
void *value, const u16 length); void *value, const u32 length);
void (*register_multiwrite)(struct rt2x00_dev *rt2x00dev, void (*register_multiwrite)(struct rt2x00_dev *rt2x00dev,
const unsigned int offset, const unsigned int offset,
const void *value, const u16 length); const void *value, const u32 length);
int (*regbusy_read)(struct rt2x00_dev *rt2x00dev, int (*regbusy_read)(struct rt2x00_dev *rt2x00dev,
const unsigned int offset, const unsigned int offset,
...@@ -76,7 +76,7 @@ static inline void rt2800_register_write_lock(struct rt2x00_dev *rt2x00dev, ...@@ -76,7 +76,7 @@ static inline void rt2800_register_write_lock(struct rt2x00_dev *rt2x00dev,
static inline void rt2800_register_multiread(struct rt2x00_dev *rt2x00dev, static inline void rt2800_register_multiread(struct rt2x00_dev *rt2x00dev,
const unsigned int offset, const unsigned int offset,
void *value, const u16 length) void *value, const u32 length)
{ {
const struct rt2800_ops *rt2800ops = rt2x00dev->priv; const struct rt2800_ops *rt2800ops = rt2x00dev->priv;
...@@ -86,7 +86,7 @@ static inline void rt2800_register_multiread(struct rt2x00_dev *rt2x00dev, ...@@ -86,7 +86,7 @@ static inline void rt2800_register_multiread(struct rt2x00_dev *rt2x00dev,
static inline void rt2800_register_multiwrite(struct rt2x00_dev *rt2x00dev, static inline void rt2800_register_multiwrite(struct rt2x00_dev *rt2x00dev,
const unsigned int offset, const unsigned int offset,
const void *value, const void *value,
const u16 length) const u32 length)
{ {
const struct rt2800_ops *rt2800ops = rt2x00dev->priv; const struct rt2800_ops *rt2800ops = rt2x00dev->priv;
......
...@@ -53,10 +53,9 @@ static inline void rt2x00pci_register_read(struct rt2x00_dev *rt2x00dev, ...@@ -53,10 +53,9 @@ static inline void rt2x00pci_register_read(struct rt2x00_dev *rt2x00dev,
*value = readl(rt2x00dev->csr.base + offset); *value = readl(rt2x00dev->csr.base + offset);
} }
static inline void static inline void rt2x00pci_register_multiread(struct rt2x00_dev *rt2x00dev,
rt2x00pci_register_multiread(struct rt2x00_dev *rt2x00dev, const unsigned int offset,
const unsigned int offset, void *value, const u32 length)
void *value, const u16 length)
{ {
memcpy_fromio(value, rt2x00dev->csr.base + offset, length); memcpy_fromio(value, rt2x00dev->csr.base + offset, length);
} }
...@@ -68,10 +67,10 @@ static inline void rt2x00pci_register_write(struct rt2x00_dev *rt2x00dev, ...@@ -68,10 +67,10 @@ static inline void rt2x00pci_register_write(struct rt2x00_dev *rt2x00dev,
writel(value, rt2x00dev->csr.base + offset); writel(value, rt2x00dev->csr.base + offset);
} }
static inline void static inline void rt2x00pci_register_multiwrite(struct rt2x00_dev *rt2x00dev,
rt2x00pci_register_multiwrite(struct rt2x00_dev *rt2x00dev, const unsigned int offset,
const unsigned int offset, const void *value,
const void *value, const u16 length) const u32 length)
{ {
memcpy_toio(rt2x00dev->csr.base + offset, value, length); memcpy_toio(rt2x00dev->csr.base + offset, value, length);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment