From mboxrd@z Thu Jan 1 00:00:00 1970 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 phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B479DC7618A for ; Sun, 19 Mar 2023 17:12:05 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3D0B285C95; Sun, 19 Mar 2023 18:09:27 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.b="uxrA5Np+"; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.b="S1en6Q9Y"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1D46485936; Sun, 19 Mar 2023 18:07:10 +0100 (CET) Received: from mout-p-103.mailbox.org (mout-p-103.mailbox.org [IPv6:2001:67c:2050:0:465::103]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id ECF8985C86 for ; Sun, 19 Mar 2023 18:05:37 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.vasut+renesas@mailbox.org Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:b231:465::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-103.mailbox.org (Postfix) with ESMTPS id 4PfklM3130z9sbL; Sun, 19 Mar 2023 18:05:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245535; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rOTD3eEWGbgKjosuyJgEVsiGNpRMSo620KyZde1pqaw=; b=uxrA5Np+VWdXrYo9xLOyQyo3g4YL24WXfG1zRBn0zkF5+AAYFEF8QUKTejmm7gUjXhyZR5 JD7OZ5y+54pfGas2+8MSN5nX2cH3kc7E7xbaV4x4BJHshH7KQa67wf24YIH2d3QIsTkisL lcMX61KH//IV/oPAp8bCfIaTVUbFhWBXYuZMmeNTl2+DCsuayqGNpEJDiJL412HZR2Cz7L jkxzevuVKxj/z1VHlJITGR2TvUkygyJi4LuakNXONDkTsFe1zpGPKRtIcDXBWYQ8jZNgpT Y1WthtrnhG1/QuzVrFcsxWfoWq8OAMV0dYVwE2w60Sawe7szE2+Kijb92cWrAQ== From: Marek Vasut DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245533; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rOTD3eEWGbgKjosuyJgEVsiGNpRMSo620KyZde1pqaw=; b=S1en6Q9Y2mDtvvF2HjQAA2TWVP/lXiPj63QsKnj9WyWeiPij9oj7N9R5qBLrz4+rE6gtdf bX97dtuPksooS1fdoUZWRTyltnvrKGTFE57BWa/MVaoZJjh/9vhg2O/05rtEnjd8sDQ2Af 44/p+MQ3yD7IIXfVmIFH2CpOlDv2xNH1/HpMogw/KpxoCImIS1CaQOqF9/2oGE6aL+UxEh Y5i6YvERPWxWmUgy/c4bpCiQHxvA4hQanGSswteOkAOMrUk80pFM/uoI5+m7K0JFGZWBeG BJMv5tJpnlosfxSamECuufs1//FX3vuw3G/nLYi7igGzZA++Kb+Pys89uhxD5g== To: u-boot@lists.denx.de Cc: Marek Vasut , "Ariel D'Alessandro" , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Marek=20Beh=C3=BAn?= , Alex Nemirovsky , Haolin Li , Heinrich Schuchardt , Joe Hershberger , Joel Stanley , Josua Mayer , Michael Trimarchi , Michal Simek , Nate Drude , Neil Armstrong , Radu Pirea , Ramon Fried , Samuel Mendoza-Jonas , Stefan Roese , T Karthik Reddy , Tim Harvey , Vladimir Oltean , u-boot-amlogic@groups.io Subject: [PATCH 34/41] net: phy: ncsi: Convert to U_BOOT_PHY_DRIVER() Date: Sun, 19 Mar 2023 18:03:10 +0100 Message-Id: <20230319170317.27711-34-marek.vasut+renesas@mailbox.org> In-Reply-To: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> References: <20230319170317.27711-1-marek.vasut+renesas@mailbox.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-MBO-RS-ID: 91fb76e8307fab7ecdd X-MBO-RS-META: pmogg377hpfeqsicfftyaswa436bfjsp X-Rspamd-Queue-Id: 4PfklM3130z9sbL X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Convert PHY driver to U_BOOT_PHY_DRIVER() macro and drop phy_register() init call. Converted using sed "s@^static struct phy_driver \(.*\)_driver = \+{@U_BOOT_PHY_DRIVER(\L\1) = {" Signed-off-by: Marek Vasut --- Cc: "Ariel D'Alessandro" Cc: "Cédric Le Goater" Cc: "Marek Behún" Cc: Alex Nemirovsky Cc: Haolin Li Cc: Heinrich Schuchardt Cc: Joe Hershberger Cc: Joel Stanley Cc: Josua Mayer Cc: Marek Vasut Cc: Michael Trimarchi Cc: Michal Simek Cc: Nate Drude Cc: Neil Armstrong Cc: Radu Pirea Cc: Ramon Fried Cc: Samuel Mendoza-Jonas Cc: Stefan Roese Cc: T Karthik Reddy Cc: Tim Harvey Cc: Vladimir Oltean Cc: u-boot-amlogic@groups.io --- drivers/net/phy/ncsi.c | 8 +------- drivers/net/phy/phy.c | 3 --- include/phy.h | 1 - 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/net/phy/ncsi.c b/drivers/net/phy/ncsi.c index bb7ecebed38..eb3fd65bb47 100644 --- a/drivers/net/phy/ncsi.c +++ b/drivers/net/phy/ncsi.c @@ -881,7 +881,7 @@ int ncsi_shutdown(struct phy_device *phydev) return 0; } -static struct phy_driver ncsi_driver = { +U_BOOT_PHY_DRIVER(ncsi) = { .uid = PHY_NCSI_ID, .mask = 0xffffffff, .name = "NC-SI", @@ -891,9 +891,3 @@ static struct phy_driver ncsi_driver = { .startup = ncsi_startup, .shutdown = ncsi_shutdown, }; - -int phy_ncsi_init(void) -{ - phy_register(&ncsi_driver); - return 0; -} diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 245357c31dc..69db79f79e0 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -514,9 +514,6 @@ int phy_init(void) phy_drv_reloc(drv); #endif -#ifdef CONFIG_PHY_NCSI - phy_ncsi_init(); -#endif #ifdef CONFIG_PHY_XILINX_GMII2RGMII phy_xilinx_gmii2rgmii_init(); #endif diff --git a/include/phy.h b/include/phy.h index 9cabfeedec8..001c998db47 100644 --- a/include/phy.h +++ b/include/phy.h @@ -315,7 +315,6 @@ int gen10g_startup(struct phy_device *phydev); int gen10g_shutdown(struct phy_device *phydev); int gen10g_discover_mmds(struct phy_device *phydev); -int phy_ncsi_init(void); int phy_xilinx_gmii2rgmii_init(void); /** -- 2.39.2