Switch from sysfs_create_group() to device_add_group() including device managed where appropriate.
Signed-off-by: Svyatoslav Ryhel <[email protected]> --- drivers/mfd/lm3533-core.c | 4 ++-- drivers/video/backlight/lm3533_bl.c | 19 ++++++------------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/drivers/mfd/lm3533-core.c b/drivers/mfd/lm3533-core.c index 45e7f7481aa0..e3efc9f6f348 100644 --- a/drivers/mfd/lm3533-core.c +++ b/drivers/mfd/lm3533-core.c @@ -416,7 +416,7 @@ static int lm3533_device_init(struct lm3533 *lm3533) lm3533_device_bl_init(lm3533); lm3533_device_led_init(lm3533); - ret = sysfs_create_group(&lm3533->dev->kobj, &lm3533_attribute_group); + ret = device_add_group(lm3533->dev, &lm3533_attribute_group); if (ret < 0) { dev_err(lm3533->dev, "failed to create sysfs attributes\n"); goto err_unregister; @@ -436,7 +436,7 @@ static void lm3533_device_exit(struct lm3533 *lm3533) { dev_dbg(lm3533->dev, "%s\n", __func__); - sysfs_remove_group(&lm3533->dev->kobj, &lm3533_attribute_group); + device_remove_group(lm3533->dev, &lm3533_attribute_group); mfd_remove_devices(lm3533->dev); lm3533_disable(lm3533); diff --git a/drivers/video/backlight/lm3533_bl.c b/drivers/video/backlight/lm3533_bl.c index 39f438114c48..b4363a30b2c8 100644 --- a/drivers/video/backlight/lm3533_bl.c +++ b/drivers/video/backlight/lm3533_bl.c @@ -304,28 +304,22 @@ static int lm3533_bl_probe(struct platform_device *pdev) platform_set_drvdata(pdev, bl); - ret = sysfs_create_group(&bd->dev.kobj, &lm3533_bl_attribute_group); - if (ret < 0) { - dev_err(&pdev->dev, "failed to create sysfs attributes\n"); - return ret; - } + ret = devm_device_add_group(&bd->dev, &lm3533_bl_attribute_group); + if (ret < 0) + return dev_err_probe(&pdev->dev, ret, + "failed to create sysfs attributes\n"); backlight_update_status(bd); ret = lm3533_bl_setup(bl, pdata); if (ret) - goto err_sysfs_remove; + return ret; ret = lm3533_ctrlbank_enable(&bl->cb); if (ret) - goto err_sysfs_remove; + return ret; return 0; - -err_sysfs_remove: - sysfs_remove_group(&bd->dev.kobj, &lm3533_bl_attribute_group); - - return ret; } static void lm3533_bl_remove(struct platform_device *pdev) @@ -339,7 +333,6 @@ static void lm3533_bl_remove(struct platform_device *pdev) bd->props.brightness = 0; lm3533_ctrlbank_disable(&bl->cb); - sysfs_remove_group(&bd->dev.kobj, &lm3533_bl_attribute_group); } #ifdef CONFIG_PM_SLEEP -- 2.53.0
