rsi: Add host interface operations as separate structure.

Host interface operations are currently function pointers in rsi_hw
structure. As more host interface operations are going to be introduced,
separate structure is added for these for convenience.

Signed-off-by: Prameela Rani Garnepudi <prameela.j04cs@gmail.com>
Signed-off-by: Amitkumar Karwar <amit.karwar@redpinesignals.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/rsi/rsi_91x_hal.c b/drivers/net/wireless/rsi/rsi_91x_hal.c
index 02920c93e82d837fb72460ab89d81bdab5f17124..8fbf90498d65be2daaf77eaf249d8a943d8a0af0 100644 (file)
--- a/drivers/net/wireless/rsi/rsi_91x_hal.c
+++ b/drivers/net/wireless/rsi/rsi_91x_hal.c
@@ -100,9 +100,8 @@ int rsi_send_data_pkt(struct rsi_common *common, struct sk_buff *skb)
                                    (skb->priority & 0xf) |
                                    (tx_params->sta_id << 8));
 
-       status = adapter->host_intf_write_pkt(common->priv,
-                                             skb->data,
-                                             skb->len);
+       status = adapter->host_intf_ops->write_pkt(common->priv, skb->data,
+                                                  skb->len);
        if (status)
                rsi_dbg(ERR_ZONE, "%s: Failed to write pkt\n",
                        __func__);
@@ -148,9 +147,9 @@ int rsi_send_mgmt_pkt(struct rsi_common *common,
                }
                skb_push(skb, extnd_size);
                skb->data[extnd_size + 4] = extnd_size;
