summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2011-02-20 18:13:20 (GMT)
committerMarc Kleine-Budde <mkl@pengutronix.de>2011-02-21 12:17:40 (GMT)
commit0f442f5a3c25dd4df3fecb25819dc269c9222bdf (patch)
tree34730721a7936fe88ac8a620e6dea5ea46026216
parent85ac6162c94638c7f27afa4bf63f165a6ca5e931 (diff)
downloadlinux-0f442f5a3c25dd4df3fecb25819dc269c9222bdf.tar.xz
ax88796: remove platform_device member from struct ax_device
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-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 1370cac..782d73e 100644
--- a/drivers/net/ax88796.c
+++ b/drivers/net/ax88796.c
@@ -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);