Skip to content

Commit

Permalink
staging: csr: remove CONFIG_HOTPLUG ifdefs
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Nov 21, 2012
1 parent e543acf commit 9419066
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions drivers/staging/csr/firmware.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 9419066

Please sign in to comment.