On Sun, Mar 19, 2023 at 7:05 PM Marek Vasut <[email protected]> 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 <[email protected]> > --- > Cc: "Ariel D'Alessandro" <[email protected]> > Cc: "Cédric Le Goater" <[email protected]> > Cc: "Marek Behún" <[email protected]> > Cc: Alex Nemirovsky <[email protected]> > Cc: Haolin Li <[email protected]> > Cc: Heinrich Schuchardt <[email protected]> > Cc: Joe Hershberger <[email protected]> > Cc: Joel Stanley <[email protected]> > Cc: Josua Mayer <[email protected]> > Cc: Marek Vasut <[email protected]> > Cc: Michael Trimarchi <[email protected]> > Cc: Michal Simek <[email protected]> > Cc: Nate Drude <[email protected]> > Cc: Neil Armstrong <[email protected]> > Cc: Radu Pirea <[email protected]> > Cc: Ramon Fried <[email protected]> > Cc: Samuel Mendoza-Jonas <[email protected]> > Cc: Stefan Roese <[email protected]> > Cc: T Karthik Reddy <[email protected]> > Cc: Tim Harvey <[email protected]> > Cc: Vladimir Oltean <[email protected]> > Cc: [email protected] > --- > drivers/net/phy/intel_xway.c | 9 +-------- > drivers/net/phy/phy.c | 3 --- > include/phy.h | 1 - > 3 files changed, 1 insertion(+), 12 deletions(-) > > diff --git a/drivers/net/phy/intel_xway.c b/drivers/net/phy/intel_xway.c > index dfce3f8332e..9d1b97d349f 100644 > --- a/drivers/net/phy/intel_xway.c > +++ b/drivers/net/phy/intel_xway.c > @@ -30,7 +30,7 @@ static int xway_config(struct phy_device *phydev) > return 0; > } > > -static struct phy_driver XWAY_driver = { > +U_BOOT_PHY_DRIVER(xway) = { > .name = "XWAY", > .uid = 0xD565A400, > .mask = 0xffffff00, > @@ -39,10 +39,3 @@ static struct phy_driver XWAY_driver = { > .startup = genphy_startup, > .shutdown = genphy_shutdown, > }; > - > -int phy_xway_init(void) > -{ > - phy_register(&XWAY_driver); > - > - return 0; > -} > diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c > index b85d5c4566d..1542fe89252 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_XWAY > - phy_xway_init(); > -#endif > #ifdef CONFIG_PHY_MSCC > phy_mscc_init(); > #endif > diff --git a/include/phy.h b/include/phy.h > index e128ddf0037..fc8300d5d97 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_xway_init(void); > int phy_mscc_init(void); > int phy_fixed_init(void); > int phy_ncsi_init(void); > -- > 2.39.2 > Reviewed-by: Ramon Fried <[email protected]>
