| Message ID | b3b9b3bc-c310-4a54-b376-c909c83575de@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | net: phy: fixed_phy: simplifications and improvements | expand |
On Sat, May 17, 2025 at 10:34:32PM +0200, Heiner Kallweit wrote: > All callers pass PHY_POLL, therefore remove irq argument from > fixed_phy_add(). > > Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Reviewed-by: Simon Horman <horms@kernel.org>
On 5/17/25 13:34, Heiner Kallweit wrote: > All callers pass PHY_POLL, therefore remove irq argument from > fixed_phy_add(). > > Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Hi Heiner, On 18/5/25 06:34, Heiner Kallweit wrote: > All callers pass PHY_POLL, therefore remove irq argument from > fixed_phy_add(). > > Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> > --- > arch/m68k/coldfire/m5272.c | 2 +- > arch/mips/bcm47xx/setup.c | 2 +- > drivers/net/phy/fixed_phy.c | 5 ++--- > include/linux/phy_fixed.h | 5 ++--- > 4 files changed, 6 insertions(+), 8 deletions(-) > > diff --git a/arch/m68k/coldfire/m5272.c b/arch/m68k/coldfire/m5272.c > index 734dab657..5b70dfdab 100644 > --- a/arch/m68k/coldfire/m5272.c > +++ b/arch/m68k/coldfire/m5272.c > @@ -119,7 +119,7 @@ static struct fixed_phy_status nettel_fixed_phy_status __initdata = { > static int __init init_BSP(void) > { > m5272_uarts_init(); > - fixed_phy_add(PHY_POLL, 0, &nettel_fixed_phy_status); > + fixed_phy_add(0, &nettel_fixed_phy_status); > clkdev_add_table(m5272_clk_lookup, ARRAY_SIZE(m5272_clk_lookup)); > return 0; > } Acked-by: Greg Ungerer <gerg@linux-m68k.org> Regards Greg > diff --git a/arch/mips/bcm47xx/setup.c b/arch/mips/bcm47xx/setup.c > index 247be207f..de426a474 100644 > --- a/arch/mips/bcm47xx/setup.c > +++ b/arch/mips/bcm47xx/setup.c > @@ -282,7 +282,7 @@ static int __init bcm47xx_register_bus_complete(void) > bcm47xx_leds_register(); > bcm47xx_workarounds(); > > - fixed_phy_add(PHY_POLL, 0, &bcm47xx_fixed_phy_status); > + fixed_phy_add(0, &bcm47xx_fixed_phy_status); > return 0; > } > device_initcall(bcm47xx_register_bus_complete); > diff --git a/drivers/net/phy/fixed_phy.c b/drivers/net/phy/fixed_phy.c > index c91adf246..34a71f223 100644 > --- a/drivers/net/phy/fixed_phy.c > +++ b/drivers/net/phy/fixed_phy.c > @@ -160,10 +160,9 @@ static int fixed_phy_add_gpiod(unsigned int irq, int phy_addr, > return 0; > } > > -int fixed_phy_add(unsigned int irq, int phy_addr, > - struct fixed_phy_status *status) > +int fixed_phy_add(int phy_addr, struct fixed_phy_status *status) > { > - return fixed_phy_add_gpiod(irq, phy_addr, status, NULL); > + return fixed_phy_add_gpiod(PHY_POLL, phy_addr, status, NULL); > } > EXPORT_SYMBOL_GPL(fixed_phy_add); > > diff --git a/include/linux/phy_fixed.h b/include/linux/phy_fixed.h > index 3392c09b5..316bb4ded 100644 > --- a/include/linux/phy_fixed.h > +++ b/include/linux/phy_fixed.h > @@ -17,8 +17,7 @@ struct net_device; > > #if IS_ENABLED(CONFIG_FIXED_PHY) > extern int fixed_phy_change_carrier(struct net_device *dev, bool new_carrier); > -extern int fixed_phy_add(unsigned int irq, int phy_id, > - struct fixed_phy_status *status); > +int fixed_phy_add(int phy_id, struct fixed_phy_status *status); > extern struct phy_device *fixed_phy_register(unsigned int irq, > struct fixed_phy_status *status, > struct device_node *np); > @@ -28,7 +27,7 @@ extern int fixed_phy_set_link_update(struct phy_device *phydev, > int (*link_update)(struct net_device *, > struct fixed_phy_status *)); > #else > -static inline int fixed_phy_add(unsigned int irq, int phy_id, > +static inline int fixed_phy_add(int phy_id, > struct fixed_phy_status *status) > { > return -ENODEV;
diff --git a/arch/m68k/coldfire/m5272.c b/arch/m68k/coldfire/m5272.c index 734dab657..5b70dfdab 100644 --- a/arch/m68k/coldfire/m5272.c +++ b/arch/m68k/coldfire/m5272.c @@ -119,7 +119,7 @@ static struct fixed_phy_status nettel_fixed_phy_status __initdata = { static int __init init_BSP(void) { m5272_uarts_init(); - fixed_phy_add(PHY_POLL, 0, &nettel_fixed_phy_status); + fixed_phy_add(0, &nettel_fixed_phy_status); clkdev_add_table(m5272_clk_lookup, ARRAY_SIZE(m5272_clk_lookup)); return 0; } diff --git a/arch/mips/bcm47xx/setup.c b/arch/mips/bcm47xx/setup.c index 247be207f..de426a474 100644 --- a/arch/mips/bcm47xx/setup.c +++ b/arch/mips/bcm47xx/setup.c @@ -282,7 +282,7 @@ static int __init bcm47xx_register_bus_complete(void) bcm47xx_leds_register(); bcm47xx_workarounds(); - fixed_phy_add(PHY_POLL, 0, &bcm47xx_fixed_phy_status); + fixed_phy_add(0, &bcm47xx_fixed_phy_status); return 0; } device_initcall(bcm47xx_register_bus_complete); diff --git a/drivers/net/phy/fixed_phy.c b/drivers/net/phy/fixed_phy.c index c91adf246..34a71f223 100644 --- a/drivers/net/phy/fixed_phy.c +++ b/drivers/net/phy/fixed_phy.c @@ -160,10 +160,9 @@ static int fixed_phy_add_gpiod(unsigned int irq, int phy_addr, return 0; } -int fixed_phy_add(unsigned int irq, int phy_addr, - struct fixed_phy_status *status) +int fixed_phy_add(int phy_addr, struct fixed_phy_status *status) { - return fixed_phy_add_gpiod(irq, phy_addr, status, NULL); + return fixed_phy_add_gpiod(PHY_POLL, phy_addr, status, NULL); } EXPORT_SYMBOL_GPL(fixed_phy_add); diff --git a/include/linux/phy_fixed.h b/include/linux/phy_fixed.h index 3392c09b5..316bb4ded 100644 --- a/include/linux/phy_fixed.h +++ b/include/linux/phy_fixed.h @@ -17,8 +17,7 @@ struct net_device; #if IS_ENABLED(CONFIG_FIXED_PHY) extern int fixed_phy_change_carrier(struct net_device *dev, bool new_carrier); -extern int fixed_phy_add(unsigned int irq, int phy_id, - struct fixed_phy_status *status); +int fixed_phy_add(int phy_id, struct fixed_phy_status *status); extern struct phy_device *fixed_phy_register(unsigned int irq, struct fixed_phy_status *status, struct device_node *np); @@ -28,7 +27,7 @@ extern int fixed_phy_set_link_update(struct phy_device *phydev, int (*link_update)(struct net_device *, struct fixed_phy_status *)); #else -static inline int fixed_phy_add(unsigned int irq, int phy_id, +static inline int fixed_phy_add(int phy_id, struct fixed_phy_status *status) { return -ENODEV;
All callers pass PHY_POLL, therefore remove irq argument from fixed_phy_add(). Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> --- arch/m68k/coldfire/m5272.c | 2 +- arch/mips/bcm47xx/setup.c | 2 +- drivers/net/phy/fixed_phy.c | 5 ++--- include/linux/phy_fixed.h | 5 ++--- 4 files changed, 6 insertions(+), 8 deletions(-)