[PATCH 35/41] net: phy: xilinx-gmii2rgmii: Convert to U_BOOT_PHY_DRIVER()

[Ramon Fried]

On Sun, Mar 19, 2023 at 7:05 PM Marek Vasut
<marek.vasut+renesas at mailbox.org> 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 <marek.vasut+renesas at mailbox.org>
> ---
> Cc: "Ariel D'Alessandro" <ariel.dalessandro at collabora.com>
> Cc: "Cédric Le Goater" <clg at kaod.org>
> Cc: "Marek Behún" <kabel at kernel.org>
> Cc: Alex Nemirovsky <alex.nemirovsky at cortina-access.com>
> Cc: Haolin Li <li.haolin at qq.com>
> Cc: Heinrich Schuchardt <xypron.glpk at gmx.de>
> Cc: Joe Hershberger <joe.hershberger at ni.com>
> Cc: Joel Stanley <joel at jms.id.au>
> Cc: Josua Mayer <josua at solid-run.com>
> Cc: Marek Vasut <marek.vasut+renesas at mailbox.org>
> Cc: Michael Trimarchi <michael at amarulasolutions.com>
> Cc: Michal Simek <michal.simek at amd.com>
> Cc: Nate Drude <nate.d at variscite.com>
> Cc: Neil Armstrong <neil.armstrong at linaro.org>
> Cc: Radu Pirea <radu-nicolae.pirea at oss.nxp.com>
> Cc: Ramon Fried <rfried.dev at gmail.com>
> Cc: Samuel Mendoza-Jonas <sam at mendozajonas.com>
> Cc: Stefan Roese <sr at denx.de>
> Cc: T Karthik Reddy <t.karthik.reddy at xilinx.com>
> Cc: Tim Harvey <tharvey at gateworks.com>
> Cc: Vladimir Oltean <vladimir.oltean at nxp.com>
> Cc: u-boot-amlogic at groups.io
> ---
>  drivers/net/phy/phy.c               | 3 ---
>  drivers/net/phy/xilinx_gmii2rgmii.c | 9 +--------
>  include/phy.h                       | 2 --
>  3 files changed, 1 insertion(+), 13 deletions(-)
>
> diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
> index 69db79f79e0..9d5d1494616 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_XILINX_GMII2RGMII
> -       phy_xilinx_gmii2rgmii_init();
> -#endif
>         genphy_init();
>
>         return 0;
> diff --git a/drivers/net/phy/xilinx_gmii2rgmii.c b/drivers/net/phy/xilinx_gmii2rgmii.c
> index 73762839565..0b7436a7e1e 100644
> --- a/drivers/net/phy/xilinx_gmii2rgmii.c
> +++ b/drivers/net/phy/xilinx_gmii2rgmii.c
> @@ -124,7 +124,7 @@ static int xilinxgmiitorgmii_probe(struct phy_device *phydev)
>         return 0;
>  }
>
> -static struct phy_driver gmii2rgmii_driver = {
> +U_BOOT_PHY_DRIVER(gmii2rgmii) = {
>         .name = "XILINX GMII2RGMII",
>         .uid = PHY_GMII2RGMII_ID,
>         .mask = 0xffffffff,
> @@ -135,10 +135,3 @@ static struct phy_driver gmii2rgmii_driver = {
>         .writeext = xilinxgmiitorgmii_extwrite,
>         .readext = xilinxgmiitorgmii_extread,
>  };
> -
> -int phy_xilinx_gmii2rgmii_init(void)
> -{
> -       phy_register(&gmii2rgmii_driver);
> -
> -       return 0;
> -}
> diff --git a/include/phy.h b/include/phy.h
> index 001c998db47..df2586f89ea 100644
> --- a/include/phy.h
> +++ b/include/phy.h
> @@ -315,8 +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_xilinx_gmii2rgmii_init(void);
> -
>  /**
>   * U_BOOT_PHY_DRIVER() - Declare a new U-Boot driver
>   * @__name: name of the driver
> --
> 2.39.2
>
Reviewed-by: Ramon Fried <rfried.dev at gmail.com>