[PATCH 04/12] fec: remove unnecessary cast

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Sascha Hauer
Date: Wednesday, April 15, 2009 - 4:32 am

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/net/fec.c |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/drivers/net/fec.c b/drivers/net/fec.c
index fea8e27..3a43d96 100644
--- a/drivers/net/fec.c
+++ b/drivers/net/fec.c
@@ -1661,11 +1661,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;
 	}
@@ -1699,10 +1698,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;
 
-- 
1.6.2.1

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH] FEC driver: patches for -next, Sascha Hauer, (Wed Apr 15, 4:32 am)
[PATCH 01/12] fec: remove unused ifdef, Sascha Hauer, (Wed Apr 15, 4:32 am)
[PATCH 02/12] fec: switch to writel/readl, Sascha Hauer, (Wed Apr 15, 4:32 am)
[PATCH 03/12] fec: do not typedef struct types, Sascha Hauer, (Wed Apr 15, 4:32 am)
[PATCH 04/12] fec: remove unnecessary cast, Sascha Hauer, (Wed Apr 15, 4:32 am)
[PATCH 05/12] fec: Codingstyle cleanups, Sascha Hauer, (Wed Apr 15, 4:32 am)
[PATCH 07/12] fec: refactor init function, Sascha Hauer, (Wed Apr 15, 4:32 am)
[PATCH 08/12] fec: align receive packets, Sascha Hauer, (Wed Apr 15, 4:32 am)
[PATCH 09/12] fec: remove debugging printks, Sascha Hauer, (Wed Apr 15, 4:32 am)
[PATCH 10/12] fec: switch to net_device_ops, Sascha Hauer, (Wed Apr 15, 4:32 am)
[PATCH 11/12] FEC Buffer rework, Sascha Hauer, (Wed Apr 15, 4:32 am)
[PATCH 12/12] fec: call fec_restart() in fec_open(), Sascha Hauer, (Wed Apr 15, 4:32 am)
Re: [PATCH] FEC driver: patches for -next, Greg Ungerer, (Wed Apr 15, 5:12 am)
Re: [PATCH] FEC driver: patches for -next, Sascha Hauer, (Wed Apr 15, 5:55 am)
Re: [PATCH 02/12] fec: switch to writel/readl, Sascha Hauer, (Wed Apr 15, 6:11 am)
Re: [PATCH 02/12] fec: switch to writel/readl, David Miller, (Thu Apr 16, 2:36 am)
Re: [PATCH 03/12] fec: do not typedef struct types, David Miller, (Thu Apr 16, 2:36 am)
Re: [PATCH 04/12] fec: remove unnecessary cast, David Miller, (Thu Apr 16, 2:36 am)
Re: [PATCH 05/12] fec: Codingstyle cleanups, David Miller, (Thu Apr 16, 2:36 am)
Re: [PATCH 07/12] fec: refactor init function, David Miller, (Thu Apr 16, 2:37 am)
Re: [PATCH 08/12] fec: align receive packets, David Miller, (Thu Apr 16, 2:37 am)
Re: [PATCH 09/12] fec: remove debugging printks, David Miller, (Thu Apr 16, 2:37 am)
Re: [PATCH 10/12] fec: switch to net_device_ops, David Miller, (Thu Apr 16, 2:37 am)
Re: [PATCH 11/12] FEC Buffer rework, David Miller, (Thu Apr 16, 2:38 am)
Re: [PATCH 12/12] fec: call fec_restart() in fec_open(), David Miller, (Thu Apr 16, 2:38 am)
Re: [PATCH 11/12] FEC Buffer rework, Greg Ungerer, (Fri Apr 17, 3:07 am)
Re: [PATCH 11/12] FEC Buffer rework, Sascha Hauer, (Fri Apr 17, 3:12 am)