diff options
| author | Daniel Drake <dsd@laptop.org> | 2012-04-16 23:52:42 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-04-17 14:57:13 -0400 |
| commit | 370803c25dd77332ee4ca97884c3a5e1e1eafbca (patch) | |
| tree | 1ed72c00356fe54b913fa4ec26a837c7014eb1e0 /drivers/net/wireless/libertas/decl.h | |
| parent | be03d4a45c09ee5100d3aaaedd087f19bc20d01f (diff) | |
| download | blackbird-op-linux-370803c25dd77332ee4ca97884c3a5e1e1eafbca.tar.gz blackbird-op-linux-370803c25dd77332ee4ca97884c3a5e1e1eafbca.zip | |
libertas: Firmware loading simplifications
Remove the ability to pass module parameters with firmware filenames
for USB and SDIO interfaces.
Remove the ability to pass custom "user" filenames to lbs_get_firmware().
Remove the ability to reprogram internal device memory with a different
firmware from the USB driver (we don't know of any users), and simplify
the OLPC firmware loading quirk to simply placing the OLPC firmware
at the top of the list (we don't know of any users other than OLPC).
Move lbs_get_firmware() into its own file.
These simplifications should have no real-life effect but make the
upcoming transition to asynchronous firmware loading considerably less
painful.
Signed-off-by: Daniel Drake <dsd@laptop.org>
Acked-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas/decl.h')
| -rw-r--r-- | drivers/net/wireless/libertas/decl.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/libertas/decl.h b/drivers/net/wireless/libertas/decl.h index bc951ab4b681..2fb2e31733ee 100644 --- a/drivers/net/wireless/libertas/decl.h +++ b/drivers/net/wireless/libertas/decl.h @@ -66,8 +66,7 @@ int lbs_exit_auto_deep_sleep(struct lbs_private *priv); u32 lbs_fw_index_to_data_rate(u8 index); u8 lbs_data_rate_to_fw_index(u32 rate); -int lbs_get_firmware(struct device *dev, const char *user_helper, - const char *user_mainfw, u32 card_model, +int lbs_get_firmware(struct device *dev, u32 card_model, const struct lbs_fw_table *fw_table, const struct firmware **helper, const struct firmware **mainfw); |
