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: 9876459 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4A48D60360 for ; Wed, 2 Aug 2017 09:42:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3C7E320223 for ; Wed, 2 Aug 2017 09:42:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 30D7F28694; Wed, 2 Aug 2017 09:42:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CE72B287AB for ; Wed, 2 Aug 2017 09:41:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=1CFNieTWU2e8SVYPUiyhWMjuHCiEOvs/W6rYCLqEhyE=; b=BzUJmSOpclxsAYxdk0M9UfnlRN aIHg8Fdt8A65v388OBuNECGPlcSLofDZJJNUPUHKhaLcqkCkZQKI3Zs5EZlhZPa0f44iLHn/rhHA9 Ts+XXnUgBYR7zdH8nA+hE2ooL/Dbrc9+OohwK0e6BvypPkVguc6axGGOv9AkS0pr6R/5YflIXoGER XrUyzaJp6qyDvFfGFXKycB1Gl2ji48WYzNAJ+5g33pNX1pSuZYAYrC4u9LXHFt3QADcWDKJmGhxg/ vNDHD7vDHrj4rsfF4GgJExyE0yDoTmyU5631ybh+jCU50aAH1uLU1mI7kIVpYoWCUyPp2SFxzHLDO PnSOAC3A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dcq9v-000583-4h; Wed, 02 Aug 2017 09:41:43 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dcq9b-0004o5-V5 for linux-arm-kernel@bombadil.infradead.org; Wed, 02 Aug 2017 09:41:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=P01t1wfUjgoqPqoQ+ZpIVJqVeUPl2vSPnGjfLm4DMv4=; b=MPpJhDDulDJeEUGMMYul8LovR Rk5NzubKDijOj+k0TkDnhYO0K+59KOux3+3mEHipgA3ayLjNSw14pXFGiAL8dw9De/rGp+v2K91NG ohobSnATiGIzhpJg+ZQyzMN2RZj44IhgoN6OWTvRkjtG5ylaGvoSsI8Q7TBNTcMsKXYjJegoUsvga Jp0o5XQuJiWAiYSUpfNVZUjXFb5Bxyd/kf+DC0wyZ37XnzMuCrfM6/Q7JGK8lyP/fNGfp8ZuWZ6Sr 0bgHrf7a5dyPCil0gREPR3EqGbmGgILWwebKZR97y+XjpD2cQplwGvp66vN3U8v/4A5/4fHIG9vq/ VntoLhgAw==; Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]) by casper.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dcq40-000793-Lj for linux-arm-kernel@lists.infradead.org; Wed, 02 Aug 2017 09:35:38 +0000 Received: by mail-wm0-x244.google.com with SMTP id t138so6421423wmt.4 for ; 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=aim6+lHzKjmpVNqUzs8zAUPo5xjcwm9OKTkTylJhqmDw+76OZ09dEj2BpDbp3Fm5ro 6s3G0QaWOj+f1J19muhSwwZrpvV9z5pS0HPah3G0ItIOAOeQvaY3bwaOq01Dj70vRavc tuE0qU5k8OIuozeOa69afqo0wMFSc3J9FGJ9YwHSKIAvUU5wtV8wh/Mv9Ao/8w6Sp5Yq 5Ccn9SVk3M5tUXBCFudoFY3PKavxXvW/cv6tGmM8MykfApwN6BhhxGpzgnhldaU9sThY zuDNCwUGsY1eXkyDYr8wHqP3T2rKZb9aFRa2vfwQOYb1VFb25ngu29tGWB5u2kSx2434 8fEg== X-Gm-Message-State: AIVw111TyFKLwR4//88PgmJ6jocC5KhqsRT2rni1petK9wjo8F3KH05t FaS4/nmrp0WPWg== 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170802_103536_722269_820F29E0 X-CRM114-Status: GOOD ( 14.75 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Florian Fainelli , Greg Kroah-Hartman , Kevin Cernekee , Russell King , Ralf Baechle , Rob Herring , bcm-kernel-feedback-list@broadcom.com, Jiri Slaby , "David S. Miller" MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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;