rt2800usb: convert to use struct rt2800_ops methods

Add chipset registers access abstraction layer and prepare for later
code unification.

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>

diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
index 3783fdc4251f7ae1bb89cf271d916ad8fd79a190..a3ec97a4c7443f56ebea763898adacd4137ad8cb 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@ -2627,10 +2627,23 @@ static int rt2800usb_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
        return 0;
 }
 
+static const struct rt2800_ops rt2800usb_rt2800_ops = {
+       .register_read          = rt2x00usb_register_read,
+       .register_write         = rt2x00usb_register_write,
+       .register_write_lock    = rt2x00usb_register_write_lock,
+
+       .register_multiread     = rt2x00usb_register_multiread,
+       .register_multiwrite    = rt2x00usb_register_multiwrite,
+
+       .regbusy_read           = rt2x00usb_regbusy_read,
+};
+
 static int rt2800usb_probe_hw(struct rt2x00_dev *rt2x00dev)
 {
        int retval;
 
+       rt2x00dev->priv = (void *)&rt2800usb_rt2800_ops;
+
        /*
         * Allocate eeprom data.
         */

diff --git a/drivers/net/wireless/rt2x00/rt2800usb.h b/drivers/net/wireless/rt2x00/rt2800usb.h
index 180dfce41b2090167d0373514f7994f47ffe9110..6524d72631cde187c0d6d6b5364e46528830b055 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2800usb.h
+++ b/drivers/net/wireless/rt2x00/rt2800usb.h
@@ -27,39 +27,69 @@
 #ifndef RT2800USB_H
 #define RT2800USB_H
 
+struct rt2800_ops {
+       void (*register_read)(struct rt2x00_dev *rt2x00dev,
+                             const unsigned int offset, u32 *value);
+       void (*register_write)(struct rt2x00_dev *rt2x00dev,
+                              const unsigned int offset, u32 value);
+       void (*register_write_lock)(struct rt2x00_dev *rt2x00dev,
+                                   const unsigned int offset, u32 value);
+
+       void (*register_multiread)(struct rt2x00_dev *rt2x00dev,
+                                  const unsigned int offset,
+                                  void *value, const u32 length);
+       void (*register_multiwrite)(struct rt2x00_dev *rt2x00dev,
+                                   const unsigned int offset,
+                                   void *value, const u32 length);
+
+       int (*regbusy_read)(struct rt2x00_dev *rt2x00dev,
+                           const unsigned int offset,
+                           struct rt2x00_field32 field, u32 *reg);
+};
+
 static inline void rt2800_register_read(struct rt2x00_dev *rt2x00dev,
                                        const unsigned int offset,
                                        u32 *value)
 {
-       rt2x00usb_register_read(rt2x00dev, offset, value);
+       const struct rt2800_ops *rt2800ops = rt2x00dev->priv;
+
+       rt2800ops->register_read(rt2x00dev, offset, value);
 }
 
 static inline void rt2800_register_write(struct rt2x00_dev *rt2x00dev,
                                         const unsigned int offset,
                                         u32 value)
 {
-       rt2x00usb_register_write(rt2x00dev, offset, value);
+       const struct rt2800_ops *rt2800ops = rt2x00dev->priv;
+
+       rt2800ops->register_write(rt2x00dev, offset, value);
 }
 
 static inline void rt2800_register_write_lock(struct rt2x00_dev *rt2x00dev,
                                              const unsigned int offset,
                                              u32 value)
 {
-       rt2x00usb_register_write_lock(rt2x00dev, offset, value);
+       const struct rt2800_ops *rt2800ops = rt2x00dev->priv;
+
+       rt2800ops->register_write_lock(rt2x00dev, offset, value);
 }
 
 static inline void rt2800_register_multiread(struct rt2x00_dev *rt2x00dev,
                                             const unsigned int offset,
                                             void *value, const u32 length)
 {
-       rt2x00usb_register_multiread(rt2x00dev, offset, value, length);
+       const struct rt2800_ops *rt2800ops = rt2x00dev->priv;
+
+       rt2800ops->register_multiread(rt2x00dev, offset, value, length);
 }
 
 static inline void rt2800_register_multiwrite(struct rt2x00_dev *rt2x00dev,
                                              const unsigned int offset,
                                              void *value, const u32 length)
 {
-       rt2x00usb_register_multiwrite(rt2x00dev, offset, value, length);
+       const struct rt2800_ops *rt2800ops = rt2x00dev->priv;
+
+       rt2800ops->register_multiwrite(rt2x00dev, offset, value, length);
 }
 
 static inline int rt2800_regbusy_read(struct rt2x00_dev *rt2x00dev,
@@ -67,7 +97,9 @@ static inline int rt2800_regbusy_read(struct rt2x00_dev *rt2x00dev,
                                      struct rt2x00_field32 field,
                                      u32 *reg)
 {
-       return rt2x00usb_regbusy_read(rt2x00dev, offset, field, reg);
+       const struct rt2800_ops *rt2800ops = rt2x00dev->priv;
+
+       return rt2800ops->regbusy_read(rt2x00dev, offset, field, reg);
 }
 
 /*