From patchwork Wed Aug 2 09:34:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Gorski X-Patchwork-Id: 796576 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="FmxrS3ei"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xMp2T3V2fz9t0F for ; Wed, 2 Aug 2017 19:35:29 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752857AbdHBJfU (ORCPT ); Wed, 2 Aug 2017 05:35:20 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:36410 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752837AbdHBJfR (ORCPT ); Wed, 2 Aug 2017 05:35:17 -0400 Received: by mail-wm0-f68.google.com with SMTP id d40so6443927wma.3; Wed, 02 Aug 2017 02:35:16 -0700 (PDT) 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=P01t1wfUjgoqPqoQ+ZpIVJqVeUPl2vSPnGjfLm4DMv4=; b=FmxrS3eigwrltHBPFn2qsxWW00HvUNadVFXJ7MRfzJKGtv65QQksORg5nzOwJ436Nj zjqeFXiFLTAGDkXhXR2EQeHVZQpdzEzIjcbDgH1gM58x33CT7lsNaMwpnkUWzlOmTaIq ug21GvA8gIryDrJ1egYDcjtGAySR+OKq9bvzQejCHlCR06uLBi5jKzGNka3n36hWf2gc dfkMl87F5o2L0807EDWexrjcxakd6mmPYya2LYzGjl+q+chleq1CKjvjeFMnxuGCWzh/ kTU0uuZOKLPgfF1FRCb6+7jOAINZ7R4U+T0xh4nGkkZwEZxOzYN2+8Ioccq4g2rVTvBQ Iejg== 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=P01t1wfUjgoqPqoQ+ZpIVJqVeUPl2vSPnGjfLm4DMv4=; b=RoGVp12Ck4n/rV+uiudtzgcq6UyevjQ+mPj414/uSdQzO10MIP+6K8fYyHq2s/cz2w xTMzqRe3Rqcq2qLCUaU8XSqsqHxzRw+ko+kweBChHeRA61VS9dpJro5g1Jfj0T6TB8vO lUm46gxLQETwgNee1/Bg4q5EG0HT5E3LO1/3YDMgInQLk9GIVvaM6nFjqcLRYBFqYLtW vzybsE8lXigrBzkfGqgvojmovkhyll9a6S4qPMimrlhXwIg5gRYhIkV4/b900BvziEjx Dko3NnTMHcUCTiE/xf6Y2xQL8HmjHGY8HH1b633XLy9qMTAR1wqHqOxQT4N0CatAcqff EFmw== X-Gm-Message-State: AIVw110dEJxLX/oeZZn3mSMmVC/B6rk1ugowhJOxk9d9sFjzmKTQ8N7S ttAnBP9Ldnd/og== X-Received: by 10.28.88.9 with SMTP id m9mr3195284wmb.57.1501666515744; Wed, 02 Aug 2017 02:35:15 -0700 (PDT) Received: from localhost.localdomain ([2001:470:9e39::48e]) by smtp.gmail.com with ESMTPSA id 91sm32058876wrg.83.2017.08.02.02.35.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Aug 2017 02:35:15 -0700 (PDT) From: Jonas Gorski To: linux-mips@linux-mips.org, linux-arm-kernel@lists.infradead.org, linux-serial@vger.kernel.org, devicetree@vger.kernel.org, netdev@vger.kernel.org Cc: Greg Kroah-Hartman , Rob Herring , Mark Rutland , Ralf Baechle , Florian Fainelli , bcm-kernel-feedback-list@broadcom.com, Kevin Cernekee , Jiri Slaby , "David S. Miller" , Russell King Subject: [PATCH 6/8] bcm63xx_enet: just use "enet" as the clock name Date: Wed, 2 Aug 2017 11:34:27 +0200 Message-Id: <20170802093429.12572-7-jonas.gorski@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170802093429.12572-1-jonas.gorski@gmail.com> References: <20170802093429.12572-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 61a88b64bd39..d6844923a1c0 100644 --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c @@ -1718,7 +1718,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; /* stop if shared driver failed, assume driver->probe will be @@ -1761,14 +1760,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 = clk_get(&pdev->dev, clk_name); + priv->mac_clk = clk_get(&pdev->dev, "enet"); if (IS_ERR(priv->mac_clk)) { ret = PTR_ERR(priv->mac_clk); goto out;