|
@@ -186,7 +186,7 @@ static int wm831x_backlight_probe(struct platform_device *pdev)
|
|
if (ret < 0)
|
|
if (ret < 0)
|
|
return ret;
|
|
return ret;
|
|
|
|
|
|
- data = kzalloc(sizeof(*data), GFP_KERNEL);
|
|
|
|
|
|
+ data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
|
|
if (data == NULL)
|
|
if (data == NULL)
|
|
return -ENOMEM;
|
|
return -ENOMEM;
|
|
|
|
|
|
@@ -200,7 +200,6 @@ static int wm831x_backlight_probe(struct platform_device *pdev)
|
|
&wm831x_backlight_ops, &props);
|
|
&wm831x_backlight_ops, &props);
|
|
if (IS_ERR(bl)) {
|
|
if (IS_ERR(bl)) {
|
|
dev_err(&pdev->dev, "failed to register backlight\n");
|
|
dev_err(&pdev->dev, "failed to register backlight\n");
|
|
- kfree(data);
|
|
|
|
return PTR_ERR(bl);
|
|
return PTR_ERR(bl);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -211,7 +210,6 @@ static int wm831x_backlight_probe(struct platform_device *pdev)
|
|
/* Disable the DCDC if it was started so we can bootstrap */
|
|
/* Disable the DCDC if it was started so we can bootstrap */
|
|
wm831x_set_bits(wm831x, WM831X_DCDC_ENABLE, WM831X_DC4_ENA, 0);
|
|
wm831x_set_bits(wm831x, WM831X_DCDC_ENABLE, WM831X_DC4_ENA, 0);
|
|
|
|
|
|
-
|
|
|
|
backlight_update_status(bl);
|
|
backlight_update_status(bl);
|
|
|
|
|
|
return 0;
|
|
return 0;
|
|
@@ -220,10 +218,8 @@ static int wm831x_backlight_probe(struct platform_device *pdev)
|
|
static int wm831x_backlight_remove(struct platform_device *pdev)
|
|
static int wm831x_backlight_remove(struct platform_device *pdev)
|
|
{
|
|
{
|
|
struct backlight_device *bl = platform_get_drvdata(pdev);
|
|
struct backlight_device *bl = platform_get_drvdata(pdev);
|
|
- struct wm831x_backlight_data *data = bl_get_data(bl);
|
|
|
|
|
|
|
|
backlight_device_unregister(bl);
|
|
backlight_device_unregister(bl);
|
|
- kfree(data);
|
|
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|