2022-03-29 23:29:02

by Michael Walle

[permalink] [raw]
Subject: [PATCH v2 2/5] hwmon: intel-m10-bmc-hwmon: use devm_hwmon_sanitize_name()

Instead of open-coding the bad characters replacement in the hwmon name,
use the new devm_hwmon_sanitize_name().

Signed-off-by: Michael Walle <[email protected]>
---
drivers/hwmon/intel-m10-bmc-hwmon.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/hwmon/intel-m10-bmc-hwmon.c b/drivers/hwmon/intel-m10-bmc-hwmon.c
index 7a08e4c44a4b..29370108fa1c 100644
--- a/drivers/hwmon/intel-m10-bmc-hwmon.c
+++ b/drivers/hwmon/intel-m10-bmc-hwmon.c
@@ -515,7 +515,6 @@ static int m10bmc_hwmon_probe(struct platform_device *pdev)
struct intel_m10bmc *m10bmc = dev_get_drvdata(pdev->dev.parent);
struct device *hwmon_dev, *dev = &pdev->dev;
struct m10bmc_hwmon *hw;
- int i;

hw = devm_kzalloc(dev, sizeof(*hw), GFP_KERNEL);
if (!hw)
@@ -528,14 +527,10 @@ static int m10bmc_hwmon_probe(struct platform_device *pdev)
hw->chip.info = hw->bdata->hinfo;
hw->chip.ops = &m10bmc_hwmon_ops;

- hw->hw_name = devm_kstrdup(dev, id->name, GFP_KERNEL);
+ hw->hw_name = devm_hwmon_sanitize_name(dev, id->name);
if (!hw->hw_name)
return -ENOMEM;

- for (i = 0; hw->hw_name[i]; i++)
- if (hwmon_is_bad_char(hw->hw_name[i]))
- hw->hw_name[i] = '_';
-
hwmon_dev = devm_hwmon_device_register_with_info(dev, hw->hw_name,
hw, &hw->chip, NULL);
return PTR_ERR_OR_ZERO(hwmon_dev);
--
2.30.2


2022-03-31 02:47:05

by Xu Yilun

[permalink] [raw]
Subject: Re: [PATCH v2 2/5] hwmon: intel-m10-bmc-hwmon: use devm_hwmon_sanitize_name()

On Tue, Mar 29, 2022 at 06:07:27PM +0200, Michael Walle wrote:
> Instead of open-coding the bad characters replacement in the hwmon name,
> use the new devm_hwmon_sanitize_name().
>
> Signed-off-by: Michael Walle <[email protected]>

Acked-by: Xu Yilun <[email protected]>

> ---
> drivers/hwmon/intel-m10-bmc-hwmon.c | 7 +------
> 1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/drivers/hwmon/intel-m10-bmc-hwmon.c b/drivers/hwmon/intel-m10-bmc-hwmon.c
> index 7a08e4c44a4b..29370108fa1c 100644
> --- a/drivers/hwmon/intel-m10-bmc-hwmon.c
> +++ b/drivers/hwmon/intel-m10-bmc-hwmon.c
> @@ -515,7 +515,6 @@ static int m10bmc_hwmon_probe(struct platform_device *pdev)
> struct intel_m10bmc *m10bmc = dev_get_drvdata(pdev->dev.parent);
> struct device *hwmon_dev, *dev = &pdev->dev;
> struct m10bmc_hwmon *hw;
> - int i;
>
> hw = devm_kzalloc(dev, sizeof(*hw), GFP_KERNEL);
> if (!hw)
> @@ -528,14 +527,10 @@ static int m10bmc_hwmon_probe(struct platform_device *pdev)
> hw->chip.info = hw->bdata->hinfo;
> hw->chip.ops = &m10bmc_hwmon_ops;
>
> - hw->hw_name = devm_kstrdup(dev, id->name, GFP_KERNEL);
> + hw->hw_name = devm_hwmon_sanitize_name(dev, id->name);
> if (!hw->hw_name)
> return -ENOMEM;
>
> - for (i = 0; hw->hw_name[i]; i++)
> - if (hwmon_is_bad_char(hw->hw_name[i]))
> - hw->hw_name[i] = '_';
> -
> hwmon_dev = devm_hwmon_device_register_with_info(dev, hw->hw_name,
> hw, &hw->chip, NULL);
> return PTR_ERR_OR_ZERO(hwmon_dev);
> --
> 2.30.2