[PATCH v3 net-next 06/10] net: korina: Only pass mac address via platform data

[Thomas Bogendoerfer]

Get rid of access to struct korina_device by just passing the mac
address via platform data and use drvdata for passing netdev to remove
function.

Signed-off-by: Thomas Bogendoerfer <tsbog...@alpha.franken.de>
---
 arch/mips/rb532/devices.c     |  5 +++--
 drivers/net/ethernet/korina.c | 11 ++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/arch/mips/rb532/devices.c b/arch/mips/rb532/devices.c
index dd34f1b32b79..5fc3c8ee4f31 100644
--- a/arch/mips/rb532/devices.c
+++ b/arch/mips/rb532/devices.c
@@ -105,6 +105,9 @@ static struct platform_device korina_dev0 = {
        .name = "korina",
        .resource = korina_dev0_res,
        .num_resources = ARRAY_SIZE(korina_dev0_res),
+       .dev = {
+               .platform_data = &korina_dev0_data.mac,
+       }
 };
 
 static struct resource cf_slot0_res[] = {
@@ -299,8 +302,6 @@ static int __init plat_setup_devices(void)
        /* set the uart clock to the current cpu frequency */
        rb532_uart_res[0].uartclk = idt_cpu_freq;
 
-       dev_set_drvdata(&korina_dev0.dev, &korina_dev0_data);
-
        gpiod_add_lookup_table(&cf_slot0_gpio_table);
        return platform_add_devices(rb532_devs, ARRAY_SIZE(rb532_devs));
 }
diff --git a/drivers/net/ethernet/korina.c b/drivers/net/ethernet/korina.c
index f00ffbbdfba7..1d7dead17ac3 100644
--- a/drivers/net/ethernet/korina.c
+++ b/drivers/net/ethernet/korina.c
@@ -1053,7 +1053,7 @@ static const struct net_device_ops korina_netdev_ops = {
 
 static int korina_probe(struct platform_device *pdev)
 {
-       struct korina_device *bif = platform_get_drvdata(pdev);
+       u8 *mac_addr = dev_get_platdata(&pdev->dev);
        struct korina_private *lp;
        struct net_device *dev;
        void __iomem *p;
@@ -1066,8 +1066,7 @@ static int korina_probe(struct platform_device *pdev)
        SET_NETDEV_DEV(dev, &pdev->dev);
        lp = netdev_priv(dev);
 
-       bif->dev = dev;
-       memcpy(dev->dev_addr, bif->mac, ETH_ALEN);
+       memcpy(dev->dev_addr, mac_addr, ETH_ALEN);
 
        lp->rx_irq = platform_get_irq_byname(pdev, "korina_rx");
        lp->tx_irq = platform_get_irq_byname(pdev, "korina_tx");
@@ -1121,6 +1120,8 @@ static int korina_probe(struct platform_device *pdev)
        lp->mii_if.phy_id_mask = 0x1f;
        lp->mii_if.reg_num_mask = 0x1f;
 
+       platform_set_drvdata(pdev, dev);
+
        rc = register_netdev(dev);
        if (rc < 0) {
                printk(KERN_ERR DRV_NAME
@@ -1138,9 +1139,9 @@ static int korina_probe(struct platform_device *pdev)
 
 static int korina_remove(struct platform_device *pdev)
 {
-       struct korina_device *bif = platform_get_drvdata(pdev);
+       struct net_device *dev = platform_get_drvdata(pdev);
 
-       unregister_netdev(bif->dev);
+       unregister_netdev(dev);
 
        return 0;
 }
-- 
2.29.2