From patchwork Mon Sep 30 18:39:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vitalii Mordan X-Patchwork-Id: 13816857 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 25B3DCE8379 for ; Mon, 30 Sep 2024 18:41:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: Content-Type:MIME-Version:Message-Id:Date:Subject:Cc:To:From:Reply-To: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=EkePz0QZBHDVlWdj7UJdZqKYGef/fDfv5u3pL2M96dw=; b=Lk8LgfN4dg7Bx6Nh5E1h5KcBTw XK+9fc9J2fugRT3batSu28ef1aKxDe/RA1Xs/1fsyvDNqaOsUQy9i3mg0dm/LlwLusMo2SaewZDwy jYyGKJ0ewwWzCgigYWjw8rlUc79tA38AX38Njiu9dqM1U5LQSSF00Z4LLAu5DYiIt5svVvAUtXEJ1 ty6f67r+qlsYrbEPiOMzqciufDhOGIU+VTBeXvok8jwJ8m9m3voOxEQfOMnhj9nAU9quL/ARNXmfM mOdkdcCg9gYYUYETSHmcBbWXA1PMFwBSbhIaL6kfAQFb2V2JvxixSchVm3oa2AklJdWHwcj46KauH G24B3g7g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1svLKG-00000000XcA-2FBV; Mon, 30 Sep 2024 18:40:52 +0000 Received: from mail.ispras.ru ([83.149.199.84]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1svLJ3-00000000XTC-2KSI for linux-arm-kernel@lists.infradead.org; Mon, 30 Sep 2024 18:39:38 +0000 Received: from ldvnode.intra.ispras.ru (unknown [10.10.2.153]) by mail.ispras.ru (Postfix) with ESMTPSA id 61DBA40B2780; Mon, 30 Sep 2024 18:39:33 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 mail.ispras.ru 61DBA40B2780 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ispras.ru; s=default; t=1727721573; bh=EkePz0QZBHDVlWdj7UJdZqKYGef/fDfv5u3pL2M96dw=; h=From:To:Cc:Subject:Date:From; b=WWW7kbfJvA13JblxvXd6D0igUgcj+J2GCFl3FxMhnURTiaQnK4YYGASkODxuNEkGl +50R+k2UEEUAY9Ob110lGtKH5La9W/RvjibsXyMAFBwp/v9JneDPqOGpJhTtZTHZVl IHNDJQr8DsgQJTeEGBHzRD1LrY5moNq2ZFyT1Oak= From: Vitalii Mordan To: Alexandre Torgue Cc: Vitalii Mordan , Jose Abreu , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, lvc-project@linuxtesting.org, Fedor Pchelkin , Alexey Khoroshilov , Vadim Mutilin Subject: [PATCH net-next] stmmac: dwmac-intel-plat: remove redundant check dwmac->data in probe Date: Mon, 30 Sep 2024 21:39:26 +0300 Message-Id: <20240930183926.2112546-1-mordan@ispras.ru> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240930_113937_788658_22054B0C X-CRM114-Status: GOOD ( 14.23 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The driver’s compatibility with devices is confirmed earlier in platform_match(). Since reaching probe means the device is valid, the extra check can be removed to simplify the code. Signed-off-by: Vitalii Mordan --- .../stmicro/stmmac/dwmac-intel-plat.c | 64 +++++++++---------- 1 file changed, 31 insertions(+), 33 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c index d68f0c4e7835..9139b2b1bf0b 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c @@ -98,46 +98,44 @@ static int intel_eth_plat_probe(struct platform_device *pdev) dwmac->tx_clk = NULL; dwmac->data = device_get_match_data(&pdev->dev); - if (dwmac->data) { - if (dwmac->data->fix_mac_speed) - plat_dat->fix_mac_speed = dwmac->data->fix_mac_speed; - - /* Enable TX clock */ - if (dwmac->data->tx_clk_en) { - dwmac->tx_clk = devm_clk_get(&pdev->dev, "tx_clk"); - if (IS_ERR(dwmac->tx_clk)) - return PTR_ERR(dwmac->tx_clk); - - clk_prepare_enable(dwmac->tx_clk); - - /* Check and configure TX clock rate */ - rate = clk_get_rate(dwmac->tx_clk); - if (dwmac->data->tx_clk_rate && - rate != dwmac->data->tx_clk_rate) { - rate = dwmac->data->tx_clk_rate; - ret = clk_set_rate(dwmac->tx_clk, rate); - if (ret) { - dev_err(&pdev->dev, - "Failed to set tx_clk\n"); - return ret; - } - } - } - - /* Check and configure PTP ref clock rate */ - rate = clk_get_rate(plat_dat->clk_ptp_ref); - if (dwmac->data->ptp_ref_clk_rate && - rate != dwmac->data->ptp_ref_clk_rate) { - rate = dwmac->data->ptp_ref_clk_rate; - ret = clk_set_rate(plat_dat->clk_ptp_ref, rate); + if (dwmac->data->fix_mac_speed) + plat_dat->fix_mac_speed = dwmac->data->fix_mac_speed; + + /* Enable TX clock */ + if (dwmac->data->tx_clk_en) { + dwmac->tx_clk = devm_clk_get(&pdev->dev, "tx_clk"); + if (IS_ERR(dwmac->tx_clk)) + return PTR_ERR(dwmac->tx_clk); + + clk_prepare_enable(dwmac->tx_clk); + + /* Check and configure TX clock rate */ + rate = clk_get_rate(dwmac->tx_clk); + if (dwmac->data->tx_clk_rate && + rate != dwmac->data->tx_clk_rate) { + rate = dwmac->data->tx_clk_rate; + ret = clk_set_rate(dwmac->tx_clk, rate); if (ret) { dev_err(&pdev->dev, - "Failed to set clk_ptp_ref\n"); + "Failed to set tx_clk\n"); return ret; } } } + /* Check and configure PTP ref clock rate */ + rate = clk_get_rate(plat_dat->clk_ptp_ref); + if (dwmac->data->ptp_ref_clk_rate && + rate != dwmac->data->ptp_ref_clk_rate) { + rate = dwmac->data->ptp_ref_clk_rate; + ret = clk_set_rate(plat_dat->clk_ptp_ref, rate); + if (ret) { + dev_err(&pdev->dev, + "Failed to set clk_ptp_ref\n"); + return ret; + } + } + plat_dat->bsp_priv = dwmac; plat_dat->eee_usecs_rate = plat_dat->clk_ptp_rate;