Skip to content

Commit

Permalink
Staging: sbe-2t3e3: remove T3E3_USE_CONTIGMALLOC
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Alexander Beregalov authored and Greg Kroah-Hartman committed Apr 20, 2011
1 parent 877a344 commit e756910
Showing 1 changed file with 0 additions and 20 deletions.
20 changes: 0 additions & 20 deletions drivers/staging/sbe-2t3e3/dc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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:"
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit e756910

Please sign in to comment.