rt2x00: Move driver callback functions into the ops structure

All callback functions are gathered in rt2x00dev->ops except
for the callback functions which are used in rt2800lib to
acces rt2800pci/usb.

Move the priv pointer from rt2x00dev to rt2x00dev->ops and
rename it to drv to make it obvious that it is the driver callback
structure.

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 9 insertions, 9 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2800lib.h b/drivers/net/wireless/rt2x00/rt2800lib.h
index cecbd3abc35b..091641e3c5e2 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.h
+++ b/drivers/net/wireless/rt2x00/rt2800lib.h
@@ -50,7 +50,7 @@ static inline void rt2800_register_read(struct rt2x00_dev *rt2x00dev,
                                         const unsigned int offset,
                                         u32 *value)
 {
-        const struct rt2800_ops *rt2800ops = rt2x00dev->priv;
+        const struct rt2800_ops *rt2800ops = rt2x00dev->ops->drv;
 
         rt2800ops->register_read(rt2x00dev, offset, value);
 }
@@ -59,7 +59,7 @@ static inline void rt2800_register_read_lock(struct rt2x00_dev *rt2x00dev,
                                              const unsigned int offset,
                                              u32 *value)
 {
-        const struct rt2800_ops *rt2800ops = rt2x00dev->priv;
+        const struct rt2800_ops *rt2800ops = rt2x00dev->ops->drv;
 
         rt2800ops->register_read_lock(rt2x00dev, offset, value);
 }
@@ -68,7 +68,7 @@ static inline void rt2800_register_write(struct rt2x00_dev *rt2x00dev,
                                          const unsigned int offset,
                                          u32 value)
 {
-        const struct rt2800_ops *rt2800ops = rt2x00dev->priv;
+        const struct rt2800_ops *rt2800ops = rt2x00dev->ops->drv;
 
         rt2800ops->register_write(rt2x00dev, offset, value);
 }
@@ -77,7 +77,7 @@ static inline void rt2800_register_write_lock(struct rt2x00_dev *rt2x00dev,
                                               const unsigned int offset,
                                               u32 value)
 {
-        const struct rt2800_ops *rt2800ops = rt2x00dev->priv;
+        const struct rt2800_ops *rt2800ops = rt2x00dev->ops->drv;
 
         rt2800ops->register_write_lock(rt2x00dev, offset, value);
 }
@@ -86,7 +86,7 @@ static inline void rt2800_register_multiread(struct rt2x00_dev *rt2x00dev,
                                              const unsigned int offset,
                                              void *value, const u32 length)
 {
-        const struct rt2800_ops *rt2800ops = rt2x00dev->priv;
+        const struct rt2800_ops *rt2800ops = rt2x00dev->ops->drv;
 
         rt2800ops->register_multiread(rt2x00dev, offset, value, length);
 }
@@ -96,7 +96,7 @@ static inline void rt2800_register_multiwrite(struct rt2x00_dev *rt2x00dev,
                                               const void *value,
                                               const u32 length)
 {
-        const struct rt2800_ops *rt2800ops = rt2x00dev->priv;
+        const struct rt2800_ops *rt2800ops = rt2x00dev->ops->drv;
 
         rt2800ops->register_multiwrite(rt2x00dev, offset, value, length);
 }
@@ -106,7 +106,7 @@ static inline int rt2800_regbusy_read(struct rt2x00_dev *rt2x00dev,
                                       const struct rt2x00_field32 field,
                                       u32 *reg)
 {
-        const struct rt2800_ops *rt2800ops = rt2x00dev->priv;
+        const struct rt2800_ops *rt2800ops = rt2x00dev->ops->drv;
 
         return rt2800ops->regbusy_read(rt2x00dev, offset, field, reg);
 }
@@ -114,14 +114,14 @@ static inline int rt2800_regbusy_read(struct rt2x00_dev *rt2x00dev,
 static inline int rt2800_drv_write_firmware(struct rt2x00_dev *rt2x00dev,
                                             const u8 *data, const size_t len)
 {
-        const struct rt2800_ops *rt2800ops = rt2x00dev->priv;
+        const struct rt2800_ops *rt2800ops = rt2x00dev->ops->drv;
 
         return rt2800ops->drv_write_firmware(rt2x00dev, data, len);
 }
 
 static inline int rt2800_drv_init_registers(struct rt2x00_dev *rt2x00dev)
 {
-        const struct rt2800_ops *rt2800ops = rt2x00dev->priv;
+        const struct rt2800_ops *rt2800ops = rt2x00dev->ops->drv;
 
         return rt2800ops->drv_init_registers(rt2x00dev);
 }