On Sun, Mar 19, 2023 at 7:05 PM Marek Vasut
wrote:
>
> 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-amlo...@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 = 0x,
> .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(_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
>
Reviewed-by: Ramon Fried
