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/fixed.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/fixed.c b/drivers/net/phy/fixed.c > index 1192915ee52..2f0823b8365 100644 > --- a/drivers/net/phy/fixed.c > +++ b/drivers/net/phy/fixed.c > @@ -93,7 +93,7 @@ static int fixedphy_shutdown(struct phy_device *phydev) > return 0; > } > > -static struct phy_driver fixedphy_driver = { > +U_BOOT_PHY_DRIVER(fixedphy) = { > .uid = PHY_FIXED_ID, > .mask = 0xffffffff, > .name = "Fixed PHY", > @@ -103,9 +103,3 @@ static struct phy_driver fixedphy_driver = { > .startup = fixedphy_startup, > .shutdown = fixedphy_shutdown, > }; > - > -int phy_fixed_init(void) > -{ > - phy_register(&fixedphy_driver); > - return 0; > -} > diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c > index c20e750aa16..245357c31dc 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_FIXED > - phy_fixed_init(); > -#endif > #ifdef CONFIG_PHY_NCSI > phy_ncsi_init(); > #endif > diff --git a/include/phy.h b/include/phy.h > index e4a3e10c48b..9cabfeedec8 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_fixed_init(void); > int phy_ncsi_init(void); > int phy_xilinx_gmii2rgmii_init(void); > > -- > 2.39.2 > Reviewed-by: Ramon Fried <rfried....@gmail.com>