Commit a98cabdb authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Jakub Kicinski

net: phy: don't duplicate driver name in phy_attached_print

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: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Link: https://lore.kernel.org/r/8ab72586-f079-41d8-84ee-9f6a5bd97b2a@gmail.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 83c317d7
...@@ -1156,7 +1156,7 @@ void phy_attached_info(struct phy_device *phydev) ...@@ -1156,7 +1156,7 @@ void phy_attached_info(struct phy_device *phydev)
} }
EXPORT_SYMBOL(phy_attached_info); 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 *phy_attached_info_irq(struct phy_device *phydev)
{ {
char *irq_str; char *irq_str;
...@@ -1181,19 +1181,17 @@ EXPORT_SYMBOL(phy_attached_info_irq); ...@@ -1181,19 +1181,17 @@ EXPORT_SYMBOL(phy_attached_info_irq);
void phy_attached_print(struct phy_device *phydev, const char *fmt, ...) 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); char *irq_str = phy_attached_info_irq(phydev);
if (!fmt) { if (!fmt) {
phydev_info(phydev, ATTACHED_FMT "\n", phydev_info(phydev, ATTACHED_FMT "\n", unbound,
drv_name, phydev_name(phydev), phydev_name(phydev), irq_str);
irq_str);
} else { } else {
va_list ap; va_list ap;
phydev_info(phydev, ATTACHED_FMT, phydev_info(phydev, ATTACHED_FMT, unbound,
drv_name, phydev_name(phydev), phydev_name(phydev), irq_str);
irq_str);
va_start(ap, fmt); va_start(ap, fmt);
vprintk(fmt, ap); vprintk(fmt, ap);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment