On Sun, Mar 19, 2023 at 7:05 PM Marek Vasut
<marek.vasut+rene...@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+rene...@mailbox.org>
> ---
> Cc: "Ariel D'Alessandro" <ariel.dalessan...@collabora.com>
> Cc: "Cédric Le Goater" <c...@kaod.org>
> Cc: "Marek Behún" <ka...@kernel.org>
> Cc: Alex Nemirovsky <alex.nemirov...@cortina-access.com>
> Cc: Haolin Li <li.hao...@qq.com>
> Cc: Heinrich Schuchardt <xypron.g...@gmx.de>
> Cc: Joe Hershberger <joe.hershber...@ni.com>
> Cc: Joel Stanley <j...@jms.id.au>
> Cc: Josua Mayer <jo...@solid-run.com>
> Cc: Marek Vasut <marek.vasut+rene...@mailbox.org>
> Cc: Michael Trimarchi <mich...@amarulasolutions.com>
> Cc: Michal Simek <michal.si...@amd.com>
> Cc: Nate Drude <nat...@variscite.com>
> Cc: Neil Armstrong <neil.armstr...@linaro.org>
> Cc: Radu Pirea <radu-nicolae.pi...@oss.nxp.com>
> Cc: Ramon Fried <rfried....@gmail.com>
> Cc: Samuel Mendoza-Jonas <s...@mendozajonas.com>
> Cc: Stefan Roese <s...@denx.de>
> Cc: T Karthik Reddy <t.karthik.re...@xilinx.com>
> Cc: Tim Harvey <thar...@gateworks.com>
> Cc: Vladimir Oltean <vladimir.olt...@nxp.com>
> Cc: u-boot-amlo...@groups.io
> ---
> drivers/net/phy/generic_10g.c | 2 +-
> drivers/net/phy/phy.c | 2 +-
> include/phy.h | 4 ----
> 3 files changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/phy/generic_10g.c b/drivers/net/phy/generic_10g.c
> index b4384e1f781..34ac51ea070 100644
> --- a/drivers/net/phy/generic_10g.c
> +++ b/drivers/net/phy/generic_10g.c
> @@ -80,7 +80,7 @@ int gen10g_config(struct phy_device *phydev)
> return gen10g_discover_mmds(phydev);
> }
>
> -struct phy_driver gen10g_driver = {
> +U_BOOT_PHY_DRIVER(gen10g) = {
> .uid = 0xffffffff,
> .mask = 0xffffffff,
> .name = "Generic 10G PHY",
> diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
> index b1e9861c6f3..bd9c576f459 100644
> --- a/drivers/net/phy/phy.c
> +++ b/drivers/net/phy/phy.c
> @@ -566,7 +566,7 @@ static struct phy_driver *generic_for_phy(struct
> phy_device *phydev)
> {
> #ifdef CONFIG_PHYLIB_10G
> if (phydev->is_c45)
> - return &gen10g_driver;
> + return ll_entry_get(struct phy_driver, gen10g, phy_driver);
> #endif
>
> return ll_entry_get(struct phy_driver, genphy, phy_driver);
> diff --git a/include/phy.h b/include/phy.h
> index df2586f89ea..5f4967cb150 100644
> --- a/include/phy.h
> +++ b/include/phy.h
> @@ -173,10 +173,6 @@ struct fixed_link {
> int asym_pause;
> };
>
> -#ifdef CONFIG_PHYLIB_10G
> -extern struct phy_driver gen10g_driver;
> -#endif
> -
> /**
> * phy_init() - Initializes the PHY drivers
> * This function registers all available PHY drivers
> --
> 2.39.2
>
Reviewed-by: Ramon Fried <rfried....@gmail.com>
