diff options
| author | Daniel Drake <dsd@laptop.org> | 2012-04-17 02:52:42 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-04-17 22:57:13 +0400 |
| commit | 370803c25dd77332ee4ca97884c3a5e1e1eafbca (patch) | |
| tree | 1ed72c00356fe54b913fa4ec26a837c7014eb1e0 /drivers/net/wireless/libertas/if_spi.c | |
| parent | be03d4a45c09ee5100d3aaaedd087f19bc20d01f (diff) | |
| download | linux-370803c25dd77332ee4ca97884c3a5e1e1eafbca.tar.xz | |
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/if_spi.c')
| -rw-r--r-- | drivers/net/wireless/libertas/if_spi.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/libertas/if_spi.c b/drivers/net/wireless/libertas/if_spi.c index 7a5df4f4cb7c..9604a1c4a74d 100644 --- a/drivers/net/wireless/libertas/if_spi.c +++ b/drivers/net/wireless/libertas/if_spi.c @@ -1064,9 +1064,8 @@ static int if_spi_init_card(struct if_spi_card *card) goto out; } - err = lbs_get_firmware(&card->spi->dev, NULL, NULL, - card->card_id, &fw_table[0], &helper, - &mainfw); + err = lbs_get_firmware(&card->spi->dev, card->card_id, + &fw_table[0], &helper, &mainfw); if (err) { netdev_err(priv->dev, "failed to find firmware (%d)\n", err); |