net: phylink: Fix phylink_dbg() macro
Subsystems (4)
PATCH 1/1 net: phylink: Fix phylink_dbg() macro
The phylink_dbg() macro does not follow dynamic debug or defined(DEBUG) and as a result, it spams the kernel log since a PR_DEBUG level is currently used. Fix it to be defined appropriately whether CONFIG_DYNAMIC_DEBUG or defined(DEBUG) are set.
Fixes 17091180b152 ("net: phylink: Add phylink_{printk, err, warn, info, dbg} macros")
Signed-off-by Florian Fainelli <[email protected]>
--- drivers/net/phy/phylink.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/net/phy/phylink.c +16 -0
@@ -87,8 +87,24 @@ struct phylink { phylink_printk(KERN_WARNING, pl, fmt, ##__VA_ARGS__)#define phylink_info (pl, fmt, ...) \ phylink_printk(KERN_INFO, pl, fmt, ##__VA_ARGS__) +#if defined(CONFIG_DYNAMIC_DEBUG )#define phylink_dbg (pl, fmt, ...) \ +do { \ + if ((pl)->config->type == PHYLINK_NETDEV) \ + netdev_dbg((pl)->netdev, fmt, ##__VA_ARGS__); \ + else if ((pl)->config->type == PHYLINK_DEV) \ + dev_dbg((pl)->dev, fmt, ##__VA_ARGS__); \ +} while (0) +#elif defined(DEBUG ) +#define phylink_dbg (pl, fmt, ...) \ phylink_printk(KERN_DEBUG, pl, fmt, ##__VA_ARGS__) +#else +#define phylink_dbg (pl, fmt, ...) \ +({ \ + if (0) \ + phylink_printk(KERN_DEBUG, pl, fmt, ##__VA_ARGS__); \ +}) +#endif /** * phylink_set_port_modes() - set the port type modes in the ethtool mask
Signature · 1 line
2.17.1
David Miller
maintainerFrom: Florian Fainelli <[email protected]>
Date: Thu, 31 Oct 2019 15:42:26 -0700
Quoted 7 lines
The
phylink_dbg()macro does not follow dynamic debug or defined(DEBUG) and as a result, it spams the kernel log since aPR_DEBUGlevel is currently used. Fix it to be defined appropriately whetherCONFIG_DYNAMIC_DEBUGor defined(DEBUG) are set.Fixes 17091180b152 ("net: phylink: Add phylink_{printk, err, warn, info, dbg} macros")Signed-off-by Florian Fainelli <[email protected]>
Applied and queued up for -stable.