-               status = adapter->host_intf_write_pkt(common->priv,
-                                                     (u8 *)skb->data,
-                                                     skb->len);
+               status = adapter->host_intf_ops->write_pkt(common->priv,
+                                                          (u8 *)skb->data,
+                                                          skb->len);
                if (status) {
                        rsi_dbg(ERR_ZONE,
                                "%s: Failed to write the packet\n", __func__);
@@ -203,9 +202,8 @@ int rsi_send_mgmt_pkt(struct rsi_common *common,
 
        msg[7] |= cpu_to_le16(vap_id << 8);
 
-       status = adapter->host_intf_write_pkt(common->priv,
-                                             (u8 *)msg,
-                                             skb->len);
+       status = adapter->host_intf_ops->write_pkt(common->priv, (u8 *)msg,
+                                                  skb->len);
        if (status)
                rsi_dbg(ERR_ZONE, "%s: Failed to write the packet\n", __func__);
 

diff --git a/drivers/net/wireless/rsi/rsi_91x_sdio.c b/drivers/net/wireless/rsi/rsi_91x_sdio.c
index 39d94b38f0a04e1b70f4b56a76b1fea066fe5527..bdbec8b27071cde0fb5feedceed4babfcd7639ae 100644 (file)
--- a/drivers/net/wireless/rsi/rsi_91x_sdio.c
+++ b/drivers/net/wireless/rsi/rsi_91x_sdio.c
@@ -676,8 +676,6 @@ static int rsi_init_sdio_interface(struct rsi_hw *adapter,
        }
        sdio_release_host(pfunction);
 
-       adapter->host_intf_write_pkt = rsi_sdio_host_intf_write_pkt;
-       adapter->host_intf_read_pkt = rsi_sdio_host_intf_read_pkt;
        adapter->determine_event_timeout = rsi_sdio_determine_event_timeout;
        adapter->check_hw_queue_status = rsi_sdio_read_buffer_status_register;
 
@@ -691,6 +689,13 @@ fail:
        return status;
 }
 
+static struct rsi_host_intf_ops sdio_host_intf_ops = {
+       .write_pkt              = rsi_sdio_host_intf_write_pkt,
+       .read_pkt               = rsi_sdio_host_intf_read_pkt,
+       .read_reg_multiple      = rsi_sdio_read_register_multiple,
+       .write_reg_multiple     = rsi_sdio_write_register_multiple,
+};
+
 /**
  * rsi_probe() - This function is called by kernel when the driver provided
  *              Vendor and device IDs are matched. All the initialization
@@ -713,6 +718,8 @@ static int rsi_probe(struct sdio_func *pfunction,
                        __func__);
                return 1;
        }
+       adapter->rsi_host_intf = RSI_HOST_INTF_SDIO;
+       adapter->host_intf_ops = &sdio_host_intf_ops;
 
        if (rsi_init_sdio_interface(adapter, pfunction)) {
                rsi_dbg(ERR_ZONE, "%s: Failed to init sdio interface\n",

diff --git a/drivers/net/wireless/rsi/rsi_91x_usb.c b/drivers/net/wireless/rsi/rsi_91x_usb.c
index 31f96f0f6e30d9de4cd150e4d9e1a885bfa26209..9000e09a4d7d70d324a4df45e6956c8118700b71 100644 (file)
--- a/drivers/net/wireless/rsi/rsi_91x_usb.c
+++ b/drivers/net/wireless/rsi/rsi_91x_usb.c
@@ -392,6 +392,12 @@ static int rsi_usb_host_intf_write_pkt(struct rsi_hw *adapter,
                                  len);
 }
 
+static struct rsi_host_intf_ops usb_host_intf_ops = {
+       .write_pkt              = rsi_usb_host_intf_write_pkt,
+       .read_reg_multiple      = rsi_usb_read_register_multiple,
+       .write_reg_multiple     = rsi_usb_write_register_multiple,
+};
+
 /**
  * rsi_deinit_usb_interface() - This function deinitializes the usb interface.
  * @adapter: Pointer to the adapter structure.
@@ -457,9 +463,10 @@ static int rsi_init_usb_interface(struct rsi_hw *adapter,
 
        /* Initializing function callbacks */
        adapter->rx_urb_submit = rsi_rx_urb_submit;
-       adapter->host_intf_write_pkt = rsi_usb_host_intf_write_pkt;
        adapter->check_hw_queue_status = rsi_usb_check_queue_status;
        adapter->determine_event_timeout = rsi_usb_event_timeout;
+       adapter->rsi_host_intf = RSI_HOST_INTF_USB;
+       adapter->host_intf_ops = &usb_host_intf_ops;
 
        rsi_init_event(&rsi_dev->rx_thread.event);
        status = rsi_create_kthread(common, &rsi_dev->rx_thread,

diff --git a/drivers/net/wireless/rsi/rsi_main.h b/drivers/net/wireless/rsi/rsi_main.h
index 1d5904bc2c7439459a87dc054f83b53857fb3ef3..7fdeda7ae07cdc2aa20b42d68fdc70c37f995d30 100644 (file)
--- a/drivers/net/wireless/rsi/rsi_main.h
+++ b/drivers/net/wireless/rsi/rsi_main.h
@@ -209,6 +209,11 @@ struct rsi_common {
        u8 ant_in_use;
 };
 
+enum host_intf {
+       RSI_HOST_INTF_SDIO = 0,
+       RSI_HOST_INTF_USB
+};
+
 struct rsi_hw {
        struct rsi_common *priv;
        struct ieee80211_hw *hw;
@@ -219,16 +224,25 @@ struct rsi_hw {
        struct device *device;
        u8 sc_nvifs;
 
+       enum host_intf rsi_host_intf;
 #ifdef CONFIG_RSI_DEBUGFS
        struct rsi_debugfs *dfsentry;
        u8 num_debugfs_entries;
 #endif
        u8 dfs_region;
        void *rsi_dev;
-       int (*host_intf_read_pkt)(struct rsi_hw *adapter, u8 *pkt, u32 len);
-       int (*host_intf_write_pkt)(struct rsi_hw *adapter, u8 *pkt, u32 len);
+       struct rsi_host_intf_ops *host_intf_ops;
        int (*check_hw_queue_status)(struct rsi_hw *adapter, u8 q_num);
        int (*rx_urb_submit)(struct rsi_hw *adapter);
        int (*determine_event_timeout)(struct rsi_hw *adapter);
 };
+
+struct rsi_host_intf_ops {
+       int (*read_pkt)(struct rsi_hw *adapter, u8 *pkt, u32 len);
+       int (*write_pkt)(struct rsi_hw *adapter, u8 *pkt, u32 len);
+       int (*read_reg_multiple)(struct rsi_hw *adapter, u32 addr,
+                                u8 *data, u16 count);
+       int (*write_reg_multiple)(struct rsi_hw *adapter, u32 addr,
+                                 u8 *data, u16 count);
+};
 #endif