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;