diff options
| author | Wolfram Sang <wsa+renesas@sang-engineering.com> | 2016-05-31 10:56:38 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-06-08 05:42:53 (GMT) |
| commit | 2801d7a289bd435ae4920a792c5497a6450686ef (patch) | |
| tree | 8ee9dfbb3369009c65211901cba306ada9670dd7 /drivers/staging/ks7010 | |
| parent | cdf6ecc5eed103190f1df9cdd09659ef2cc7d23a (diff) | |
| download | linux-2801d7a289bd435ae4920a792c5497a6450686ef.tar.xz | |
staging: ks7010: remove supported card table with one element
There is only this card supported, no need to iterate over the table.
The resulting firmware filename wasn't used anyway, but came from the
config file or hardcoded default.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/ks7010')
| -rw-r--r-- | drivers/staging/ks7010/ks7010_sdio.c | 31 | ||||
| -rw-r--r-- | drivers/staging/ks7010/ks7010_sdio.h | 2 |
2 files changed, 2 insertions, 31 deletions
diff --git a/drivers/staging/ks7010/ks7010_sdio.c b/drivers/staging/ks7010/ks7010_sdio.c index ed4d579..8e8476b 100644 --- a/drivers/staging/ks7010/ks7010_sdio.c +++ b/drivers/staging/ks7010/ks7010_sdio.c @@ -35,19 +35,6 @@ static const struct sdio_device_id if_sdio_ids[] = { { /* all zero */ } }; -struct ks_sdio_model { - int model; - const char *firmware; -}; - -static struct ks_sdio_model ks_sdio_models[] = { - { - /* ks7010 */ - .model = 0x10, - .firmware = "ks7010sd.rom", - }, -}; - static int ks7910_sdio_probe(struct sdio_func *function, const struct sdio_device_id *device); static void ks7910_sdio_remove(struct sdio_func *function); @@ -996,7 +983,7 @@ static int ks7910_sdio_probe(struct sdio_func *func, struct ks_sdio_card *card; struct net_device *netdev; unsigned char rw_data; - int i = 0, ret; + int ret; DPRINTK(5, "ks7910_sdio_probe()\n"); @@ -1009,22 +996,8 @@ static int ks7910_sdio_probe(struct sdio_func *func, return -ENOMEM; card->func = func; - card->model = 0x10; spin_lock_init(&card->lock); - /* select model */ - for (i = 0; i < ARRAY_SIZE(ks_sdio_models); i++) { - if (card->model == ks_sdio_models[i].model) - break; - } - - if (i == ARRAY_SIZE(ks_sdio_models)) { - DPRINTK(5, "unkown card model 0x%x\n", card->model); - goto error; - } - - card->firmware = ks_sdio_models[i].firmware; - /*** Initialize SDIO ***/ sdio_claim_host(func); @@ -1172,7 +1145,7 @@ static int ks7910_sdio_probe(struct sdio_func *func, sdio_release_host(func); sdio_set_drvdata(func, NULL); kfree(card); - error: + return -ENODEV; } diff --git a/drivers/staging/ks7010/ks7010_sdio.h b/drivers/staging/ks7010/ks7010_sdio.h index aea3727..2d7be5d 100644 --- a/drivers/staging/ks7010/ks7010_sdio.h +++ b/drivers/staging/ks7010/ks7010_sdio.h @@ -109,8 +109,6 @@ struct ks_sdio_packet { struct ks_sdio_card { struct sdio_func *func; struct ks_wlan_private *priv; - int model; - const char *firmware; spinlock_t lock; }; |