mv643xx_eth: Place explicit port number in mv643xx_eth_platform_data

We were using the platform_device.id field to identify which ethernet
port is used for mv643xx_eth device.  This is not generally correct.
It will be incorrect, for example, if a hardware platform uses a single
port but not the first port.  Here, we add an explicit port_number field
to struct mv643xx_eth_platform_data.

This makes the mv643xx_eth_platform_data structure required, but that
isn't an issue since all users currently provide it already.

Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

1 files changed, 29 insertions, 24 deletions

diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index be2ddbb6ef56..9ba21e0f27c5 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -1309,7 +1309,7 @@ static void mv643xx_init_ethtool_cmd(struct net_device *dev, int phy_address,
 static int mv643xx_eth_probe(struct platform_device *pdev)
 {
         struct mv643xx_eth_platform_data *pd;
-        int port_num = pdev->id;
+        int port_num;
         struct mv643xx_private *mp;
         struct net_device *dev;
         u8 *p;
@@ -1319,6 +1319,12 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
         int duplex = DUPLEX_HALF;
         int speed = 0;                  /* default to auto-negotiation */
 
+        pd = pdev->dev.platform_data;
+        if (pd == NULL) {
+                printk(KERN_ERR "No mv643xx_eth_platform_data\n");
+                return -ENODEV;
+        }
+
         dev = alloc_etherdev(sizeof(struct mv643xx_private));
         if (!dev)
                 return -ENOMEM;
@@ -1331,8 +1337,6 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
         BUG_ON(!res);
         dev->irq = res->start;
 
-        mp->port_num = port_num;
-
         dev->open = mv643xx_eth_open;
         dev->stop = mv643xx_eth_stop;
         dev->hard_start_xmit = mv643xx_eth_start_xmit;
@@ -1373,39 +1377,40 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
 
         spin_lock_init(&mp->lock);
 
+        port_num = pd->port_number;
+
         /* set default config values */
         eth_port_uc_addr_get(dev, dev->dev_addr);
         mp->rx_ring_size = MV643XX_ETH_PORT_DEFAULT_RECEIVE_QUEUE_SIZE;
         mp->tx_ring_size = MV643XX_ETH_PORT_DEFAULT_TRANSMIT_QUEUE_SIZE;
 
-        pd = pdev->dev.platform_data;
-        if (pd) {
-                if (is_valid_ether_addr(pd->mac_addr))
-                        memcpy(dev->dev_addr, pd->mac_addr, 6);
+        if (is_valid_ether_addr(pd->mac_addr))
+                memcpy(dev->dev_addr, pd->mac_addr, 6);
 
-                if (pd->phy_addr || pd->force_phy_addr)
-                        ethernet_phy_set(port_num, pd->phy_addr);
+        if (pd->phy_addr || pd->force_phy_addr)
+                ethernet_phy_set(port_num, pd->phy_addr);
 
-                if (pd->rx_queue_size)
-                        mp->rx_ring_size = pd->rx_queue_size;
+        if (pd->rx_queue_size)
+                mp->rx_ring_size = pd->rx_queue_size;
 
-                if (pd->tx_queue_size)
-                        mp->tx_ring_size = pd->tx_queue_size;
+        if (pd->tx_queue_size)
+                mp->tx_ring_size = pd->tx_queue_size;
 
-                if (pd->tx_sram_size) {
-                        mp->tx_sram_size = pd->tx_sram_size;
-                        mp->tx_sram_addr = pd->tx_sram_addr;
-                }
-
-                if (pd->rx_sram_size) {
-                        mp->rx_sram_size = pd->rx_sram_size;
-                        mp->rx_sram_addr = pd->rx_sram_addr;
-                }
+        if (pd->tx_sram_size) {
+                mp->tx_sram_size = pd->tx_sram_size;
+                mp->tx_sram_addr = pd->tx_sram_addr;
+        }
 
-                duplex = pd->duplex;
-                speed = pd->speed;
+        if (pd->rx_sram_size) {
+                mp->rx_sram_size = pd->rx_sram_size;
+                mp->rx_sram_addr = pd->rx_sram_addr;
         }
 
+        duplex = pd->duplex;
+        speed = pd->speed;
+
+        mp->port_num = port_num;
+
         /* Hook up MII support for ethtool */
         mp->mii.dev = dev;
         mp->mii.mdio_read = mv643xx_mdio_read;