mwifiex: define a macro for MPA base address

As Multiple-Port Aggregation base address value is fixed, we can
have a macro for it.

Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/mwifiex/sdio.c b/drivers/net/wireless/mwifiex/sdio.c
index 99a508b878647d6a78b720f28fed290802023819..1892e889d41ea90701871035bee965471f658775 100644 (file)
--- a/drivers/net/wireless/mwifiex/sdio.c
+++ b/drivers/net/wireless/mwifiex/sdio.c
@@ -1100,7 +1100,7 @@ static int mwifiex_sdio_card_to_host_mp_aggr(struct mwifiex_adapter *adapter,
                dev_dbg(adapter->dev, "info: do_rx_aggr: num of packets: %d\n",
                        card->mpa_rx.pkt_cnt);
 
-               mport = (adapter->ioport | 0x1000 |
+               mport = (adapter->ioport | SDIO_MPA_ADDR_BASE |
                         (card->mpa_rx.ports << 4)) + card->mpa_rx.start_port;
 
                if (mwifiex_read_data_sync(adapter, card->mpa_rx.buf,
@@ -1419,7 +1419,7 @@ static int mwifiex_host_to_card_mp_aggr(struct mwifiex_adapter *adapter,
                dev_dbg(adapter->dev, "data: %s: send aggr buffer: %d %d\n",
                        __func__,
                                card->mpa_tx.start_port, card->mpa_tx.ports);
-               mport = (adapter->ioport | 0x1000 |
+               mport = (adapter->ioport | SDIO_MPA_ADDR_BASE |
                         (card->mpa_tx.ports << 4)) + card->mpa_tx.start_port;
                ret = mwifiex_write_data_to_card(adapter, card->mpa_tx.buf,
                                                 card->mpa_tx.buf_len, mport);

diff --git a/drivers/net/wireless/mwifiex/sdio.h b/drivers/net/wireless/mwifiex/sdio.h
index 0d931f72963947d259d1da491c60711abcb19643..e4016d2692d4fe838c20954d0b9a1882de67d938 100644 (file)
--- a/drivers/net/wireless/mwifiex/sdio.h
+++ b/drivers/net/wireless/mwifiex/sdio.h
@@ -42,6 +42,7 @@
 
 #define MWIFIEX_SDIO_BYTE_MODE_MASK    0x80000000
 
+#define SDIO_MPA_ADDR_BASE             0x1000
 #define CTRL_PORT                      0
 #define CTRL_PORT_MASK                 0x0001