diff options
| author |   Glen Lee <glen.lee@atmel.com> | 2015-09-23 16:10:52 +0900 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-09-29 02:33:45 +0200 |
| commit | f446ebbeee224cc50c6e8a04916585b8ac5dd566 (patch) | |
| tree | 27bbf8190c0c8d9c7a6820227a75939085b3c345 /drivers/staging/wilc1000 | |
| parent | staging: wilc1000: parse_network_info: remove s32Error (diff) | |
| download | linux-dev-f446ebbeee224cc50c6e8a04916585b8ac5dd566.tar.xz linux-dev-f446ebbeee224cc50c6e8a04916585b8ac5dd566.zip | |
staging: wilc1000: remove ifdef OLD_FPGA_BITFILE line
OLD_FPGA_BITFILE is not used in the driver. Just delete ifdef line and it's
related codes.
Signed-off-by: Glen Lee <glen.lee@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/wilc1000')
| -rw-r--r-- | drivers/staging/wilc1000/wilc_wlan.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c index ddb03a82b0f9..a3dd421b7f32 100644 --- a/drivers/staging/wilc1000/wilc_wlan.c +++ b/drivers/staging/wilc1000/wilc_wlan.c @@ -1500,22 +1500,6 @@ static int wilc_wlan_start(void) /** * Set the host interface **/ -#ifdef OLD_FPGA_BITFILE - acquire_bus(ACQUIRE_ONLY); - ret = p->hif_func.hif_read_reg(WILC_VMM_CORE_CTL, ®); - if (!ret) { - wilc_debug(N_ERR, "[wilc start]: fail read reg vmm_core_ctl...\n"); - release_bus(RELEASE_ALLOW_SLEEP); - return ret; - } - reg |= (p->io_func.io_type << 2); - ret = p->hif_func.hif_write_reg(WILC_VMM_CORE_CTL, reg); - if (!ret) { - wilc_debug(N_ERR, "[wilc start]: fail write reg vmm_core_ctl...\n"); - release_bus(RELEASE_ONLY); - return ret; - } -#else if (p->io_func.io_type == HIF_SDIO) { reg = 0; reg |= (1 << 3); /* bug 4456 and 4557 */ @@ -1572,8 +1556,6 @@ static int wilc_wlan_start(void) ret = -5; return ret; } -#endif - /** * Bus related |