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 <[email protected]> Cc: [email protected] --- drivers/staging/csr/firmware.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/staging/csr/firmware.c b/drivers/staging/csr/firmware.c index 1d1c103..b42a4d6 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 -- 1.8.0 _______________________________________________ devel mailing list [email protected] http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
