ax88796: remove platform_device member from struct ax_device
authorMarc Kleine-Budde <mkl@pengutronix.de>
Sun, 20 Feb 2011 18:13:20 +0000 (19:13 +0100)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Mon, 21 Feb 2011 12:17:40 +0000 (13:17 +0100)
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
drivers/net/ax88796.c

index 1370cac6d6c0cf9c07c582d10f3d5cb2f84c4808..782d73e0b659dcb81c3a52766dc77908b648c302 100644 (file)
@@ -87,7 +87,6 @@ struct ax_device {
 
        u32 msg_enable;
        void __iomem *map2;
-       struct platform_device *dev;
        struct resource *mem;
        struct resource *mem2;
        struct ax_plat_data *plat;
@@ -545,11 +544,11 @@ static int ax_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
 static void ax_get_drvinfo(struct net_device *dev,
                           struct ethtool_drvinfo *info)
 {
-       struct ax_device *ax = to_ax_dev(dev);
+       struct platform_device *pdev = to_platform_device(dev->dev.parent);
 
        strcpy(info->driver, DRV_NAME);
        strcpy(info->version, DRV_VERSION);
-       strcpy(info->bus_info, ax->dev->name);
+       strcpy(info->bus_info, pdev->name);
 }
 
 static int ax_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
@@ -848,7 +847,6 @@ static int ax_probe(struct platform_device *pdev)
 
        spin_lock_init(&ax->mii_lock);
 
-       ax->dev = pdev;
        ax->plat = pdev->dev.platform_data;
        platform_set_drvdata(pdev, dev);