aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2011-02-20 13:13:20 -0500
committerMarc Kleine-Budde <mkl@pengutronix.de>2011-02-21 07:17:40 -0500
commit0f442f5a3c25dd4df3fecb25819dc269c9222bdf (patch)
tree34730721a7936fe88ac8a620e6dea5ea46026216 /drivers
parent85ac6162c94638c7f27afa4bf63f165a6ca5e931 (diff)
ax88796: remove platform_device member from struct ax_device
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ax88796.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/ax88796.c b/drivers/net/ax88796.c
index 1370cac6d6c0..782d73e0b659 100644
--- a/drivers/net/ax88796.c
+++ b/drivers/net/ax88796.c
@@ -87,7 +87,6 @@ struct ax_device {
87 87
88 u32 msg_enable; 88 u32 msg_enable;
89 void __iomem *map2; 89 void __iomem *map2;
90 struct platform_device *dev;
91 struct resource *mem; 90 struct resource *mem;
92 struct resource *mem2; 91 struct resource *mem2;
93 struct ax_plat_data *plat; 92 struct ax_plat_data *plat;
@@ -545,11 +544,11 @@ static int ax_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
545static void ax_get_drvinfo(struct net_device *dev, 544static void ax_get_drvinfo(struct net_device *dev,
546 struct ethtool_drvinfo *info) 545 struct ethtool_drvinfo *info)
547{ 546{
548 struct ax_device *ax = to_ax_dev(dev); 547 struct platform_device *pdev = to_platform_device(dev->dev.parent);
549 548
550 strcpy(info->driver, DRV_NAME); 549 strcpy(info->driver, DRV_NAME);
551 strcpy(info->version, DRV_VERSION); 550 strcpy(info->version, DRV_VERSION);
552 strcpy(info->bus_info, ax->dev->name); 551 strcpy(info->bus_info, pdev->name);
553} 552}
554 553
555static int ax_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) 554static int ax_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
@@ -848,7 +847,6 @@ static int ax_probe(struct platform_device *pdev)
848 847
849 spin_lock_init(&ax->mii_lock); 848 spin_lock_init(&ax->mii_lock);
850 849
851 ax->dev = pdev;
852 ax->plat = pdev->dev.platform_data; 850 ax->plat = pdev->dev.platform_data;
853 platform_set_drvdata(pdev, dev); 851 platform_set_drvdata(pdev, dev);
854 852