From patchwork Mon Dec 31 15:25:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Mohr X-Patchwork-Id: 208866 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 72AF22C00A7 for ; Tue, 1 Jan 2013 02:34:59 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751450Ab2LaPeq (ORCPT ); Mon, 31 Dec 2012 10:34:46 -0500 Received: from rhlx01.hs-esslingen.de ([129.143.116.10]:54069 "EHLO rhlx01.hs-esslingen.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751020Ab2LaPen (ORCPT ); Mon, 31 Dec 2012 10:34:43 -0500 Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by rhlx01.hs-esslingen.de (Postfix) with ESMTPS id 22F64A11EB; Mon, 31 Dec 2012 16:25:54 +0100 (CET) From: Andreas Mohr To: andim2@users.sf.net Cc: Roger Luethi , netdev@vger.kernel.org, Francois Romieu Subject: [PATCH RFC 15/15] via-rhine: add helper (reduce type-unsafe void * assignments). Date: Mon, 31 Dec 2012 16:25:49 +0100 Message-Id: <1356967549-5056-16-git-send-email-andi@lisas.de> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1356967549-5056-1-git-send-email-andi@lisas.de> References: <1356967549-5056-1-git-send-email-andi@lisas.de> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Andreas Mohr Signed-off-by: Andreas Mohr --- drivers/net/ethernet/via/via-rhine.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c index 051bb95..dd4fd04 100644 --- a/drivers/net/ethernet/via/via-rhine.c +++ b/drivers/net/ethernet/via/via-rhine.c @@ -2411,10 +2411,17 @@ static int rhine_close(struct net_device *dev) return 0; } +/* Cast-only helper (try to minimize type-unsafe void * assignments). */ +/* TODO: could be doing the same thing for netdev_priv() use. */ +static inline struct net_device * +rhine_to_net_device(struct pci_dev *pdev) +{ + return pci_get_drvdata(pdev); +} static void rhine_remove_one(struct pci_dev *pdev) { - struct net_device *dev = pci_get_drvdata(pdev); + struct net_device *dev = rhine_to_net_device(pdev); struct rhine_private *rp = netdev_priv(dev); unregister_netdev(dev); @@ -2430,7 +2437,7 @@ static void rhine_remove_one(struct pci_dev *pdev) static void rhine_shutdown_and_keep_wol(struct pci_dev *pdev) { - struct net_device *dev = pci_get_drvdata(pdev); + struct net_device *dev = rhine_to_net_device(pdev); struct rhine_private *rp = netdev_priv(dev); void __iomem *ioaddr = rp->base; @@ -2489,7 +2496,7 @@ rhine_shutdown_and_keep_wol(struct pci_dev *pdev) static int rhine_suspend(struct device *device) { struct pci_dev *pdev = to_pci_dev(device); - struct net_device *dev = pci_get_drvdata(pdev); + struct net_device *dev = rhine_to_net_device(pdev); struct rhine_private *rp = netdev_priv(dev); if (!netif_running(dev)) @@ -2509,7 +2516,7 @@ static int rhine_suspend(struct device *device) static int rhine_resume(struct device *device) { struct pci_dev *pdev = to_pci_dev(device); - struct net_device *dev = pci_get_drvdata(pdev); + struct net_device *dev = rhine_to_net_device(pdev); struct rhine_private *rp = netdev_priv(dev); /*