net: phy: don't duplicate driver name in phy_attached_print (a98cabdb) · Commits · 戴 / test

Currently we print the driver name twice in phy_attached_print(): - phy_dev_info() prints it as part of the device info - and we print it as part of the info string This is a little bit ugly, it makes the info harder to read, especially if the driver name is a little bit longer. Therefore omit the driver name (if set) in the info string. Example from r8169 that uses phylib: old: Generic FE-GE Realtek PHY r8169-300:00: attached PHY driver \ [Generic FE-GE Realtek PHY] (mii_bus:phy_addr=r8169-300:00, irq=IGNORE) new: Generic FE-GE Realtek PHY r8169-300:00: attached PHY driver \ (mii_bus:phy_addr=r8169-300:00, irq=IGNORE) Signed-off-by:

Heiner Kallweit <hkallweit1@gmail.com> Reviewed-by:

Andrew Lunn <andrew@lunn.ch> Link: https://lore.kernel.org/r/8ab72586-f079-41d8-84ee-9f6a5bd97b2a@gmail.com Signed-off-by:

Jakub Kicinski <kuba@kernel.org>

drivers/net/phy/phy_device.c

+6 −8

Original line number	Diff line number	Diff line
		@@ -1156,7 +1156,7 @@ void phy_attached_info(struct phy_device *phydev)
		}
		EXPORT_SYMBOL(phy_attached_info);

		#define ATTACHED_FMT "attached PHY driver [%s] (mii_bus:phy_addr=%s, irq=%s)"
		#define ATTACHED_FMT "attached PHY driver %s(mii_bus:phy_addr=%s, irq=%s)"
		char phy_attached_info_irq(struct phy_device phydev)
		{
		char *irq_str;
		@@ -1181,19 +1181,17 @@ EXPORT_SYMBOL(phy_attached_info_irq);

		void phy_attached_print(struct phy_device phydev, const char fmt, ...)
		{
		const char *drv_name = phydev->drv ? phydev->drv->name : "unbound";
		const char *unbound = phydev->drv ? "" : "[unbound] ";
		char *irq_str = phy_attached_info_irq(phydev);

		if (!fmt) {
		phydev_info(phydev, ATTACHED_FMT "\n",
		drv_name, phydev_name(phydev),
		irq_str);
		phydev_info(phydev, ATTACHED_FMT "\n", unbound,
		phydev_name(phydev), irq_str);
		} else {
		va_list ap;

		phydev_info(phydev, ATTACHED_FMT,
		drv_name, phydev_name(phydev),
		irq_str);
		phydev_info(phydev, ATTACHED_FMT, unbound,
		phydev_name(phydev), irq_str);

		va_start(ap, fmt);
		vprintk(fmt, ap);

Admin message