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;