aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/mwifiex/sdio.c
diff options
context:
space:
mode:
authorAmitkumar Karwar <akarwar@marvell.com>2011-04-13 20:27:08 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-04-14 15:35:13 -0400
commit572e8f3ead47ad223fb428a4f1db986317e8e0ec (patch)
treeb5542aa018fad9705b229d695e84e4c194f7ccc3 /drivers/net/wireless/mwifiex/sdio.c
parent19a898601ad192d8c59c3a8f1a4501919f53b94d (diff)
mwifiex: remove unused function parameters
Some function parameters become useless after previous cleanup changes. 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>
Diffstat (limited to 'drivers/net/wireless/mwifiex/sdio.c')
-rw-r--r--drivers/net/wireless/mwifiex/sdio.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/drivers/net/wireless/mwifiex/sdio.c b/drivers/net/wireless/mwifiex/sdio.c
index fa46df509757..41c087d3f0f5 100644
--- a/drivers/net/wireless/mwifiex/sdio.c
+++ b/drivers/net/wireless/mwifiex/sdio.c
@@ -282,7 +282,7 @@ mwifiex_read_reg(struct mwifiex_adapter *adapter, u32 reg, u32 *data)
282 */ 282 */
283static int 283static int
284mwifiex_write_data_sync(struct mwifiex_adapter *adapter, 284mwifiex_write_data_sync(struct mwifiex_adapter *adapter,
285 u8 *buffer, u32 pkt_len, u32 port, u32 timeout) 285 u8 *buffer, u32 pkt_len, u32 port)
286{ 286{
287 struct sdio_mmc_card *card = adapter->card; 287 struct sdio_mmc_card *card = adapter->card;
288 int ret = -1; 288 int ret = -1;
@@ -314,9 +314,8 @@ mwifiex_write_data_sync(struct mwifiex_adapter *adapter,
314/* 314/*
315 * This function reads multiple data from SDIO card memory. 315 * This function reads multiple data from SDIO card memory.
316 */ 316 */
317static int mwifiex_read_data_sync(struct mwifiex_adapter *adapter, 317static int mwifiex_read_data_sync(struct mwifiex_adapter *adapter, u8 *buffer,
318 u8 *buffer, u32 len, 318 u32 len, u32 port, u8 claim)
319 u32 port, u32 timeout, u8 claim)
320{ 319{
321 struct sdio_mmc_card *card = adapter->card; 320 struct sdio_mmc_card *card = adapter->card;
322 int ret = -1; 321 int ret = -1;
@@ -430,8 +429,7 @@ static int mwifiex_write_data_to_card(struct mwifiex_adapter *adapter,
430 int ret = 0; 429 int ret = 0;
431 430
432 do { 431 do {
433 ret = mwifiex_write_data_sync(adapter, payload, pkt_len, 432 ret = mwifiex_write_data_sync(adapter, payload, pkt_len, port);
434 port, 0);
435 if (ret) { 433 if (ret) {
436 i++; 434 i++;
437 dev_err(adapter->dev, "host_to_card, write iomem" 435 dev_err(adapter->dev, "host_to_card, write iomem"
@@ -630,7 +628,7 @@ static int mwifiex_sdio_card_to_host(struct mwifiex_adapter *adapter,
630 return -1; 628 return -1;
631 } 629 }
632 630
633 ret = mwifiex_read_data_sync(adapter, buffer, npayload, ioport, 0, 1); 631 ret = mwifiex_read_data_sync(adapter, buffer, npayload, ioport, 1);
634 632
635 if (ret) { 633 if (ret) {
636 dev_err(adapter->dev, "%s: read iomem failed: %d\n", __func__, 634 dev_err(adapter->dev, "%s: read iomem failed: %d\n", __func__,
@@ -769,7 +767,7 @@ static int mwifiex_prog_fw_w_helper(struct mwifiex_adapter *adapter,
769 767
770 ret = mwifiex_write_data_sync(adapter, fwbuf, tx_blocks * 768 ret = mwifiex_write_data_sync(adapter, fwbuf, tx_blocks *
771 MWIFIEX_SDIO_BLOCK_SIZE, 769 MWIFIEX_SDIO_BLOCK_SIZE,
772 adapter->ioport, 0); 770 adapter->ioport);
773 if (ret) { 771 if (ret) {
774 dev_err(adapter->dev, "FW download, write iomem (%d)" 772 dev_err(adapter->dev, "FW download, write iomem (%d)"
775 " failed @ %d\n", i, offset); 773 " failed @ %d\n", i, offset);
@@ -842,7 +840,7 @@ static void mwifiex_interrupt_status(struct mwifiex_adapter *adapter)
842 unsigned long flags; 840 unsigned long flags;
843 841
844 if (mwifiex_read_data_sync(adapter, card->mp_regs, MAX_MP_REGS, 842 if (mwifiex_read_data_sync(adapter, card->mp_regs, MAX_MP_REGS,
845 REG_PORT | MWIFIEX_SDIO_BYTE_MODE_MASK, 0, 843 REG_PORT | MWIFIEX_SDIO_BYTE_MODE_MASK,
846 0)) { 844 0)) {
847 dev_err(adapter->dev, "read mp_regs failed\n"); 845 dev_err(adapter->dev, "read mp_regs failed\n");
848 return; 846 return;
@@ -1050,7 +1048,7 @@ static int mwifiex_sdio_card_to_host_mp_aggr(struct mwifiex_adapter *adapter,
1050 card->mpa_rx.buf_len, 1048 card->mpa_rx.buf_len,
1051 (adapter->ioport | 0x1000 | 1049 (adapter->ioport | 0x1000 |
1052 (card->mpa_rx.ports << 4)) + 1050 (card->mpa_rx.ports << 4)) +
1053 card->mpa_rx.start_port, 0, 1)) 1051 card->mpa_rx.start_port, 1))
1054 return -1; 1052 return -1;
1055 1053
1056 curr_ptr = card->mpa_rx.buf; 1054 curr_ptr = card->mpa_rx.buf;