aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/csr
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-11-19 13:19:22 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-21 15:04:58 -0800
commit941906647a12749ae769b3414f652f1f03e22f69 (patch)
tree468c981fae0778325887deacd2cd7eb804a3c095 /drivers/staging/csr
parente543acf07db78cfc135e45c4ce0ed26ccf774c37 (diff)
downloadlinaro-lsk-941906647a12749ae769b3414f652f1f03e22f69.tar.gz
staging: csr: remove CONFIG_HOTPLUG ifdefs
Remove conditional code based on CONFIG_HOTPLUG being false. It's always on now in preparation of it going away as an option. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/csr')
-rw-r--r--drivers/staging/csr/firmware.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/staging/csr/firmware.c b/drivers/staging/csr/firmware.c
index 1d1c10392ad..b42a4d6a0c3 100644
--- a/drivers/staging/csr/firmware.c
+++ b/drivers/staging/csr/firmware.c
@@ -233,8 +233,6 @@ unifi_fw_read(void *ospriv, void *arg, u32 offset, void *buf, u32 len)
int
uf_run_unifihelper(unifi_priv_t *priv)
{
-#ifdef CONFIG_HOTPLUG
-
#ifdef ANDROID_BUILD
char *prog = "/system/bin/unififw";
#else
@@ -280,10 +278,6 @@ uf_run_unifihelper(unifi_priv_t *priv)
r = call_usermodehelper(argv[0], argv, envp, UMH_WAIT_EXEC);
return r;
-#else
- unifi_trace(priv, UDBG1, "Can't automatically download firmware because kernel does not have HOTPLUG\n");
- return -1;
-#endif
} /* uf_run_unifihelper() */
#ifdef CSR_WIFI_SPLIT_PATCH