Skip to content

Commit

Permalink
fec: remove unnecessary cast
Browse files Browse the repository at this point in the history
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Sascha Hauer authored and David S. Miller committed Apr 16, 2009
1 parent 2e28532 commit 8d4dd5c
Showing 1 changed file with 5 additions and 9 deletions.
14 changes: 5 additions & 9 deletions drivers/net/fec.c
Original file line number Diff line number Diff line change
Expand Up @@ -1660,11 +1660,10 @@ int __init fec_enet_init(struct net_device *dev, int index)
struct bufdesc *bdp, *cbd_base;
int i, j;

/* Allocate memory for buffer descriptors.
*/
mem_addr = (unsigned long)dma_alloc_coherent(NULL, PAGE_SIZE,
&fep->bd_dma, GFP_KERNEL);
if (mem_addr == 0) {
/* Allocate memory for buffer descriptors. */
cbd_base = dma_alloc_coherent(NULL, PAGE_SIZE, &fep->bd_dma,
GFP_KERNEL);
if (!cbd_base) {
printk("FEC: allocate descriptor memory failed?\n");
return -ENOMEM;
}
Expand Down Expand Up @@ -1698,10 +1697,7 @@ int __init fec_enet_init(struct net_device *dev, int index)
}
#endif

cbd_base = (struct bufdesc *)mem_addr;

/* Set receive and transmit descriptor base.
*/
/* Set receive and transmit descriptor base. */
fep->rx_bd_base = cbd_base;
fep->tx_bd_base = cbd_base + RX_RING_SIZE;

Expand Down

0 comments on commit 8d4dd5c

Please sign in to comment.