From: Marc Kleine-Budde <mkl@pengutronix.de>
To: netdev@vger.kernel.org
Cc: Ben Dooks <ben@fluff.org>, Daniel Mack <daniel@caiaq.de>,
Marc Kleine-Budde <mkl@pengutronix.de>
Subject: [PATCH 6/9] ax88796: remove platform_device member from struct ax_device
Date: Mon, 21 Feb 2011 14:03:17 +0100 [thread overview]
Message-ID: <1298293400-21570-7-git-send-email-mkl@pengutronix.de> (raw)
In-Reply-To: <1298293400-21570-1-git-send-email-mkl@pengutronix.de>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/ax88796.c | 6 ++----
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);
--
1.7.2.3
next prev parent reply other threads:[~2011-02-21 13:03 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-21 13:03 [PATCH 0/9] ax88796: cleanups and convert to phylib and mdio_bitbang Marc Kleine-Budde
2011-02-21 13:03 ` [PATCH 1/9] ax88796: fix codingstyle and checkpatch warnings Marc Kleine-Budde
2011-02-21 13:03 ` [PATCH 2/9] ax88796: don't use magic ei_status to acces private data Marc Kleine-Budde
2011-02-21 13:03 ` [PATCH 3/9] ax88796: remove memset of " Marc Kleine-Budde
2011-02-21 13:03 ` [PATCH 4/9] ax88796: remove first_init parameter from ax_init_dev() Marc Kleine-Budde
2011-02-21 13:03 ` [PATCH 5/9] ax88796: use netdev_<LEVEL> instead of dev_<LEVEL> and pr_<LEVEL> Marc Kleine-Budde
2011-02-21 13:03 ` Marc Kleine-Budde [this message]
2011-02-21 13:03 ` [PATCH 7/9] ax88796: make pointer to platform data const Marc Kleine-Budde
2011-02-21 13:03 ` [PATCH 8/9] ax88796: clean up probe and remove function Marc Kleine-Budde
2011-02-21 13:03 ` [PATCH 9/9] ax88796: use generic mdio_bitbang driver Marc Kleine-Budde
2011-02-22 19:18 ` [PATCH 0/9] ax88796: cleanups and convert to phylib and mdio_bitbang David Miller
2011-02-22 20:19 ` [PATCH] ax88796: depend on HAS_IOMEM not on individual ARCHs Marc Kleine-Budde
2011-02-22 20:37 ` David Miller
2011-02-22 21:42 ` Marc Kleine-Budde
2011-02-22 22:01 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1298293400-21570-7-git-send-email-mkl@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=ben@fluff.org \
--cc=daniel@caiaq.de \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).