diff options
| author | Alexander Beregalov <a.beregalov@gmail.com> | 2011-03-26 20:18:09 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-20 13:45:56 -0700 |
| commit | e756910059068f2b247fb8aa6e37e5685b85a0ea (patch) | |
| tree | f57258f07d40e1974ff8c4279567741aa400b915 /drivers/staging/sbe-2t3e3/dc.c | |
| parent | 877a344b28b51b695d6baaeecb15d0eb6c90daef (diff) | |
Staging: sbe-2t3e3: remove T3E3_USE_CONTIGMALLOC
This code looks useless, t3e3_contigmemory_size is neither declared
nor used anywhere else, as well as T3E3_USE_CONTIGMALLOC.
Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Cc: Krzysztof Halasa <khc@pm.waw.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/sbe-2t3e3/dc.c')
| -rw-r--r-- | drivers/staging/sbe-2t3e3/dc.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/drivers/staging/sbe-2t3e3/dc.c b/drivers/staging/sbe-2t3e3/dc.c index 126a9720c6b..dc53016d546 100644 --- a/drivers/staging/sbe-2t3e3/dc.c +++ b/drivers/staging/sbe-2t3e3/dc.c @@ -341,10 +341,6 @@ u32 dc_init_descriptor_list(struct channel *sc) sc->ether.tx_ring = kzalloc(SBE_2T3E3_TX_DESC_RING_SIZE * sizeof(t3e3_tx_desc_t), GFP_KERNEL); if (sc->ether.tx_ring == NULL) { -#ifdef T3E3_USE_CONTIGMALLOC - t3e3_contigmemory_size = SBE_2T3E3_RX_DESC_RING_SIZE * - sizeof(t3e3_rx_desc_t); -#endif kfree(sc->ether.rx_ring); sc->ether.rx_ring = NULL; dev_err(&sc->pdev->dev, "SBE 2T3E3: no buffer space for RX ring\n"); @@ -366,16 +362,8 @@ u32 dc_init_descriptor_list(struct channel *sc) dev_kfree_skb_any(sc->ether.rx_data[j]); sc->ether.rx_data[j] = NULL; } -#ifdef T3E3_USE_CONTIGMALLOC - t3e3_contigmemory_size = SBE_2T3E3_RX_DESC_RING_SIZE * - sizeof(t3e3_rx_desc_t); -#endif kfree(sc->ether.rx_ring); sc->ether.rx_ring = NULL; -#ifdef T3E3_USE_CONTIGMALLOC - t3e3_contigmemory_size = SBE_2T3E3_TX_DESC_RING_SIZE * - sizeof(t3e3_tx_desc_t); -#endif kfree(sc->ether.tx_ring); sc->ether.tx_ring = NULL; dev_err(&sc->pdev->dev, "SBE 2T3E3: token_alloc err:" @@ -455,19 +443,11 @@ void dc_drop_descriptor_list(struct channel *sc) } if (sc->ether.rx_ring != NULL) { -#ifdef T3E3_USE_CONTIGMALLOC - t3e3_contigmemory_size = SBE_2T3E3_RX_DESC_RING_SIZE * - sizeof(t3e3_rx_desc_t); -#endif kfree(sc->ether.rx_ring); sc->ether.rx_ring = NULL; } if (sc->ether.tx_ring != NULL) { -#ifdef T3E3_USE_CONTIGMALLOC - t3e3_contigmemory_size = SBE_2T3E3_TX_DESC_RING_SIZE * - sizeof(t3e3_tx_desc_t); -#endif kfree(sc->ether.tx_ring); sc->ether.tx_ring = NULL; } |