[PATCH 32/41] net: phy: mscc: 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/mscc.c | 27 +++++++--------------------
>  drivers/net/phy/phy.c  |  3 ---
>  include/phy.h          |  1 -
>  3 files changed, 7 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/net/phy/mscc.c b/drivers/net/phy/mscc.c
> index f9482b21a01..ef1761a8bda 100644
> --- a/drivers/net/phy/mscc.c
> +++ b/drivers/net/phy/mscc.c
> @@ -1558,7 +1558,7 @@ static int vsc8502_config(struct phy_device *phydev)
>         return 0;
>  }
>
> -static struct phy_driver VSC8530_driver = {
> +U_BOOT_PHY_DRIVER(vsc8530) = {
>         .name = "Microsemi VSC8530",
>         .uid = PHY_ID_VSC8530,
>         .mask = 0x000ffff0,
> @@ -1568,7 +1568,7 @@ static struct phy_driver VSC8530_driver = {
>         .shutdown = &genphy_shutdown,
>  };
>
> -static struct phy_driver VSC8531_driver = {
> +U_BOOT_PHY_DRIVER(vsc8531) = {
>         .name = "Microsemi VSC8531",
>         .uid = PHY_ID_VSC8531,
>         .mask = 0x000ffff0,
> @@ -1578,7 +1578,7 @@ static struct phy_driver VSC8531_driver = {
>         .shutdown = &genphy_shutdown,
>  };
>
> -static struct phy_driver VSC8502_driver = {
> +U_BOOT_PHY_DRIVER(vsc8502) = {
>         .name = "Microsemi VSC8502",
>         .uid = PHY_ID_VSC8502,
>         .mask = 0x000ffff0,
> @@ -1588,7 +1588,7 @@ static struct phy_driver VSC8502_driver = {
>         .shutdown = &genphy_shutdown,
>  };
>
> -static struct phy_driver VSC8540_driver = {
> +U_BOOT_PHY_DRIVER(vsc8540) = {
>         .name = "Microsemi VSC8540",
>         .uid = PHY_ID_VSC8540,
>         .mask = 0x000ffff0,
> @@ -1598,7 +1598,7 @@ static struct phy_driver VSC8540_driver = {
>         .shutdown = &genphy_shutdown,
>  };
>
> -static struct phy_driver VSC8541_driver = {
> +U_BOOT_PHY_DRIVER(vsc8541) = {
>         .name = "Microsemi VSC8541",
>         .uid = PHY_ID_VSC8541,
>         .mask = 0x000ffff0,
> @@ -1608,7 +1608,7 @@ static struct phy_driver VSC8541_driver = {
>         .shutdown = &genphy_shutdown,
>  };
>
> -static struct phy_driver VSC8574_driver = {
> +U_BOOT_PHY_DRIVER(vsc8574) = {
>         .name = "Microsemi VSC8574",
>         .uid = PHY_ID_VSC8574,
>         .mask = 0x000ffff0,
> @@ -1618,7 +1618,7 @@ static struct phy_driver VSC8574_driver = {
>         .shutdown = &genphy_shutdown,
>  };
>
> -static struct phy_driver VSC8584_driver = {
> +U_BOOT_PHY_DRIVER(vsc8584) = {
>         .name = "Microsemi VSC8584",
>         .uid = PHY_ID_VSC8584,
>         .mask = 0x000ffff0,
> @@ -1627,16 +1627,3 @@ static struct phy_driver VSC8584_driver = {
>         .startup = &mscc_startup,
>         .shutdown = &genphy_shutdown,
>  };
> -
> -int phy_mscc_init(void)
> -{
> -       phy_register(&VSC8530_driver);
> -       phy_register(&VSC8531_driver);
> -       phy_register(&VSC8502_driver);
> -       phy_register(&VSC8540_driver);
> -       phy_register(&VSC8541_driver);
> -       phy_register(&VSC8574_driver);
> -       phy_register(&VSC8584_driver);
> -
> -       return 0;
> -}
> diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
> index 1542fe89252..c20e750aa16 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_MSCC
> -       phy_mscc_init();
> -#endif
>  #ifdef CONFIG_PHY_FIXED
>         phy_fixed_init();
>  #endif
> diff --git a/include/phy.h b/include/phy.h
> index fc8300d5d97..e4a3e10c48b 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_mscc_init(void);
>  int phy_fixed_init(void);
>  int phy_ncsi_init(void);
>  int phy_xilinx_gmii2rgmii_init(void);
> --
> 2.39.2
>
Reviewed-by: Ramon Fried <rfried.dev at gmail.com>