From patchwork Wed May 20 18:03:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joachim Eastwood X-Patchwork-Id: 6448351 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5639AC0433 for ; Wed, 20 May 2015 18:07:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8557E20389 for ; Wed, 20 May 2015 18:07:10 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AEE0620364 for ; Wed, 20 May 2015 18:07:09 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Yv8Lm-0004ZJ-Nb; Wed, 20 May 2015 18:04:14 +0000 Received: from mail-la0-x229.google.com ([2a00:1450:4010:c03::229]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Yv8LO-0004GU-GK for linux-arm-kernel@lists.infradead.org; Wed, 20 May 2015 18:03:51 +0000 Received: by lagr1 with SMTP id r1so84989395lag.0 for ; Wed, 20 May 2015 11:03:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=cyta+d0DHX91lKDpebmT3rIs9ybTdcg2K1miTyfPec0=; b=LN4RBGzqAgVdzitszDUe3rbh+fweoDAUOaZbartSHNRj8CvU7Qgy2j72IAgZMuN5Gq wRywRDQ3K2grbyc3/UtgLTfaOxyxwAY4pwgRqa5huTfI8j+cO3xVcFbJkjCERyvM6jwQ ttX+tY4Um34VXOdeewKuwtWv73V/zT/omOBz8ckHcqwJmptrzJLxp8WDDdYCVwEqc3F8 ciHwC1q+F0dfK5mePq8bufNd/XSwjEReGbUfGm1CNIwTWDE+ZEVQHd2dJ5QByNbBcdUb jsmKrKpAOKksQAbIojOtYWdai8SwEtAiduKd71oxOBw1cBwjpw+AlXqVVdTBzL0QSSxT 6Ujg== X-Received: by 10.152.5.98 with SMTP id r2mr15355984lar.101.1432145008327; Wed, 20 May 2015 11:03:28 -0700 (PDT) Received: from localhost.localdomain (183.90-149-48.nextgentel.com. [90.149.48.183]) by mx.google.com with ESMTPSA id si3sm4773856lbb.32.2015.05.20.11.03.27 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 20 May 2015 11:03:27 -0700 (PDT) From: Joachim Eastwood To: peppe.cavallaro@st.com Subject: [PATCH net-next 1/4] stmmac: move driver data setting into stmmac_dvr_probe Date: Wed, 20 May 2015 20:03:06 +0200 Message-Id: <1432144989-28283-2-git-send-email-manabian@gmail.com> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1432144989-28283-1-git-send-email-manabian@gmail.com> References: <1432144989-28283-1-git-send-email-manabian@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150520_110350_827092_8B7A7FC5 X-CRM114-Status: GOOD ( 10.86 ) X-Spam-Score: -0.8 (/) Cc: linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org, Joachim Eastwood , davem@davemloft.net, arnd@arndb.de X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Move setting of driver data into stmmac_dvr_probe so the other probe functions don't have to. This will help to simplify the other probe functions later. Signed-off-by: Joachim Eastwood --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 ++ drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 2 -- drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 05c146f718a3..fae9195c8ff7 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -2830,6 +2830,8 @@ struct stmmac_priv *stmmac_dvr_probe(struct device *device, priv->ioaddr = addr; priv->dev->base_addr = (unsigned long)addr; + dev_set_drvdata(device, priv); + /* Verify driver arguments */ stmmac_verify_args(); diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c index 3bca908716e2..4743d0017d79 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c @@ -222,8 +222,6 @@ static int stmmac_pci_probe(struct pci_dev *pdev, priv->dev->irq = pdev->irq; priv->wol_irq = pdev->irq; - pci_set_drvdata(pdev, priv->dev); - dev_dbg(&pdev->dev, "STMMAC PCI driver registration completed\n"); return 0; diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c index ffe9e820b312..6db27dee0901 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c @@ -349,8 +349,6 @@ int stmmac_pltfr_probe(struct platform_device *pdev) if (mac) memcpy(priv->dev->dev_addr, mac, ETH_ALEN); - platform_set_drvdata(pdev, priv->dev); - pr_debug("STMMAC platform driver registration completed"); return 0;