Commit d9917c7d authored by Paolo Abeni's avatar Paolo Abeni
Browse files

Merge branch 'net-phy-remove-calls-to-devm_hwmon_sanitize_name' 

Heiner Kallweit says:

====================
net: phy: remove calls to devm_hwmon_sanitize_name

Since c909e68f ("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: default avatarPaolo Abeni <pabeni@redhat.com>
parents 3fed9fda 345be5cd

drivers/net/phy/marvell-88q2xxx.c

+1 −7
Original line number Diff line number Diff line
@@ -765,16 +765,10 @@ static int mv88q2xxx_hwmon_probe(struct phy_device *phydev) 
	struct mv88q2xxx_priv *priv = phydev->priv;

	struct device *dev = &phydev->mdio.dev;

	struct device *hwmon;

	char *hwmon_name;



	priv->enable_temp = true;

	hwmon_name = devm_hwmon_sanitize_name(dev, dev_name(dev));

	if (IS_ERR(hwmon_name))

		return PTR_ERR(hwmon_name);



	hwmon = devm_hwmon_device_register_with_info(dev,

						     hwmon_name,

						     phydev,

	hwmon = devm_hwmon_device_register_with_info(dev, NULL, phydev,

						     &mv88q2xxx_hwmon_chip_info,

						     NULL);

drivers/net/phy/mxl-gpy.c

+1 −7
Original line number Diff line number Diff line
@@ -225,14 +225,8 @@ static int gpy_hwmon_register(struct phy_device *phydev) 
{

	struct device *dev = &phydev->mdio.dev;

	struct device *hwmon_dev;

	char *hwmon_name;



	hwmon_name = devm_hwmon_sanitize_name(dev, dev_name(dev));

	if (IS_ERR(hwmon_name))

		return PTR_ERR(hwmon_name);



	hwmon_dev = devm_hwmon_device_register_with_info(dev, hwmon_name,

							 phydev,

	hwmon_dev = devm_hwmon_device_register_with_info(dev, NULL, phydev,

							 &gpy_hwmon_chip_info,

							 NULL);

drivers/net/phy/nxp-tja11xx.c

+5 −14
Original line number Diff line number Diff line
@@ -87,8 +87,6 @@ 
#define TJA110X_RMII_MODE_REFCLK_IN       BIT(0)



struct tja11xx_priv {

	char		*hwmon_name;

	struct device	*hwmon_dev;

	struct phy_device *phydev;

	struct work_struct phy_register_work;

	u32 flags;
@@ -508,19 +506,12 @@ static const struct hwmon_chip_info tja11xx_hwmon_chip_info = { 
static int tja11xx_hwmon_register(struct phy_device *phydev,

				  struct tja11xx_priv *priv)

{

	struct device *dev = &phydev->mdio.dev;



	priv->hwmon_name = devm_hwmon_sanitize_name(dev, dev_name(dev));

	if (IS_ERR(priv->hwmon_name))

		return PTR_ERR(priv->hwmon_name);

	struct device *hdev, *dev = &phydev->mdio.dev;



	priv->hwmon_dev =

		devm_hwmon_device_register_with_info(dev, priv->hwmon_name,

						     phydev,

	hdev = devm_hwmon_device_register_with_info(dev, NULL, phydev,

						    &tja11xx_hwmon_chip_info,

						    NULL);



	return PTR_ERR_OR_ZERO(priv->hwmon_dev);

	return PTR_ERR_OR_ZERO(hdev);

}



static int tja11xx_parse_dt(struct phy_device *phydev)

drivers/net/phy/realtek/realtek_hwmon.c

+1 −6
Original line number Diff line number Diff line
@@ -63,16 +63,11 @@ static const struct hwmon_chip_info rtl822x_hwmon_chip_info = { 
int rtl822x_hwmon_init(struct phy_device *phydev)

{

	struct device *hwdev, *dev = &phydev->mdio.dev;

	const char *name;



	/* Ensure over-temp alarm is reset. */

	phy_clear_bits_mmd(phydev, MDIO_MMD_VEND2, RTL822X_VND2_TSALRM, 3);



	name = devm_hwmon_sanitize_name(dev, dev_name(dev));

	if (IS_ERR(name))

		return PTR_ERR(name);



	hwdev = devm_hwmon_device_register_with_info(dev, name, phydev,

	hwdev = devm_hwmon_device_register_with_info(dev, NULL, phydev,

						     &rtl822x_hwmon_chip_info,

						     NULL);

	return PTR_ERR_OR_ZERO(hwdev);