| Message ID | 20240715123050.21202-1-ceggers@arri.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | f96eb1172ed8d74cfed7da92d2045ec64028cc38 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] dsa: lan9303: consistent naming for PHY address parameter | expand |
Hi Christian, On Mon, Jul 15, 2024 at 02:30:50PM +0200, Christian Eggers wrote: > Name it 'addr' instead of 'port' or 'phy'. > > Signed-off-by: Christian Eggers <ceggers@arri.de> > --- There was a small time window in which you should have sent the patch, after the 'net' -> 'net-next' merge, but before the 'net-next' closure. https://lore.kernel.org/netdev/20240714204612.738afb58@kernel.org/ You missed it, and so, you now need to wait, according to Jakub, until July 28 and resend then.
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Mon, 15 Jul 2024 14:30:50 +0200 you 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(-) Here is the summary with links: - [net-next] dsa: lan9303: consistent naming for PHY address parameter https://git.kernel.org/netdev/net-next/c/f96eb1172ed8 You are awesome, thank you!
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(-)