Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'net-phy-remove-calls-to-devm_hwmon_sanitize_name'
Heiner Kallweit says:
====================
net: phy: remove calls to devm_hwmon_sanitize_name
Since c909e68f8127 ("hwmon: (core) Use device name as a fallback in
devm_hwmon_device_register_with_info") we can simply provide NULL
as name argument.
====================
Link: https://patch.msgid.link/198f3cd0-6c39-4783-afe7-95576a4b8539@gmail.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
+8
-34
+1
-7
drivers/net/phy/marvell-88q2xxx.c
+1
-7
drivers/net/phy/marvell-88q2xxx.c
···
765
765
struct mv88q2xxx_priv *priv = phydev->priv;
766
766
struct device *dev = &phydev->mdio.dev;
767
767
struct device *hwmon;
768
-
char *hwmon_name;
769
768
770
769
priv->enable_temp = true;
771
-
hwmon_name = devm_hwmon_sanitize_name(dev, dev_name(dev));
772
-
if (IS_ERR(hwmon_name))
773
-
return PTR_ERR(hwmon_name);
774
770
775
-
hwmon = devm_hwmon_device_register_with_info(dev,
776
-
hwmon_name,
777
-
phydev,
771
+
hwmon = devm_hwmon_device_register_with_info(dev, NULL, phydev,
778
772
&mv88q2xxx_hwmon_chip_info,
779
773
NULL);
780
774
+1
-7
drivers/net/phy/mxl-gpy.c
+1
-7
drivers/net/phy/mxl-gpy.c
···
225
225
{
226
226
struct device *dev = &phydev->mdio.dev;
227
227
struct device *hwmon_dev;
228
-
char *hwmon_name;
229
228
230
-
hwmon_name = devm_hwmon_sanitize_name(dev, dev_name(dev));
231
-
if (IS_ERR(hwmon_name))
232
-
return PTR_ERR(hwmon_name);
233
-
234
-
hwmon_dev = devm_hwmon_device_register_with_info(dev, hwmon_name,
235
-
phydev,
229
+
hwmon_dev = devm_hwmon_device_register_with_info(dev, NULL, phydev,
236
230
&gpy_hwmon_chip_info,
237
231
NULL);
238
232
+5
-14
drivers/net/phy/nxp-tja11xx.c
+5
-14
drivers/net/phy/nxp-tja11xx.c
···
87
87
#define TJA110X_RMII_MODE_REFCLK_IN BIT(0)
88
88
89
89
struct tja11xx_priv {
90
-
char *hwmon_name;
91
-
struct device *hwmon_dev;
92
90
struct phy_device *phydev;
93
91
struct work_struct phy_register_work;
94
92
u32 flags;
···
506
508
static int tja11xx_hwmon_register(struct phy_device *phydev,
507
509
struct tja11xx_priv *priv)
508
510
{
509
-
struct device *dev = &phydev->mdio.dev;
511
+
struct device *hdev, *dev = &phydev->mdio.dev;
510
512
511
-
priv->hwmon_name = devm_hwmon_sanitize_name(dev, dev_name(dev));
512
-
if (IS_ERR(priv->hwmon_name))
513
-
return PTR_ERR(priv->hwmon_name);
514
-
515
-
priv->hwmon_dev =
516
-
devm_hwmon_device_register_with_info(dev, priv->hwmon_name,
517
-
phydev,
518
-
&tja11xx_hwmon_chip_info,
519
-
NULL);
520
-
521
-
return PTR_ERR_OR_ZERO(priv->hwmon_dev);
513
+
hdev = devm_hwmon_device_register_with_info(dev, NULL, phydev,
514
+
&tja11xx_hwmon_chip_info,
515
+
NULL);
516
+
return PTR_ERR_OR_ZERO(hdev);
522
517
}
523
518
524
519
static int tja11xx_parse_dt(struct phy_device *phydev)
+1
-6
drivers/net/phy/realtek/realtek_hwmon.c
+1
-6
drivers/net/phy/realtek/realtek_hwmon.c
···
63
63
int rtl822x_hwmon_init(struct phy_device *phydev)
64
64
{
65
65
struct device *hwdev, *dev = &phydev->mdio.dev;
66
-
const char *name;
67
66
68
67
/* Ensure over-temp alarm is reset. */
69
68
phy_clear_bits_mmd(phydev, MDIO_MMD_VEND2, RTL822X_VND2_TSALRM, 3);
70
69
71
-
name = devm_hwmon_sanitize_name(dev, dev_name(dev));
72
-
if (IS_ERR(name))
73
-
return PTR_ERR(name);
74
-
75
-
hwdev = devm_hwmon_device_register_with_info(dev, name, phydev,
70
+
hwdev = devm_hwmon_device_register_with_info(dev, NULL, phydev,
76
71
&rtl822x_hwmon_chip_info,
77
72
NULL);
78
73
return PTR_ERR_OR_ZERO(hwdev);