[PATCH 10/15] net: pcnet: Pass private data through dev->priv

[Marek Vasut]

Get rid of the global point to private data, and rather pass it
thought dev->priv. Also remove the unnecessary check for lp being
non-NULL, since it is always NULL at this point.

Signed-off-by: Marek Vasut <marek.vasut+renesas at gmail.com>
Cc: Daniel Schwierzeck <daniel.schwierzeck at gmail.com>
Cc: Joe Hershberger <joe.hershberger at ni.com>
---
 drivers/net/pcnet.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/drivers/net/pcnet.c b/drivers/net/pcnet.c
index c8f93ae2a5..ced025c1a5 100644
--- a/drivers/net/pcnet.c
+++ b/drivers/net/pcnet.c
@@ -84,8 +84,6 @@ struct pcnet_priv {
 	int cur_tx;
 };
 
-static struct pcnet_priv *lp;
-
 /* Offsets from base I/O address for WIO mode */
 #define PCNET_RDP		0x10
 #define PCNET_RAP		0x12
@@ -209,6 +207,7 @@ static int pcnet_probe(struct eth_device *dev, bd_t *bis, int dev_nr)
 
 static int pcnet_init(struct eth_device *dev, bd_t *bis)
 {
+	struct pcnet_priv *lp = dev->priv;
 	struct pcnet_uncached_priv *uc;
 	int i, val;
 	unsigned long addr;
@@ -328,6 +327,7 @@ static int pcnet_init(struct eth_device *dev, bd_t *bis)
 
 static int pcnet_send(struct eth_device *dev, void *packet, int pkt_len)
 {
+	struct pcnet_priv *lp = dev->priv;
 	int i, status;
 	u32 addr;
 	struct pcnet_tx_head *entry = &lp->uc->tx_ring[lp->cur_tx];
@@ -376,6 +376,7 @@ static int pcnet_send(struct eth_device *dev, void *packet, int pkt_len)
 
 static int pcnet_recv (struct eth_device *dev)
 {
+	struct pcnet_priv *lp = dev->priv;
 	struct pcnet_rx_head *entry;
 	unsigned char *buf;
 	int pkt_len = 0;
@@ -452,6 +453,7 @@ int pcnet_initialize(bd_t *bis)
 {
 	pci_dev_t devbusfn;
 	struct eth_device *dev;
+	struct pcnet_priv *lp;
 	u16 command, status;
 	int dev_nr = 0;
 	u32 bar;
@@ -480,15 +482,13 @@ int pcnet_initialize(bd_t *bis)
 		 * never be used concurrently. In 32bit mode the RX and TX
 		 * ring entries must be aligned on 16-byte boundaries.
 		 */
-		if (!lp) {
-			lp = malloc_cache_aligned(sizeof(*lp));
-			lp->uc = map_physmem((phys_addr_t)&lp->ucp,
-					     sizeof(lp->ucp), MAP_NOCACHE);
-			flush_dcache_range((unsigned long)lp,
-					   (unsigned long)lp + sizeof(*lp));
-		}
-
+		lp = malloc_cache_aligned(sizeof(*lp));
+		lp->uc = map_physmem((phys_addr_t)&lp->ucp,
+				     sizeof(lp->ucp), MAP_NOCACHE);
 		lp->dev = devbusfn;
+		flush_dcache_range((unsigned long)lp,
+				   (unsigned long)lp + sizeof(*lp));
+		dev->priv = lp;
 		sprintf(dev->name, "pcnet#%d", dev_nr);
 
 		/*
-- 
2.25.1