From patchwork Mon Feb 21 13:03:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Kleine-Budde X-Patchwork-Id: 83837 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C8DC2B7197 for ; Tue, 22 Feb 2011 00:03:47 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932116Ab1BUNDc (ORCPT ); Mon, 21 Feb 2011 08:03:32 -0500 Received: from metis.ext.pengutronix.de ([92.198.50.35]:35854 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932075Ab1BUNDa (ORCPT ); Mon, 21 Feb 2011 08:03:30 -0500 Received: from gallifrey.ext.pengutronix.de ([2001:6f8:1178:4:5054:ff:fe8d:eefb] helo=hardanger.do.blackshift.org) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1PrVQH-0005vb-3u; Mon, 21 Feb 2011 14:03:29 +0100 From: Marc Kleine-Budde To: netdev@vger.kernel.org Cc: Ben Dooks , Daniel Mack , Marc Kleine-Budde Subject: [PATCH 6/9] ax88796: remove platform_device member from struct ax_device Date: Mon, 21 Feb 2011 14:03:17 +0100 Message-Id: <1298293400-21570-7-git-send-email-mkl@pengutronix.de> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1298293400-21570-1-git-send-email-mkl@pengutronix.de> References: <1298293400-21570-1-git-send-email-mkl@pengutronix.de> X-SA-Exim-Connect-IP: 2001:6f8:1178:4:5054:ff:fe8d:eefb X-SA-Exim-Mail-From: mkl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: netdev@vger.kernel.org Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Marc Kleine-Budde --- 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);