Skip to content

Commit

Permalink
staging: brcm80211: remove custom gpio support code
Browse files Browse the repository at this point in the history
The custom gpio code is intended for hardware platform for specific
customers and require supporting functionality not included in the
fullmac driver. The fullmac driver does not need this so it has been
removed.

Signed-off-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Arend van Spriel authored and Greg Kroah-Hartman committed Jul 5, 2011
1 parent a3e47e0 commit e327ec2
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 164 deletions.
1 change: 0 additions & 1 deletion drivers/staging/brcm80211/brcmfmac/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ DHDOFILES = \
wl_cfg80211.o \
dhd_cdc.o \
dhd_common.o \
dhd_custom_gpio.o \
dhd_sdio.o \
dhd_linux.o \
bcmsdh.o \
Expand Down
156 changes: 0 additions & 156 deletions drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c

This file was deleted.

8 changes: 1 addition & 7 deletions drivers/staging/brcm80211/brcmfmac/dhd_linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -2192,8 +2192,6 @@ static void __exit brcmf_module_cleanup(void)
#if defined(CUSTOMER_HW2) && defined(CONFIG_WIFI_CONTROL_FUNC)
wifi_del_dev();
#endif
/* Call customer gpio to turn off power with WL_REG_ON signal */
brcmf_customer_gpio_wlan_ctrl(WLAN_POWER_OFF);
}

static int __init brcmf_module_init(void)
Expand All @@ -2216,8 +2214,6 @@ static int __init brcmf_module_init(void)
DHD_ERROR(("Invalid module parameters.\n"));
return -EINVAL;
} while (0);
/* Call customer gpio to turn on power with WL_REG_ON signal */
brcmf_customer_gpio_wlan_ctrl(WLAN_POWER_ON);

#if defined(CUSTOMER_HW2) && defined(CONFIG_WIFI_CONTROL_FUNC)
sema_init(&wifi_control_sem, 0);
Expand Down Expand Up @@ -2245,11 +2241,9 @@ static int __init brcmf_module_init(void)
DHD_ERROR(("%s: dhd_bus_register failed\n", __func__));
goto failed;
}
return error;
return 0;

failed:
/* turn off power and exit */
brcmf_customer_gpio_wlan_ctrl(WLAN_POWER_OFF);
return -EINVAL;
}

Expand Down

0 comments on commit e327ec2

Please sign in to comment.