diff options
| author | Tobin C. Harding <me@tobin.cc> | 2017-04-12 02:56:48 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-04-14 11:22:03 +0300 |
| commit | cf10e78e1b297f9a314be1e3d2a3cab184a120d7 (patch) | |
| tree | 11b22a069510d37f530aa06782cc68ed3033a7da | |
| parent | fa125ae482085650d5740af355bdcb5532865295 (diff) | |
| download | linux-cf10e78e1b297f9a314be1e3d2a3cab184a120d7.tar.xz | |
staging: ks7010: remove unused read_buf
Driver SDIO code allocates memory for a buffer that is never used. It
can be safely removed.
Remove unused buffer, including allocation and freeing of memory.
Signed-off-by: Tobin C. Harding <me@tobin.cc>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/ks7010/ks7010_sdio.c | 14 | ||||
| -rw-r--r-- | drivers/staging/ks7010/ks7010_sdio.h | 1 |
2 files changed, 3 insertions, 12 deletions
diff --git a/drivers/staging/ks7010/ks7010_sdio.c b/drivers/staging/ks7010/ks7010_sdio.c index c7e01801764f..5f14fd00f87f 100644 --- a/drivers/staging/ks7010/ks7010_sdio.c +++ b/drivers/staging/ks7010/ks7010_sdio.c @@ -952,10 +952,6 @@ static int ks7010_sdio_probe(struct sdio_func *func, /* private memory initialize */ priv->ks_wlan_hw.sdio_card = card; - priv->ks_wlan_hw.read_buf = NULL; - priv->ks_wlan_hw.read_buf = kmalloc(RX_DATA_SIZE, GFP_KERNEL); - if (!priv->ks_wlan_hw.read_buf) - goto err_free_netdev; priv->dev_state = DEVICE_STATE_PREBOOT; priv->net_dev = netdev; @@ -982,7 +978,7 @@ static int ks7010_sdio_probe(struct sdio_func *func, dev_err(&card->func->dev, "ks7010: firmware load failed !! return code = %d\n", ret); - goto err_free_read_buf; + goto err_free_netdev; } /* interrupt setting */ @@ -1010,7 +1006,7 @@ static int ks7010_sdio_probe(struct sdio_func *func, priv->ks_wlan_hw.ks7010sdio_wq = create_workqueue("ks7010sdio_wq"); if (!priv->ks_wlan_hw.ks7010sdio_wq) { DPRINTK(1, "create_workqueue failed !!\n"); - goto err_free_read_buf; + goto err_free_netdev; } INIT_DELAYED_WORK(&priv->ks_wlan_hw.rw_wq, ks7010_rw_function); @@ -1018,13 +1014,10 @@ static int ks7010_sdio_probe(struct sdio_func *func, ret = register_netdev(priv->net_dev); if (ret) - goto err_free_read_buf; + goto err_free_netdev; return 0; - err_free_read_buf: - kfree(priv->ks_wlan_hw.read_buf); - priv->ks_wlan_hw.read_buf = NULL; err_free_netdev: free_netdev(priv->net_dev); card->priv = NULL; @@ -1117,7 +1110,6 @@ static void ks7010_sdio_remove(struct sdio_func *func) unregister_netdev(netdev); trx_device_exit(priv); - kfree(priv->ks_wlan_hw.read_buf); free_netdev(priv->net_dev); card->priv = NULL; } diff --git a/drivers/staging/ks7010/ks7010_sdio.h b/drivers/staging/ks7010/ks7010_sdio.h index 3c4047fd1f67..495649059c9e 100644 --- a/drivers/staging/ks7010/ks7010_sdio.h +++ b/drivers/staging/ks7010/ks7010_sdio.h @@ -92,7 +92,6 @@ struct hw_info_t { struct ks_sdio_card *sdio_card; struct workqueue_struct *ks7010sdio_wq; struct delayed_work rw_wq; - unsigned char *read_buf; struct tasklet_struct rx_bh_task; }; |