On Sun, Mar 19, 2023 at 7:05 PM Marek Vasut
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
> ---
> Cc: "Ariel D'Alessandro"
> Cc: "Cédric Le Goater"
> Cc: "Marek Behún"
> Cc: Alex Nemirovsky
> Cc: Haolin Li
> Cc: Heinrich Schuchardt
> Cc: Joe Hershberger
> Cc: Joel Stanley
> Cc: Josua Mayer
> Cc: Marek Vasut
> Cc: Michael Trimarchi
> Cc: Michal Simek
> Cc: Nate Drude
> Cc: Neil Armstrong
> Cc: Radu Pirea
> Cc: Ramon Fried
> Cc: Samuel Mendoza-Jonas
> Cc: Stefan Roese
> Cc: T Karthik Reddy
> Cc: Tim Harvey
> Cc: Vladimir Oltean
> Cc: u-boot-amlo...@groups.io
> ---
> drivers/net/phy/phy.c| 3 ---
> drivers/net/phy/xilinx_phy.c | 10 +-
> include/phy.h| 1 -
> 3 files changed, 1 insertion(+), 13 deletions(-)
>
> diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
> index fff1d669fcd..b85d5c4566d 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
> - phy_xilinx_init();
> -#endif
> #ifdef CONFIG_PHY_XWAY
> phy_xway_init();
> #endif
> diff --git a/drivers/net/phy/xilinx_phy.c b/drivers/net/phy/xilinx_phy.c
> index 39dbfdb7da8..1df639d6f44 100644
> --- a/drivers/net/phy/xilinx_phy.c
> +++ b/drivers/net/phy/xilinx_phy.c
> @@ -127,7 +127,7 @@ static int xilinxphy_config(struct phy_device *phydev)
> return 0;
> }
>
> -static struct phy_driver xilinxphy_driver = {
> +U_BOOT_PHY_DRIVER(xilinxphy) = {
> .uid = XILINX_PHY_ID,
> .mask = XILINX_PHY_ID_MASK,
> .name = "Xilinx PCS/PMA PHY",
> @@ -136,11 +136,3 @@ static struct phy_driver xilinxphy_driver = {
> .startup = _startup,
> .shutdown = _shutdown,
> };
> -
> -int phy_xilinx_init(void)
> -{
> - debug("%s\n", __func__);
> - phy_register(_driver);
> -
> - return 0;
> -}
> diff --git a/include/phy.h b/include/phy.h
> index 74f3ada2491..e128ddf0037 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_xilinx_init(void);
> int phy_xway_init(void);
> int phy_mscc_init(void);
> int phy_fixed_init(void);
> --
> 2.39.2
>
Reviewed-by: Ramon Fried
