| Message ID | 20240703145718.19951-2-ceggers@arri.de (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net,1/2] dsa: lan9303: Fix mapping between DSA port number and PHY address | expand |
On Wed, Jul 03, 2024 at 04:57:18PM +0200, Christian Eggers wrote: > Name it 'addr' instead of 'port' or 'phy'. > > Signed-off-by: Christian Eggers <ceggers@arri.de> > --- > drivers/net/dsa/lan9303_mdio.c | 8 ++++---- > include/linux/dsa/lan9303.h | 4 ++-- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/net/dsa/lan9303_mdio.c b/drivers/net/dsa/lan9303_mdio.c > index 167a86f39f27..0ac4857e5ee8 100644 > --- a/drivers/net/dsa/lan9303_mdio.c > +++ b/drivers/net/dsa/lan9303_mdio.c > @@ -58,19 +58,19 @@ static int lan9303_mdio_read(void *ctx, uint32_t reg, uint32_t *val) > return 0; > } > > -static int lan9303_mdio_phy_write(struct lan9303 *chip, int phy, int reg, > +static int lan9303_mdio_phy_write(struct lan9303 *chip, int addr, int reg, > u16 val) > { > struct lan9303_mdio *sw_dev = dev_get_drvdata(chip->dev); > > - return mdiobus_write_nested(sw_dev->device->bus, phy, reg, val); > + return mdiobus_write_nested(sw_dev->device->bus, addr, reg, val); > } > > -static int lan9303_mdio_phy_read(struct lan9303 *chip, int phy, int reg) > +static int lan9303_mdio_phy_read(struct lan9303 *chip, int addr, int reg) > { > struct lan9303_mdio *sw_dev = dev_get_drvdata(chip->dev); > > - return mdiobus_read_nested(sw_dev->device->bus, phy, reg); > + return mdiobus_read_nested(sw_dev->device->bus, addr, reg); > } > > static const struct lan9303_phy_ops lan9303_mdio_phy_ops = { > diff --git a/include/linux/dsa/lan9303.h b/include/linux/dsa/lan9303.h > index b4f22112ba75..3ce7cbcc37a3 100644 > --- a/include/linux/dsa/lan9303.h > +++ b/include/linux/dsa/lan9303.h > @@ -5,8 +5,8 @@ struct lan9303; > > struct lan9303_phy_ops { > /* PHY 1 and 2 access*/ > - int (*phy_read)(struct lan9303 *chip, int port, int regnum); > - int (*phy_write)(struct lan9303 *chip, int port, > + int (*phy_read)(struct lan9303 *chip, int addr, int regnum); > + int (*phy_write)(struct lan9303 *chip, int addr, > int regnum, u16 val); > }; > > -- > 2.43.0 > > Reviewed-by: Michal Kubiak <michal.kubiak@intel.com>
On 7/3/2024 3:57 PM, Christian Eggers wrote: > Name it 'addr' instead of 'port' or 'phy'. > > Signed-off-by: Christian Eggers <ceggers@arri.de> Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
On Wed, 3 Jul 2024 16:57:18 +0200 Christian Eggers wrote:
> Name it 'addr' instead of 'port' or 'phy'.
Unfortunately the fix has narrowly missed today's PR.
Please resend this for net-next in a week+.
diff --git a/drivers/net/dsa/lan9303_mdio.c b/drivers/net/dsa/lan9303_mdio.c index 167a86f39f27..0ac4857e5ee8 100644 --- a/drivers/net/dsa/lan9303_mdio.c +++ b/drivers/net/dsa/lan9303_mdio.c @@ -58,19 +58,19 @@ static int lan9303_mdio_read(void *ctx, uint32_t reg, uint32_t *val) return 0; } -static int lan9303_mdio_phy_write(struct lan9303 *chip, int phy, int reg, +static int lan9303_mdio_phy_write(struct lan9303 *chip, int addr, int reg, u16 val) { struct lan9303_mdio *sw_dev = dev_get_drvdata(chip->dev); - return mdiobus_write_nested(sw_dev->device->bus, phy, reg, val); + return mdiobus_write_nested(sw_dev->device->bus, addr, reg, val); } -static int lan9303_mdio_phy_read(struct lan9303 *chip, int phy, int reg) +static int lan9303_mdio_phy_read(struct lan9303 *chip, int addr, int reg) { struct lan9303_mdio *sw_dev = dev_get_drvdata(chip->dev); - return mdiobus_read_nested(sw_dev->device->bus, phy, reg); + return mdiobus_read_nested(sw_dev->device->bus, addr, reg); } static const struct lan9303_phy_ops lan9303_mdio_phy_ops = { diff --git a/include/linux/dsa/lan9303.h b/include/linux/dsa/lan9303.h index b4f22112ba75..3ce7cbcc37a3 100644 --- a/include/linux/dsa/lan9303.h +++ b/include/linux/dsa/lan9303.h @@ -5,8 +5,8 @@ struct lan9303; struct lan9303_phy_ops { /* PHY 1 and 2 access*/ - int (*phy_read)(struct lan9303 *chip, int port, int regnum); - int (*phy_write)(struct lan9303 *chip, int port, + int (*phy_read)(struct lan9303 *chip, int addr, int regnum); + int (*phy_write)(struct lan9303 *chip, int addr, int regnum, u16 val); };
Name it 'addr' instead of 'port' or 'phy'. Signed-off-by: Christian Eggers <ceggers@arri.de> --- drivers/net/dsa/lan9303_mdio.c | 8 ++++---- include/linux/dsa/lan9303.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-)