From patchwork Sun Dec 17 16:02:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Gorski X-Patchwork-Id: 849653 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="XPwz0Cf1"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3z088p2TfFz9s4s for ; Mon, 18 Dec 2017 03:03:22 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757188AbdLQQDT (ORCPT ); Sun, 17 Dec 2017 11:03:19 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:39725 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752269AbdLQQDR (ORCPT ); Sun, 17 Dec 2017 11:03:17 -0500 Received: by mail-wm0-f66.google.com with SMTP id i11so25236459wmf.4 for ; Sun, 17 Dec 2017 08:03:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=w27KZXIwfBNaATUSSccmRx/zCZmE47tJ8h3os6vaOhs=; b=XPwz0Cf1PfyjyTQqunrn8vmggm1SGkdtNKa3dabolaZqFFnVT99At653oVppR1Huwm ZtGTXoSFlWZY969xo2GAJBMzE5TDxqosb/PbJo5ADcYFVUIA5Ylw3yRisHOvj+8ui8v2 Ijz8KfUduS8Xf8xz8ncVzt688xJZWb0j0twzLTTfSPOR5pmHxo9KR2Hsozqh8DSHvp9H gIBILaPQY8Y04SlTfsyIQle1rOCUw1jOvv47+Jrko7lb7qOshdVK2igaBKUhVqG0QoeY PFY7ONe4j1dD7tbEJyvi296q1tzik1U3zX114mviebA70mwmT5kYDep2WP2uABkyDAr1 SAJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=w27KZXIwfBNaATUSSccmRx/zCZmE47tJ8h3os6vaOhs=; b=HsLPTdXbZNSTVS5sEw/99yfzjBClF4fP0i4Zy/jmJ8zafoskr7R1Ou9/cfzBt7dMDs 7C+8YuejqL9aFpouz/f7Y2i7RREA3Tesji+N6g5hlD/PX2hpGAPkJah7Ni4rjXOscXxV luN/g5W1qMrXj1LrKLeuFkbMR8TO+2BvKKzdHFGMUxJwr+YcPlTeUmsjot/HqZX+71K1 u6pmiwKBJRw0ulsw/dwDDJ4xy26xEeReJmHP1HiP4lJDaguwMYLorTW6ZkNFzy6+RRIT OMO7QQVuzl5BxLLcdZvhytIN8sni3dU8SnFbqSopSebaH+o1aJ4kGfDu3dWci6DdiXeQ VRdA== X-Gm-Message-State: AKGB3mJUu28VEk9oHaXBPSpovSmYRsfV4L9oY6K3OanO52pvZEYqluCb eizSArELO4J7uLLl6FOKxdQ89A== X-Google-Smtp-Source: ACJfBotsPFX8KfZNCWgGfnip9XLx+6mODToxSbLf+R2qvKW0Qu9i+lYpLGLvgE1Hs/6gkbUQdTjmWQ== X-Received: by 10.28.5.198 with SMTP id 189mr9850289wmf.29.1513526596411; Sun, 17 Dec 2017 08:03:16 -0800 (PST) Received: from localhost.localdomain ([2001:470:9e39::48e]) by smtp.gmail.com with ESMTPSA id e197sm6336019wmf.4.2017.12.17.08.03.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 17 Dec 2017 08:03:15 -0800 (PST) From: Jonas Gorski To: netdev@vger.kernel.org, linux-mips@linux-mips.org Cc: Ralf Baechle , "David S. Miller" , Florian Fainelli , bcm-kernel-feedback-list@broadcom.com Subject: [PATCH 1/4] bcm63xx_enet: just use "enet" as the clock name Date: Sun, 17 Dec 2017 17:02:52 +0100 Message-Id: <20171217160255.30342-2-jonas.gorski@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20171217160255.30342-1-jonas.gorski@gmail.com> References: <20171217160255.30342-1-jonas.gorski@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Now that we have the individual clocks available as "enet" we don't need to rely on the device id for them anymore. Signed-off-by: Jonas Gorski --- drivers/net/ethernet/broadcom/bcm63xx_enet.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c index d9346e2ac720..5a5886345da2 100644 --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c @@ -1716,7 +1716,6 @@ static int bcm_enet_probe(struct platform_device *pdev) struct bcm63xx_enet_platform_data *pd; struct resource *res_mem, *res_irq, *res_irq_rx, *res_irq_tx; struct mii_bus *bus; - const char *clk_name; int i, ret; if (!bcm_enet_shared_base[0]) @@ -1757,14 +1756,12 @@ static int bcm_enet_probe(struct platform_device *pdev) if (priv->mac_id == 0) { priv->rx_chan = 0; priv->tx_chan = 1; - clk_name = "enet0"; } else { priv->rx_chan = 2; priv->tx_chan = 3; - clk_name = "enet1"; } - priv->mac_clk = devm_clk_get(&pdev->dev, clk_name); + priv->mac_clk = devm_clk_get(&pdev->dev, "enet"); if (IS_ERR(priv->mac_clk)) { ret = PTR_ERR(priv->mac_clk); goto out; From patchwork Sun Dec 17 16:02:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Gorski X-Patchwork-Id: 849654 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="hKM6ijxu"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3z088q5H67z9s4s for ; Mon, 18 Dec 2017 03:03:23 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932090AbdLQQDV (ORCPT ); Sun, 17 Dec 2017 11:03:21 -0500 Received: from mail-wr0-f194.google.com ([209.85.128.194]:44769 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751833AbdLQQDS (ORCPT ); Sun, 17 Dec 2017 11:03:18 -0500 Received: by mail-wr0-f194.google.com with SMTP id w95so1060498wrc.11 for ; Sun, 17 Dec 2017 08:03:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Sz94BientDdbnXedge4DCQdUgDFRrgLWuCMGlT/8utA=; b=hKM6ijxuB9RvUGawfyIR3HR6D0mHwC/A3nAGStuFaMYp5IqSHfCf0x57Hbs1zocVTA zusbb0x7qt4N8OY6SNWoQa5pAer9d5yFpM/XPROVuw6MX66Rb18R7ylM2DEYOVixT7xl FgBJSGho1EZAm5lVrnV5qrVOweXdrrCi6saoeqYGBziho/MxbfdpfFyHrIp/G1YGEcPo j9iMe7MPWpBWk/Pc3V+j7mK7kGsTOoZKXmPs640wFo2YvR3Q6vFRjhopUKJqv6zWkQxB uLmGSbPSd6rcfQ46teSa9+W9mcT8FdNqLR032zwqFZI//V2wC06YSMAGFBRDrsaXPxUT w2pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Sz94BientDdbnXedge4DCQdUgDFRrgLWuCMGlT/8utA=; b=egxpYxeTrWzCz1EmN8ErWNlCpZxRJYRJkFOH6gcJdQtNUIoVXxzAAo/DOHK4TQO8dt V3iJawQ/kd3ZTo1pJpujvafWKlDIQuG+WyhEo7y3RQnazO/uVCg5LDi65+S4wiP9IKYc fOujVqwbrcnbW6nos3HYz8i6XyQCMn0bhAW2li9BT4HLP2gt2zI79Kdf/+wnnrdQTVOh pyITP73IUcLKmv0TTRiQo9WeMfTR2Chxzv2jD+QqL3bRUzxBvUxH0w99BJfXqP0Zy9KB g91L3n3CZNIXDHaw1HkMjYWOXsTUhYhfVogm/P4SwPPa9QI2FCv2R+9KS3lOEILn9nrB QgPQ== X-Gm-Message-State: AKGB3mLM31+CFC9U11ClqO/k8MEf3zGQXJrPRoGeHM2EuULqqNjB08g4 oTN0kpiojahXGFw6mzgHdbDsPg== X-Google-Smtp-Source: ACJfBouG4ucvIE6ROzwozkeuqiKTSMynl6JEq8JFJfk+JH9V+k7p7xiXokjEB9Sy+yQloG3a4VJhHw== X-Received: by 10.223.170.150 with SMTP id h22mr14952411wrc.26.1513526597458; Sun, 17 Dec 2017 08:03:17 -0800 (PST) Received: from localhost.localdomain ([2001:470:9e39::48e]) by smtp.gmail.com with ESMTPSA id e197sm6336019wmf.4.2017.12.17.08.03.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 17 Dec 2017 08:03:17 -0800 (PST) From: Jonas Gorski To: netdev@vger.kernel.org, linux-mips@linux-mips.org Cc: Ralf Baechle , "David S. Miller" , Florian Fainelli , bcm-kernel-feedback-list@broadcom.com Subject: [PATCH 2/4] bcm63xx_enet: use platform data for dma channel numbers Date: Sun, 17 Dec 2017 17:02:53 +0100 Message-Id: <20171217160255.30342-3-jonas.gorski@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20171217160255.30342-1-jonas.gorski@gmail.com> References: <20171217160255.30342-1-jonas.gorski@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org To reduce the reliance on device ids, pass the dma channel numbers to the enet devices as platform data. Signed-off-by: Jonas Gorski --- arch/mips/bcm63xx/dev-enet.c | 8 ++++++++ arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h | 4 ++++ drivers/net/ethernet/broadcom/bcm63xx_enet.c | 11 ++--------- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/arch/mips/bcm63xx/dev-enet.c b/arch/mips/bcm63xx/dev-enet.c index e8284771d620..07b4c65a88a4 100644 --- a/arch/mips/bcm63xx/dev-enet.c +++ b/arch/mips/bcm63xx/dev-enet.c @@ -265,6 +265,14 @@ int __init bcm63xx_enet_register(int unit, dpd->dma_chan_width = ENETDMA_CHAN_WIDTH; } + if (unit == 0) { + dpd->rx_chan = 0; + dpd->tx_chan = 1; + } else { + dpd->rx_chan = 2; + dpd->tx_chan = 3; + } + ret = platform_device_register(pdev); if (ret) return ret; diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h index c0bd47444cff..da39e4d326ba 100644 --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h @@ -55,6 +55,10 @@ struct bcm63xx_enet_platform_data { /* DMA descriptor shift */ unsigned int dma_desc_shift; + + /* dma channel ids */ + int rx_chan; + int tx_chan; }; /* diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c index 5a5886345da2..e603a6fe6349 100644 --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c @@ -1752,15 +1752,6 @@ static int bcm_enet_probe(struct platform_device *pdev) priv->irq_tx = res_irq_tx->start; priv->mac_id = pdev->id; - /* get rx & tx dma channel id for this mac */ - if (priv->mac_id == 0) { - priv->rx_chan = 0; - priv->tx_chan = 1; - } else { - priv->rx_chan = 2; - priv->tx_chan = 3; - } - priv->mac_clk = devm_clk_get(&pdev->dev, "enet"); if (IS_ERR(priv->mac_clk)) { ret = PTR_ERR(priv->mac_clk); @@ -1792,6 +1783,8 @@ static int bcm_enet_probe(struct platform_device *pdev) priv->dma_chan_width = pd->dma_chan_width; priv->dma_has_sram = pd->dma_has_sram; priv->dma_desc_shift = pd->dma_desc_shift; + priv->rx_chan = pd->rx_chan; + priv->tx_chan = pd->tx_chan; } if (priv->mac_id == 0 && priv->has_phy && !priv->use_external_mii) { From patchwork Sun Dec 17 16:02:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Gorski X-Patchwork-Id: 849656 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="c1CMEIBQ"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3z08920v6pz9s4s for ; Mon, 18 Dec 2017 03:03:34 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757331AbdLQQDc (ORCPT ); Sun, 17 Dec 2017 11:03:32 -0500 Received: from mail-wr0-f193.google.com ([209.85.128.193]:45359 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757215AbdLQQDT (ORCPT ); Sun, 17 Dec 2017 11:03:19 -0500 Received: by mail-wr0-f193.google.com with SMTP id h1so11918920wre.12 for ; Sun, 17 Dec 2017 08:03:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=cHKOb+MRH5zMX2KgeF7i9ex4zIEEdtfK1Zx4hI8sW+c=; b=c1CMEIBQXkmw1zQnyQpXdnXUN7XEoj6rqVrB7mF6JkB1OxVby32HaNn7OHT2mW1vmE BNxS2Xx2tbb5UdDtBBCqyVi1H90FtRUF81LVHrfK2a+Iyc2ZYx/ufCzk/5yuPK65osCO BuHWRJyviBbJvfbSTL98RKyDhqFgh87zpHl15WEYjzydI9nOLia4KPgKhjXbvSCkRr5e MJWjhV99bueiJGGXUec9vAaRMb3giuyRW4PiwvhxUU8x3It/ko8Nola8zU/q6/t606ID L/EP4WXotc7QIaTBS7bm8VQMIQWCHPGnOXq/PYpuYmOWnP7b4vmdEVxN+atQurOdrMSs gyfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=cHKOb+MRH5zMX2KgeF7i9ex4zIEEdtfK1Zx4hI8sW+c=; b=PzRUdtaeN+YA7CxiE0dPEq9i0Grhl6HjaewubdxMDCYO7vV/yPuaSf3rikAz5ZdltM PFCFsFqVtR4wAknrRW1SDQOGtu7u1ZrVi76+5GuCMwE1WVGf5+7vhPhSwBBPMa+eo3cV p0iGy29XXph7cxsGjwpgh2dVAVPxZF0HuD/4XJuVjbyYkh5BNXcG3XgWfpn4RQlI7dl+ pxrefp3t7OICzJyC2v0Csj08MB7gJ2OUHaF49jiQqITlYD/4N2rKXTTJNIUUw2qo8IEB IzrdgMToObPrzkliZ1ZYpCGroJI4I9grZwhXgrwo8IJdmL3F9gfqGRxNkFmo0nnShYRu CQpA== X-Gm-Message-State: AKGB3mJqe3N8S0ZvTH0JoqRbX5PT1vnMg2Y1xHfmhQQfOdAaKG7FGkXo kNDorw7r30gUeW36BAG1o54qXg== X-Google-Smtp-Source: ACJfBov1ve+htjJtDxAekZ1A1vGFeq4z+SUnPGHyK0SxMf901x0G9FoCIpIZbsodlsrgWCnV/ABR1A== X-Received: by 10.223.163.216 with SMTP id m24mr15440408wrb.107.1513526598539; Sun, 17 Dec 2017 08:03:18 -0800 (PST) Received: from localhost.localdomain ([2001:470:9e39::48e]) by smtp.gmail.com with ESMTPSA id e197sm6336019wmf.4.2017.12.17.08.03.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 17 Dec 2017 08:03:18 -0800 (PST) From: Jonas Gorski To: netdev@vger.kernel.org, linux-mips@linux-mips.org Cc: Ralf Baechle , "David S. Miller" , Florian Fainelli , bcm-kernel-feedback-list@broadcom.com Subject: [PATCH 3/4] bcm63xx_enet: remove pointless mac_id check Date: Sun, 17 Dec 2017 17:02:54 +0100 Message-Id: <20171217160255.30342-4-jonas.gorski@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20171217160255.30342-1-jonas.gorski@gmail.com> References: <20171217160255.30342-1-jonas.gorski@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Enabling the ephy clock for mac 1 is harmless, and the actual usage of the ephy is not restricted to mac 0, so we might as well remove the check. Signed-off-by: Jonas Gorski --- drivers/net/ethernet/broadcom/bcm63xx_enet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c index e603a6fe6349..d4519c621d08 100644 --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c @@ -1787,7 +1787,7 @@ static int bcm_enet_probe(struct platform_device *pdev) priv->tx_chan = pd->tx_chan; } - if (priv->mac_id == 0 && priv->has_phy && !priv->use_external_mii) { + if (priv->has_phy && !priv->use_external_mii) { /* using internal PHY, enable clock */ priv->phy_clk = devm_clk_get(&pdev->dev, "ephy"); if (IS_ERR(priv->phy_clk)) { From patchwork Sun Dec 17 16:02:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Gorski X-Patchwork-Id: 849655 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="XUwr84Pn"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3z088s2lFSz9s4s for ; Mon, 18 Dec 2017 03:03:25 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757317AbdLQQDX (ORCPT ); Sun, 17 Dec 2017 11:03:23 -0500 Received: from mail-wr0-f195.google.com ([209.85.128.195]:33966 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754075AbdLQQDV (ORCPT ); Sun, 17 Dec 2017 11:03:21 -0500 Received: by mail-wr0-f195.google.com with SMTP id y21so11966145wrc.1 for ; Sun, 17 Dec 2017 08:03:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=gEtf1b6b8xM7vtvcIuT/adaeyiuLdF3ms8NE6QwmSSk=; b=XUwr84PnxYB96g/DJZ5IQc/741tvkmwAt0q3bbLokLnOporxzsIR+q8VyY9Bp3IPiR 7gKoeILxDip18MMcF+4+yQS3+moeV3Je5cGmLwwxeR0StlxOkc1RT1hYwtZpjEuA98YO y51eqXCiQ1CwnyG28DjJQUwboj00GWsiKJp8DeN1dgczhB7UfdMjJeM9WkEROg1NdfTz 4nCMEJuZHmZzKYwS/paVylyRGxue9VNxnp37d8NTxVGm0v32YSfYv95Gr8m7PuQGft2g KeYZkOPR6uz9p4eEu27gL9nVbIoHdiIt+70NH+JOGPF3giBjZsGrEBhPvfOZk8KPmeOK BYSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=gEtf1b6b8xM7vtvcIuT/adaeyiuLdF3ms8NE6QwmSSk=; b=gLoeY6NIcJ5Jd0ba1B61LMSVwU4VD2m3mi8N8b+13KfmvThrzazpDzyY71W27eBYgy 59J76fedSo6flz4E7GOYnVihmA5b7Fg+hFHk0sFTYrVxzVsmp5ipvAIDS5NrVBRqWYhY Xb9HjurEaSum5LwuhPVfocebg9cPp7Xz/AV/n/1iwOztj4vk6xs3y0TFtwGSNRWig9DP grsfN5E4EVzo0y3W7XgqmiL7HNFVAPA2Q5UwM9mtHLAnx6MJCfiW/5ow8bkGwEjZkcEd 3RXpPzi+M9M4PQwR1mj/rKpABIZeAd6VfE71d6zHvoX+JFNpFuPhyJNtWinjqZo9tgen Au9w== X-Gm-Message-State: AKGB3mL9zkjfBVlqblUqbdxEzI2BwHnw42AzWTNeDrqlvXO7u14MbjY5 LAZN4nTf2I6SFrYF8yNGFLBBLA== X-Google-Smtp-Source: ACJfBosel9UFZYnTkh2TJwwz9ZuHnD4NzlQG2cLBO/oBQWEiuqWrhPbNLBcJHO6S4pXZUUJvVELiCQ== X-Received: by 10.223.182.147 with SMTP id j19mr14709002wre.159.1513526599696; Sun, 17 Dec 2017 08:03:19 -0800 (PST) Received: from localhost.localdomain ([2001:470:9e39::48e]) by smtp.gmail.com with ESMTPSA id e197sm6336019wmf.4.2017.12.17.08.03.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 17 Dec 2017 08:03:19 -0800 (PST) From: Jonas Gorski To: netdev@vger.kernel.org, linux-mips@linux-mips.org Cc: Ralf Baechle , "David S. Miller" , Florian Fainelli , bcm-kernel-feedback-list@broadcom.com Subject: [PATCH 4/4] bcm63xx_enet: use platform device id directly for miibus name Date: Sun, 17 Dec 2017 17:02:55 +0100 Message-Id: <20171217160255.30342-5-jonas.gorski@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20171217160255.30342-1-jonas.gorski@gmail.com> References: <20171217160255.30342-1-jonas.gorski@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Directly use the platform device for generating the miibus name. This removes the last user of bcm_enet_priv::mac_id and we can remove the field. Signed-off-by: Jonas Gorski --- drivers/net/ethernet/broadcom/bcm63xx_enet.c | 3 +-- drivers/net/ethernet/broadcom/bcm63xx_enet.h | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c index d4519c621d08..1fbbbabe7588 100644 --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c @@ -1750,7 +1750,6 @@ static int bcm_enet_probe(struct platform_device *pdev) dev->irq = priv->irq = res_irq->start; priv->irq_rx = res_irq_rx->start; priv->irq_tx = res_irq_tx->start; - priv->mac_id = pdev->id; priv->mac_clk = devm_clk_get(&pdev->dev, "enet"); if (IS_ERR(priv->mac_clk)) { @@ -1818,7 +1817,7 @@ static int bcm_enet_probe(struct platform_device *pdev) bus->priv = priv; bus->read = bcm_enet_mdio_read_phylib; bus->write = bcm_enet_mdio_write_phylib; - sprintf(bus->id, "%s-%d", pdev->name, priv->mac_id); + sprintf(bus->id, "%s-%d", pdev->name, pdev->id); /* only probe bus where we think the PHY is, because * the mdio read operation return 0 instead of 0xffff diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.h b/drivers/net/ethernet/broadcom/bcm63xx_enet.h index 5a66728d4776..1d3c917eb830 100644 --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.h +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.h @@ -193,9 +193,6 @@ struct bcm_enet_mib_counters { struct bcm_enet_priv { - /* mac id (from platform device id) */ - int mac_id; - /* base remapped address of device */ void __iomem *base;