* [PATCH 02/22] backlight: aat2870: use devm_backlight_device_register()
2013-09-24 9:04 [PATCH 01/22] backlight: 88pm860x_bl: use devm_backlight_device_register() Jingoo Han
@ 2013-09-24 9:05 ` Jingoo Han
2013-09-24 9:06 ` [PATCH 03/22] backlight: adp5520: " Jingoo Han
` (19 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Jingoo Han @ 2013-09-24 9:05 UTC (permalink / raw)
To: 'Andrew Morton'
Cc: linux-kernel, 'Richard Purdie', 'Jingoo Han'
Use devm_backlight_device_register() to make cleanup paths simpler.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/video/backlight/aat2870_bl.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/drivers/video/backlight/aat2870_bl.c b/drivers/video/backlight/aat2870_bl.c
index c68232b..ee0c0a9 100644
--- a/drivers/video/backlight/aat2870_bl.c
+++ b/drivers/video/backlight/aat2870_bl.c
@@ -158,8 +158,9 @@ static int aat2870_bl_probe(struct platform_device *pdev)
memset(&props, 0, sizeof(struct backlight_properties));
props.type = BACKLIGHT_RAW;
- bd = backlight_device_register("aat2870-backlight", &pdev->dev,
- aat2870_bl, &aat2870_bl_ops, &props);
+ bd = devm_backlight_device_register(&pdev->dev, "aat2870-backlight",
+ &pdev->dev, aat2870_bl, &aat2870_bl_ops,
+ &props);
if (IS_ERR(bd)) {
dev_err(&pdev->dev,
"Failed allocate memory for backlight device\n");
@@ -194,13 +195,11 @@ static int aat2870_bl_probe(struct platform_device *pdev)
ret = aat2870_bl_update_status(bd);
if (ret < 0) {
dev_err(&pdev->dev, "Failed to initialize\n");
- goto out_bl_dev_unregister;
+ return ret;
}
return 0;
-out_bl_dev_unregister:
- backlight_device_unregister(bd);
out:
return ret;
}
@@ -214,8 +213,6 @@ static int aat2870_bl_remove(struct platform_device *pdev)
bd->props.brightness = 0;
backlight_update_status(bd);
- backlight_device_unregister(bd);
-
return 0;
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 03/22] backlight: adp5520: use devm_backlight_device_register()
2013-09-24 9:04 [PATCH 01/22] backlight: 88pm860x_bl: use devm_backlight_device_register() Jingoo Han
2013-09-24 9:05 ` [PATCH 02/22] backlight: aat2870: " Jingoo Han
@ 2013-09-24 9:06 ` Jingoo Han
2013-09-24 9:07 ` [PATCH 04/22] backlight: adp8860: " Jingoo Han
` (18 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Jingoo Han @ 2013-09-24 9:06 UTC (permalink / raw)
To: 'Andrew Morton'
Cc: linux-kernel, 'Richard Purdie', 'Jingoo Han',
'Michael Hennerich'
Use devm_backlight_device_register() to make cleanup paths simpler.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/video/backlight/adp5520_bl.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/video/backlight/adp5520_bl.c b/drivers/video/backlight/adp5520_bl.c
index fe8e3d1..f37097a 100644
--- a/drivers/video/backlight/adp5520_bl.c
+++ b/drivers/video/backlight/adp5520_bl.c
@@ -312,8 +312,9 @@ static int adp5520_bl_probe(struct platform_device *pdev)
memset(&props, 0, sizeof(struct backlight_properties));
props.type = BACKLIGHT_RAW;
props.max_brightness = ADP5020_MAX_BRIGHTNESS;
- bl = backlight_device_register(pdev->name, data->master, data,
- &adp5520_bl_ops, &props);
+ bl = devm_backlight_device_register(&pdev->dev, pdev->name,
+ data->master, data, &adp5520_bl_ops,
+ &props);
if (IS_ERR(bl)) {
dev_err(&pdev->dev, "failed to register backlight\n");
return PTR_ERR(bl);
@@ -326,7 +327,7 @@ static int adp5520_bl_probe(struct platform_device *pdev)
if (ret) {
dev_err(&pdev->dev, "failed to register sysfs\n");
- backlight_device_unregister(bl);
+ return ret;
}
platform_set_drvdata(pdev, bl);
@@ -347,8 +348,6 @@ static int adp5520_bl_remove(struct platform_device *pdev)
sysfs_remove_group(&bl->dev.kobj,
&adp5520_bl_attr_group);
- backlight_device_unregister(bl);
-
return 0;
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 04/22] backlight: adp8860: use devm_backlight_device_register()
2013-09-24 9:04 [PATCH 01/22] backlight: 88pm860x_bl: use devm_backlight_device_register() Jingoo Han
2013-09-24 9:05 ` [PATCH 02/22] backlight: aat2870: " Jingoo Han
2013-09-24 9:06 ` [PATCH 03/22] backlight: adp5520: " Jingoo Han
@ 2013-09-24 9:07 ` Jingoo Han
2013-09-24 9:07 ` [PATCH 05/22] backlight: adp8870: " Jingoo Han
` (17 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Jingoo Han @ 2013-09-24 9:07 UTC (permalink / raw)
To: 'Andrew Morton'
Cc: linux-kernel, 'Richard Purdie', 'Jingoo Han',
'Michael Hennerich'
Use devm_backlight_device_register() to make cleanup paths simpler.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/video/backlight/adp8860_bl.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/drivers/video/backlight/adp8860_bl.c b/drivers/video/backlight/adp8860_bl.c
index 2f77f37..9d65671 100644
--- a/drivers/video/backlight/adp8860_bl.c
+++ b/drivers/video/backlight/adp8860_bl.c
@@ -711,8 +711,9 @@ static int adp8860_probe(struct i2c_client *client,
mutex_init(&data->lock);
- bl = backlight_device_register(dev_driver_string(&client->dev),
- &client->dev, data, &adp8860_bl_ops, &props);
+ bl = devm_backlight_device_register(&client->dev,
+ dev_driver_string(&client->dev),
+ &client->dev, data, &adp8860_bl_ops, &props);
if (IS_ERR(bl)) {
dev_err(&client->dev, "failed to register backlight\n");
return PTR_ERR(bl);
@@ -728,7 +729,7 @@ static int adp8860_probe(struct i2c_client *client,
if (ret) {
dev_err(&client->dev, "failed to register sysfs\n");
- goto out1;
+ return ret;
}
ret = adp8860_bl_setup(bl);
@@ -751,8 +752,6 @@ out:
if (data->en_ambl_sens)
sysfs_remove_group(&data->bl->dev.kobj,
&adp8860_bl_attr_group);
-out1:
- backlight_device_unregister(bl);
return ret;
}
@@ -770,8 +769,6 @@ static int adp8860_remove(struct i2c_client *client)
sysfs_remove_group(&data->bl->dev.kobj,
&adp8860_bl_attr_group);
- backlight_device_unregister(data->bl);
-
return 0;
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 05/22] backlight: adp8870: use devm_backlight_device_register()
2013-09-24 9:04 [PATCH 01/22] backlight: 88pm860x_bl: use devm_backlight_device_register() Jingoo Han
` (2 preceding siblings ...)
2013-09-24 9:07 ` [PATCH 04/22] backlight: adp8860: " Jingoo Han
@ 2013-09-24 9:07 ` Jingoo Han
2013-09-24 9:09 ` [PATCH 06/22] backlight: as3711_bl: " Jingoo Han
` (16 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Jingoo Han @ 2013-09-24 9:07 UTC (permalink / raw)
To: 'Andrew Morton'
Cc: linux-kernel, 'Richard Purdie', 'Jingoo Han'
Use devm_backlight_device_register() to make cleanup paths simpler.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/video/backlight/adp8870_bl.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/drivers/video/backlight/adp8870_bl.c b/drivers/video/backlight/adp8870_bl.c
index 9eee69f..6370720 100644
--- a/drivers/video/backlight/adp8870_bl.c
+++ b/drivers/video/backlight/adp8870_bl.c
@@ -888,8 +888,9 @@ static int adp8870_probe(struct i2c_client *client,
memset(&props, 0, sizeof(props));
props.type = BACKLIGHT_RAW;
props.max_brightness = props.brightness = ADP8870_MAX_BRIGHTNESS;
- bl = backlight_device_register(dev_driver_string(&client->dev),
- &client->dev, data, &adp8870_bl_ops, &props);
+ bl = devm_backlight_device_register(&client->dev,
+ dev_driver_string(&client->dev),
+ &client->dev, data, &adp8870_bl_ops, &props);
if (IS_ERR(bl)) {
dev_err(&client->dev, "failed to register backlight\n");
return PTR_ERR(bl);
@@ -902,7 +903,7 @@ static int adp8870_probe(struct i2c_client *client,
&adp8870_bl_attr_group);
if (ret) {
dev_err(&client->dev, "failed to register sysfs\n");
- goto out1;
+ return ret;
}
}
@@ -925,8 +926,6 @@ out:
if (data->pdata->en_ambl_sens)
sysfs_remove_group(&data->bl->dev.kobj,
&adp8870_bl_attr_group);
-out1:
- backlight_device_unregister(bl);
return ret;
}
@@ -944,8 +943,6 @@ static int adp8870_remove(struct i2c_client *client)
sysfs_remove_group(&data->bl->dev.kobj,
&adp8870_bl_attr_group);
- backlight_device_unregister(data->bl);
-
return 0;
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 06/22] backlight: as3711_bl: use devm_backlight_device_register()
2013-09-24 9:04 [PATCH 01/22] backlight: 88pm860x_bl: use devm_backlight_device_register() Jingoo Han
` (3 preceding siblings ...)
2013-09-24 9:07 ` [PATCH 05/22] backlight: adp8870: " Jingoo Han
@ 2013-09-24 9:09 ` Jingoo Han
2013-09-24 9:09 ` [PATCH 07/22] backlight: atmel-pwm-bl: " Jingoo Han
` (15 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Jingoo Han @ 2013-09-24 9:09 UTC (permalink / raw)
To: 'Andrew Morton'
Cc: linux-kernel, 'Richard Purdie', 'Jingoo Han'
Use devm_backlight_device_register() to make cleanup paths simpler,
and remove unnecessary remove().
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/video/backlight/as3711_bl.c | 26 +++++---------------------
1 file changed, 5 insertions(+), 21 deletions(-)
diff --git a/drivers/video/backlight/as3711_bl.c b/drivers/video/backlight/as3711_bl.c
index 123887c..bb1fc45 100644
--- a/drivers/video/backlight/as3711_bl.c
+++ b/drivers/video/backlight/as3711_bl.c
@@ -240,7 +240,8 @@ static int as3711_bl_register(struct platform_device *pdev,
/* max tuning I = 31uA for voltage- and 38250uA for current-feedback */
props.max_brightness = max_brightness;
- bl = backlight_device_register(su->type == AS3711_BL_SU1 ?
+ bl = devm_backlight_device_register(&pdev->dev,
+ su->type == AS3711_BL_SU1 ?
"as3711-su1" : "as3711-su2",
&pdev->dev, su,
&as3711_bl_ops, &props);
@@ -432,8 +433,7 @@ static int as3711_backlight_probe(struct platform_device *pdev)
case AS3711_SU2_LX_SD4:
break;
default:
- ret = -EINVAL;
- goto esu2;
+ return -EINVAL;
}
switch (pdata->su2_feedback) {
@@ -447,8 +447,7 @@ static int as3711_backlight_probe(struct platform_device *pdev)
max_brightness = min(pdata->su2_max_uA / 150, 255);
break;
default:
- ret = -EINVAL;
- goto esu2;
+ return -EINVAL;
}
ret = as3711_bl_init_su2(supply);
@@ -457,26 +456,12 @@ static int as3711_backlight_probe(struct platform_device *pdev)
ret = as3711_bl_register(pdev, max_brightness, su);
if (ret < 0)
- goto esu2;
+ return ret;
}
platform_set_drvdata(pdev, supply);
return 0;
-
-esu2:
- backlight_device_unregister(supply->su1.bl);
- return ret;
-}
-
-static int as3711_backlight_remove(struct platform_device *pdev)
-{
- struct as3711_bl_supply *supply = platform_get_drvdata(pdev);
-
- backlight_device_unregister(supply->su1.bl);
- backlight_device_unregister(supply->su2.bl);
-
- return 0;
}
static struct platform_driver as3711_backlight_driver = {
@@ -485,7 +470,6 @@ static struct platform_driver as3711_backlight_driver = {
.owner = THIS_MODULE,
},
.probe = as3711_backlight_probe,
- .remove = as3711_backlight_remove,
};
module_platform_driver(as3711_backlight_driver);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 07/22] backlight: atmel-pwm-bl: use devm_backlight_device_register()
2013-09-24 9:04 [PATCH 01/22] backlight: 88pm860x_bl: use devm_backlight_device_register() Jingoo Han
` (4 preceding siblings ...)
2013-09-24 9:09 ` [PATCH 06/22] backlight: as3711_bl: " Jingoo Han
@ 2013-09-24 9:09 ` Jingoo Han
2013-09-24 9:10 ` [PATCH 08/22] backlight: bd6107: " Jingoo Han
` (14 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Jingoo Han @ 2013-09-24 9:09 UTC (permalink / raw)
To: 'Andrew Morton'
Cc: linux-kernel, 'Richard Purdie', 'Jingoo Han'
Use devm_backlight_device_register() to make cleanup paths simpler.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/video/backlight/atmel-pwm-bl.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/video/backlight/atmel-pwm-bl.c b/drivers/video/backlight/atmel-pwm-bl.c
index 8900da7..8993c24 100644
--- a/drivers/video/backlight/atmel-pwm-bl.c
+++ b/drivers/video/backlight/atmel-pwm-bl.c
@@ -171,8 +171,9 @@ static int __init atmel_pwm_bl_probe(struct platform_device *pdev)
memset(&props, 0, sizeof(struct backlight_properties));
props.type = BACKLIGHT_RAW;
props.max_brightness = pdata->pwm_duty_max - pdata->pwm_duty_min;
- bldev = backlight_device_register("atmel-pwm-bl", &pdev->dev, pwmbl,
- &atmel_pwm_bl_ops, &props);
+ bldev = devm_backlight_device_register(&pdev->dev, "atmel-pwm-bl",
+ &pdev->dev, pwmbl, &atmel_pwm_bl_ops,
+ &props);
if (IS_ERR(bldev)) {
retval = PTR_ERR(bldev);
goto err_free_pwm;
@@ -188,14 +189,12 @@ static int __init atmel_pwm_bl_probe(struct platform_device *pdev)
retval = atmel_pwm_bl_init_pwm(pwmbl);
if (retval)
- goto err_free_bl_dev;
+ goto err_free_pwm;
atmel_pwm_bl_set_intensity(bldev);
return 0;
-err_free_bl_dev:
- backlight_device_unregister(bldev);
err_free_pwm:
pwm_channel_free(&pwmbl->pwmc);
err_free_mem:
@@ -210,7 +209,6 @@ static int __exit atmel_pwm_bl_remove(struct platform_device *pdev)
gpio_set_value(pwmbl->gpio_on, 0);
pwm_channel_disable(&pwmbl->pwmc);
pwm_channel_free(&pwmbl->pwmc);
- backlight_device_unregister(pwmbl->bldev);
return 0;
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 08/22] backlight: bd6107: use devm_backlight_device_register()
2013-09-24 9:04 [PATCH 01/22] backlight: 88pm860x_bl: use devm_backlight_device_register() Jingoo Han
` (5 preceding siblings ...)
2013-09-24 9:09 ` [PATCH 07/22] backlight: atmel-pwm-bl: " Jingoo Han
@ 2013-09-24 9:10 ` Jingoo Han
2013-09-24 9:11 ` [PATCH 09/22] backlight: da903x_bl: " Jingoo Han
` (13 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Jingoo Han @ 2013-09-24 9:10 UTC (permalink / raw)
To: 'Andrew Morton'
Cc: linux-kernel, 'Richard Purdie', 'Jingoo Han'
Use devm_backlight_device_register() to make cleanup paths simpler.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/video/backlight/bd6107.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/video/backlight/bd6107.c b/drivers/video/backlight/bd6107.c
index 43c434e..16dd9bc 100644
--- a/drivers/video/backlight/bd6107.c
+++ b/drivers/video/backlight/bd6107.c
@@ -166,7 +166,8 @@ static int bd6107_probe(struct i2c_client *client,
props.brightness = clamp_t(unsigned int, pdata->def_value, 0,
props.max_brightness);
- backlight = backlight_device_register(dev_name(&client->dev),
+ backlight = devm_backlight_device_register(&client->dev,
+ dev_name(&client->dev),
&bd->client->dev, bd,
&bd6107_backlight_ops, &props);
if (IS_ERR(backlight)) {
@@ -186,7 +187,6 @@ static int bd6107_remove(struct i2c_client *client)
backlight->props.brightness = 0;
backlight_update_status(backlight);
- backlight_device_unregister(backlight);
return 0;
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 09/22] backlight: da903x_bl: use devm_backlight_device_register()
2013-09-24 9:04 [PATCH 01/22] backlight: 88pm860x_bl: use devm_backlight_device_register() Jingoo Han
` (6 preceding siblings ...)
2013-09-24 9:10 ` [PATCH 08/22] backlight: bd6107: " Jingoo Han
@ 2013-09-24 9:11 ` Jingoo Han
2013-09-24 9:13 ` [PATCH 10/22] backlight: da9052_bl: " Jingoo Han
` (12 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Jingoo Han @ 2013-09-24 9:11 UTC (permalink / raw)
To: 'Andrew Morton'
Cc: linux-kernel, 'Richard Purdie', 'Jingoo Han'
Use devm_backlight_device_register() to make cleanup paths simpler,
and remove unnecessary remove().
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/video/backlight/da903x_bl.c | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/drivers/video/backlight/da903x_bl.c b/drivers/video/backlight/da903x_bl.c
index bbad5c2..12c5d84 100644
--- a/drivers/video/backlight/da903x_bl.c
+++ b/drivers/video/backlight/da903x_bl.c
@@ -144,8 +144,9 @@ static int da903x_backlight_probe(struct platform_device *pdev)
memset(&props, 0, sizeof(props));
props.type = BACKLIGHT_RAW;
props.max_brightness = max_brightness;
- bl = backlight_device_register(pdev->name, data->da903x_dev, data,
- &da903x_backlight_ops, &props);
+ bl = devm_backlight_device_register(&pdev->dev, pdev->name,
+ data->da903x_dev, data,
+ &da903x_backlight_ops, &props);
if (IS_ERR(bl)) {
dev_err(&pdev->dev, "failed to register backlight\n");
return PTR_ERR(bl);
@@ -158,21 +159,12 @@ static int da903x_backlight_probe(struct platform_device *pdev)
return 0;
}
-static int da903x_backlight_remove(struct platform_device *pdev)
-{
- struct backlight_device *bl = platform_get_drvdata(pdev);
-
- backlight_device_unregister(bl);
- return 0;
-}
-
static struct platform_driver da903x_backlight_driver = {
.driver = {
.name = "da903x-backlight",
.owner = THIS_MODULE,
},
.probe = da903x_backlight_probe,
- .remove = da903x_backlight_remove,
};
module_platform_driver(da903x_backlight_driver);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 10/22] backlight: da9052_bl: use devm_backlight_device_register()
2013-09-24 9:04 [PATCH 01/22] backlight: 88pm860x_bl: use devm_backlight_device_register() Jingoo Han
` (7 preceding siblings ...)
2013-09-24 9:11 ` [PATCH 09/22] backlight: da903x_bl: " Jingoo Han
@ 2013-09-24 9:13 ` Jingoo Han
2013-09-24 9:14 ` [PATCH 11/22] backlight: ep93xx: " Jingoo Han
` (11 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Jingoo Han @ 2013-09-24 9:13 UTC (permalink / raw)
To: 'Andrew Morton'
Cc: linux-kernel, 'Richard Purdie', 'Jingoo Han'
Use devm_backlight_device_register() to make cleanup paths simpler.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/video/backlight/da9052_bl.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/video/backlight/da9052_bl.c b/drivers/video/backlight/da9052_bl.c
index 842da5a..20d55be 100644
--- a/drivers/video/backlight/da9052_bl.c
+++ b/drivers/video/backlight/da9052_bl.c
@@ -125,8 +125,9 @@ static int da9052_backlight_probe(struct platform_device *pdev)
props.type = BACKLIGHT_RAW;
props.max_brightness = DA9052_MAX_BRIGHTNESS;
- bl = backlight_device_register(pdev->name, wleds->da9052->dev, wleds,
- &da9052_backlight_ops, &props);
+ bl = devm_backlight_device_register(&pdev->dev, pdev->name,
+ wleds->da9052->dev, wleds,
+ &da9052_backlight_ops, &props);
if (IS_ERR(bl)) {
dev_err(&pdev->dev, "Failed to register backlight\n");
return PTR_ERR(bl);
@@ -147,7 +148,6 @@ static int da9052_backlight_remove(struct platform_device *pdev)
wleds->brightness = 0;
wleds->state = DA9052_WLEDS_OFF;
da9052_adjust_wled_brightness(wleds);
- backlight_device_unregister(bl);
return 0;
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 11/22] backlight: ep93xx: use devm_backlight_device_register()
2013-09-24 9:04 [PATCH 01/22] backlight: 88pm860x_bl: use devm_backlight_device_register() Jingoo Han
` (8 preceding siblings ...)
2013-09-24 9:13 ` [PATCH 10/22] backlight: da9052_bl: " Jingoo Han
@ 2013-09-24 9:14 ` Jingoo Han
2013-09-24 9:14 ` [PATCH 12/22] backlight: generic_bl: " Jingoo Han
` (10 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Jingoo Han @ 2013-09-24 9:14 UTC (permalink / raw)
To: 'Andrew Morton'
Cc: linux-kernel, 'Richard Purdie', 'Jingoo Han'
Use devm_backlight_device_register() to make cleanup paths simpler,
and remove unnecessary remove().
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/video/backlight/ep93xx_bl.c | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/drivers/video/backlight/ep93xx_bl.c b/drivers/video/backlight/ep93xx_bl.c
index 018368b..0d1f633 100644
--- a/drivers/video/backlight/ep93xx_bl.c
+++ b/drivers/video/backlight/ep93xx_bl.c
@@ -92,8 +92,8 @@ static int ep93xxbl_probe(struct platform_device *dev)
memset(&props, 0, sizeof(struct backlight_properties));
props.type = BACKLIGHT_RAW;
props.max_brightness = EP93XX_MAX_BRIGHT;
- bl = backlight_device_register(dev->name, &dev->dev, ep93xxbl,
- &ep93xxbl_ops, &props);
+ bl = devm_backlight_device_register(&dev->dev, dev->name, &dev->dev,
+ ep93xxbl, &ep93xxbl_ops, &props);
if (IS_ERR(bl))
return PTR_ERR(bl);
@@ -106,14 +106,6 @@ static int ep93xxbl_probe(struct platform_device *dev)
return 0;
}
-static int ep93xxbl_remove(struct platform_device *dev)
-{
- struct backlight_device *bl = platform_get_drvdata(dev);
-
- backlight_device_unregister(bl);
- return 0;
-}
-
#ifdef CONFIG_PM_SLEEP
static int ep93xxbl_suspend(struct device *dev)
{
@@ -140,7 +132,6 @@ static struct platform_driver ep93xxbl_driver = {
.pm = &ep93xxbl_pm_ops,
},
.probe = ep93xxbl_probe,
- .remove = ep93xxbl_remove,
};
module_platform_driver(ep93xxbl_driver);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 12/22] backlight: generic_bl: use devm_backlight_device_register()
2013-09-24 9:04 [PATCH 01/22] backlight: 88pm860x_bl: use devm_backlight_device_register() Jingoo Han
` (9 preceding siblings ...)
2013-09-24 9:14 ` [PATCH 11/22] backlight: ep93xx: " Jingoo Han
@ 2013-09-24 9:14 ` Jingoo Han
2013-09-24 9:15 ` [PATCH 13/22] backlight: gpio_backlight: " Jingoo Han
` (9 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Jingoo Han @ 2013-09-24 9:14 UTC (permalink / raw)
To: 'Andrew Morton'
Cc: linux-kernel, 'Richard Purdie', 'Jingoo Han'
Use devm_backlight_device_register() to make cleanup paths simpler.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/video/backlight/generic_bl.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/video/backlight/generic_bl.c b/drivers/video/backlight/generic_bl.c
index 48fa914..5d8d652 100644
--- a/drivers/video/backlight/generic_bl.c
+++ b/drivers/video/backlight/generic_bl.c
@@ -93,8 +93,8 @@ static int genericbl_probe(struct platform_device *pdev)
memset(&props, 0, sizeof(struct backlight_properties));
props.type = BACKLIGHT_RAW;
props.max_brightness = machinfo->max_intensity;
- bd = backlight_device_register(name, &pdev->dev, NULL, &genericbl_ops,
- &props);
+ bd = devm_backlight_device_register(&pdev->dev, name, &pdev->dev,
+ NULL, &genericbl_ops, &props);
if (IS_ERR(bd))
return PTR_ERR(bd);
@@ -118,8 +118,6 @@ static int genericbl_remove(struct platform_device *pdev)
bd->props.brightness = 0;
backlight_update_status(bd);
- backlight_device_unregister(bd);
-
dev_info(&pdev->dev, "Generic Backlight Driver Unloaded\n");
return 0;
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 13/22] backlight: gpio_backlight: use devm_backlight_device_register()
2013-09-24 9:04 [PATCH 01/22] backlight: 88pm860x_bl: use devm_backlight_device_register() Jingoo Han
` (10 preceding siblings ...)
2013-09-24 9:14 ` [PATCH 12/22] backlight: generic_bl: " Jingoo Han
@ 2013-09-24 9:15 ` Jingoo Han
2013-09-24 9:16 ` [PATCH 14/22] backlight: kb3886_bl: " Jingoo Han
` (8 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Jingoo Han @ 2013-09-24 9:15 UTC (permalink / raw)
To: 'Andrew Morton'
Cc: linux-kernel, 'Richard Purdie', 'Jingoo Han'
Use devm_backlight_device_register() to make cleanup paths simpler,
and remove unnecessary remove().
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/video/backlight/gpio_backlight.c | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/drivers/video/backlight/gpio_backlight.c b/drivers/video/backlight/gpio_backlight.c
index 118da0c..81fb127 100644
--- a/drivers/video/backlight/gpio_backlight.c
+++ b/drivers/video/backlight/gpio_backlight.c
@@ -95,8 +95,9 @@ static int gpio_backlight_probe(struct platform_device *pdev)
memset(&props, 0, sizeof(props));
props.type = BACKLIGHT_RAW;
props.max_brightness = 1;
- bl = backlight_device_register(dev_name(&pdev->dev), &pdev->dev, gbl,
- &gpio_backlight_ops, &props);
+ bl = devm_backlight_device_register(&pdev->dev, dev_name(&pdev->dev),
+ &pdev->dev, gbl, &gpio_backlight_ops,
+ &props);
if (IS_ERR(bl)) {
dev_err(&pdev->dev, "failed to register backlight\n");
return PTR_ERR(bl);
@@ -109,21 +110,12 @@ static int gpio_backlight_probe(struct platform_device *pdev)
return 0;
}
-static int gpio_backlight_remove(struct platform_device *pdev)
-{
- struct backlight_device *bl = platform_get_drvdata(pdev);
-
- backlight_device_unregister(bl);
- return 0;
-}
-
static struct platform_driver gpio_backlight_driver = {
.driver = {
.name = "gpio-backlight",
.owner = THIS_MODULE,
},
.probe = gpio_backlight_probe,
- .remove = gpio_backlight_remove,
};
module_platform_driver(gpio_backlight_driver);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 14/22] backlight: kb3886_bl: use devm_backlight_device_register()
2013-09-24 9:04 [PATCH 01/22] backlight: 88pm860x_bl: use devm_backlight_device_register() Jingoo Han
` (11 preceding siblings ...)
2013-09-24 9:15 ` [PATCH 13/22] backlight: gpio_backlight: " Jingoo Han
@ 2013-09-24 9:16 ` Jingoo Han
2013-09-24 9:16 ` [PATCH 15/22] backlight: lm3533_bl: " Jingoo Han
` (7 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Jingoo Han @ 2013-09-24 9:16 UTC (permalink / raw)
To: 'Andrew Morton'
Cc: linux-kernel, 'Richard Purdie', 'Jingoo Han'
Use devm_backlight_device_register() to make cleanup paths simpler,
and remove unnecessary remove().
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/video/backlight/kb3886_bl.c | 18 ++++--------------
1 file changed, 4 insertions(+), 14 deletions(-)
diff --git a/drivers/video/backlight/kb3886_bl.c b/drivers/video/backlight/kb3886_bl.c
index 5bacabb..7592cc2 100644
--- a/drivers/video/backlight/kb3886_bl.c
+++ b/drivers/video/backlight/kb3886_bl.c
@@ -150,10 +150,10 @@ static int kb3886bl_probe(struct platform_device *pdev)
memset(&props, 0, sizeof(struct backlight_properties));
props.type = BACKLIGHT_RAW;
props.max_brightness = machinfo->max_intensity;
- kb3886_backlight_device = backlight_device_register("kb3886-bl",
- &pdev->dev, NULL,
- &kb3886bl_ops,
- &props);
+ kb3886_backlight_device = devm_backlight_device_register(&pdev->dev,
+ "kb3886-bl", &pdev->dev,
+ NULL, &kb3886bl_ops,
+ &props);
if (IS_ERR(kb3886_backlight_device))
return PTR_ERR(kb3886_backlight_device);
@@ -166,18 +166,8 @@ static int kb3886bl_probe(struct platform_device *pdev)
return 0;
}
-static int kb3886bl_remove(struct platform_device *pdev)
-{
- struct backlight_device *bd = platform_get_drvdata(pdev);
-
- backlight_device_unregister(bd);
-
- return 0;
-}
-
static struct platform_driver kb3886bl_driver = {
.probe = kb3886bl_probe,
- .remove = kb3886bl_remove,
.driver = {
.name = "kb3886-bl",
.pm = &kb3886bl_pm_ops,
--
1.7.10.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 15/22] backlight: lm3533_bl: use devm_backlight_device_register()
2013-09-24 9:04 [PATCH 01/22] backlight: 88pm860x_bl: use devm_backlight_device_register() Jingoo Han
` (12 preceding siblings ...)
2013-09-24 9:16 ` [PATCH 14/22] backlight: kb3886_bl: " Jingoo Han
@ 2013-09-24 9:16 ` Jingoo Han
2013-09-24 9:17 ` [PATCH 16/22] backlight: lp855x: " Jingoo Han
` (6 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Jingoo Han @ 2013-09-24 9:16 UTC (permalink / raw)
To: 'Andrew Morton'
Cc: linux-kernel, 'Richard Purdie', 'Jingoo Han'
Use devm_backlight_device_register() to make cleanup paths simpler.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/video/backlight/lm3533_bl.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/video/backlight/lm3533_bl.c b/drivers/video/backlight/lm3533_bl.c
index 93eea65..187d1c2 100644
--- a/drivers/video/backlight/lm3533_bl.c
+++ b/drivers/video/backlight/lm3533_bl.c
@@ -313,8 +313,9 @@ static int lm3533_bl_probe(struct platform_device *pdev)
props.type = BACKLIGHT_RAW;
props.max_brightness = LM3533_BL_MAX_BRIGHTNESS;
props.brightness = pdata->default_brightness;
- bd = backlight_device_register(pdata->name, pdev->dev.parent, bl,
- &lm3533_bl_ops, &props);
+ bd = devm_backlight_device_register(&pdev->dev, pdata->name,
+ pdev->dev.parent, bl, &lm3533_bl_ops,
+ &props);
if (IS_ERR(bd)) {
dev_err(&pdev->dev, "failed to register backlight device\n");
return PTR_ERR(bd);
@@ -328,7 +329,7 @@ static int lm3533_bl_probe(struct platform_device *pdev)
ret = sysfs_create_group(&bd->dev.kobj, &lm3533_bl_attribute_group);
if (ret < 0) {
dev_err(&pdev->dev, "failed to create sysfs attributes\n");
- goto err_unregister;
+ return ret;
}
backlight_update_status(bd);
@@ -345,8 +346,6 @@ static int lm3533_bl_probe(struct platform_device *pdev)
err_sysfs_remove:
sysfs_remove_group(&bd->dev.kobj, &lm3533_bl_attribute_group);
-err_unregister:
- backlight_device_unregister(bd);
return ret;
}
@@ -363,7 +362,6 @@ static int lm3533_bl_remove(struct platform_device *pdev)
lm3533_ctrlbank_disable(&bl->cb);
sysfs_remove_group(&bd->dev.kobj, &lm3533_bl_attribute_group);
- backlight_device_unregister(bd);
return 0;
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 16/22] backlight: lp855x: use devm_backlight_device_register()
2013-09-24 9:04 [PATCH 01/22] backlight: 88pm860x_bl: use devm_backlight_device_register() Jingoo Han
` (13 preceding siblings ...)
2013-09-24 9:16 ` [PATCH 15/22] backlight: lm3533_bl: " Jingoo Han
@ 2013-09-24 9:17 ` Jingoo Han
2013-09-24 9:17 ` [PATCH 17/22] backlight: lv5207lp: " Jingoo Han
` (5 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Jingoo Han @ 2013-09-24 9:17 UTC (permalink / raw)
To: 'Andrew Morton'
Cc: linux-kernel, 'Richard Purdie', 'Jingoo Han'
Use devm_backlight_device_register() to make cleanup paths simpler.
Also, unnecessary lp855x_backlight_unregister() is removed.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/video/backlight/lp855x_bl.c | 20 ++++----------------
1 file changed, 4 insertions(+), 16 deletions(-)
diff --git a/drivers/video/backlight/lp855x_bl.c b/drivers/video/backlight/lp855x_bl.c
index 57f005a..cae80d5 100644
--- a/drivers/video/backlight/lp855x_bl.c
+++ b/drivers/video/backlight/lp855x_bl.c
@@ -300,7 +300,7 @@ static int lp855x_backlight_register(struct lp855x *lp)
props.brightness = pdata->initial_brightness;
- bl = backlight_device_register(name, lp->dev, lp,
+ bl = devm_backlight_device_register(lp->dev, name, lp->dev, lp,
&lp855x_bl_ops, &props);
if (IS_ERR(bl))
return PTR_ERR(bl);
@@ -310,12 +310,6 @@ static int lp855x_backlight_register(struct lp855x *lp)
return 0;
}
-static void lp855x_backlight_unregister(struct lp855x *lp)
-{
- if (lp->bl)
- backlight_device_unregister(lp->bl);
-}
-
static ssize_t lp855x_get_chip_id(struct device *dev,
struct device_attribute *attr, char *buf)
{
@@ -439,29 +433,24 @@ static int lp855x_probe(struct i2c_client *cl, const struct i2c_device_id *id)
ret = lp855x_configure(lp);
if (ret) {
dev_err(lp->dev, "device config err: %d", ret);
- goto err_dev;
+ return ret;
}
ret = lp855x_backlight_register(lp);
if (ret) {
dev_err(lp->dev,
"failed to register backlight. err: %d\n", ret);
- goto err_dev;
+ return ret;
}
ret = sysfs_create_group(&lp->dev->kobj, &lp855x_attr_group);
if (ret) {
dev_err(lp->dev, "failed to register sysfs. err: %d\n", ret);
- goto err_sysfs;
+ return ret;
}
backlight_update_status(lp->bl);
return 0;
-
-err_sysfs:
- lp855x_backlight_unregister(lp);
-err_dev:
- return ret;
}
static int lp855x_remove(struct i2c_client *cl)
@@ -471,7 +460,6 @@ static int lp855x_remove(struct i2c_client *cl)
lp->bl->props.brightness = 0;
backlight_update_status(lp->bl);
sysfs_remove_group(&lp->dev->kobj, &lp855x_attr_group);
- lp855x_backlight_unregister(lp);
return 0;
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 17/22] backlight: lv5207lp: use devm_backlight_device_register()
2013-09-24 9:04 [PATCH 01/22] backlight: 88pm860x_bl: use devm_backlight_device_register() Jingoo Han
` (14 preceding siblings ...)
2013-09-24 9:17 ` [PATCH 16/22] backlight: lp855x: " Jingoo Han
@ 2013-09-24 9:17 ` Jingoo Han
2013-09-24 9:18 ` [PATCH 18/22] backlight: max8925_bl: " Jingoo Han
` (4 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Jingoo Han @ 2013-09-24 9:17 UTC (permalink / raw)
To: 'Andrew Morton'
Cc: linux-kernel, 'Richard Purdie', 'Jingoo Han'
Use devm_backlight_device_register() to make cleanup paths simpler.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/video/backlight/lv5207lp.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/video/backlight/lv5207lp.c b/drivers/video/backlight/lv5207lp.c
index 8091a28..1802b2d 100644
--- a/drivers/video/backlight/lv5207lp.c
+++ b/drivers/video/backlight/lv5207lp.c
@@ -124,9 +124,9 @@ static int lv5207lp_probe(struct i2c_client *client,
props.brightness = clamp_t(unsigned int, pdata->def_value, 0,
props.max_brightness);
- backlight = backlight_device_register(dev_name(&client->dev),
- &lv->client->dev, lv,
- &lv5207lp_backlight_ops, &props);
+ backlight = devm_backlight_device_register(&client->dev,
+ dev_name(&client->dev), &lv->client->dev,
+ lv, &lv5207lp_backlight_ops, &props);
if (IS_ERR(backlight)) {
dev_err(&client->dev, "failed to register backlight\n");
return PTR_ERR(backlight);
@@ -144,7 +144,6 @@ static int lv5207lp_remove(struct i2c_client *client)
backlight->props.brightness = 0;
backlight_update_status(backlight);
- backlight_device_unregister(backlight);
return 0;
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 18/22] backlight: max8925_bl: use devm_backlight_device_register()
2013-09-24 9:04 [PATCH 01/22] backlight: 88pm860x_bl: use devm_backlight_device_register() Jingoo Han
` (15 preceding siblings ...)
2013-09-24 9:17 ` [PATCH 17/22] backlight: lv5207lp: " Jingoo Han
@ 2013-09-24 9:18 ` Jingoo Han
2013-09-24 9:18 ` [PATCH 19/22] backlight: pandora_bl: " Jingoo Han
` (3 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Jingoo Han @ 2013-09-24 9:18 UTC (permalink / raw)
To: 'Andrew Morton'
Cc: linux-kernel, 'Richard Purdie', 'Jingoo Han'
Use devm_backlight_device_register() to make cleanup paths simpler,
and remove unnecessary remove().
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/video/backlight/max8925_bl.c | 17 +++--------------
1 file changed, 3 insertions(+), 14 deletions(-)
diff --git a/drivers/video/backlight/max8925_bl.c b/drivers/video/backlight/max8925_bl.c
index 886e797..66fa08c 100644
--- a/drivers/video/backlight/max8925_bl.c
+++ b/drivers/video/backlight/max8925_bl.c
@@ -163,7 +163,8 @@ static int max8925_backlight_probe(struct platform_device *pdev)
memset(&props, 0, sizeof(struct backlight_properties));
props.type = BACKLIGHT_RAW;
props.max_brightness = MAX_BRIGHTNESS;
- bl = backlight_device_register("max8925-backlight", &pdev->dev, data,
+ bl = devm_backlight_device_register(&pdev->dev, "max8925-backlight",
+ &pdev->dev, data,
&max8925_backlight_ops, &props);
if (IS_ERR(bl)) {
dev_err(&pdev->dev, "failed to register backlight\n");
@@ -188,20 +189,9 @@ static int max8925_backlight_probe(struct platform_device *pdev)
}
ret = max8925_set_bits(chip->i2c, data->reg_mode_cntl, 0xfe, value);
if (ret < 0)
- goto out_brt;
+ return ret;
backlight_update_status(bl);
return 0;
-out_brt:
- backlight_device_unregister(bl);
- return ret;
-}
-
-static int max8925_backlight_remove(struct platform_device *pdev)
-{
- struct backlight_device *bl = platform_get_drvdata(pdev);
-
- backlight_device_unregister(bl);
- return 0;
}
static struct platform_driver max8925_backlight_driver = {
@@ -210,7 +200,6 @@ static struct platform_driver max8925_backlight_driver = {
.owner = THIS_MODULE,
},
.probe = max8925_backlight_probe,
- .remove = max8925_backlight_remove,
};
module_platform_driver(max8925_backlight_driver);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 19/22] backlight: pandora_bl: use devm_backlight_device_register()
2013-09-24 9:04 [PATCH 01/22] backlight: 88pm860x_bl: use devm_backlight_device_register() Jingoo Han
` (16 preceding siblings ...)
2013-09-24 9:18 ` [PATCH 18/22] backlight: max8925_bl: " Jingoo Han
@ 2013-09-24 9:18 ` Jingoo Han
2013-09-24 9:19 ` [PATCH 20/22] backlight: pcf50633: " Jingoo Han
` (2 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Jingoo Han @ 2013-09-24 9:18 UTC (permalink / raw)
To: 'Andrew Morton'
Cc: linux-kernel, 'Richard Purdie', 'Jingoo Han'
Use devm_backlight_device_register() to make cleanup paths simpler,
and remove unnecessary remove().
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/video/backlight/pandora_bl.c | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/drivers/video/backlight/pandora_bl.c b/drivers/video/backlight/pandora_bl.c
index 633b0a2..2098c5d 100644
--- a/drivers/video/backlight/pandora_bl.c
+++ b/drivers/video/backlight/pandora_bl.c
@@ -120,8 +120,8 @@ static int pandora_backlight_probe(struct platform_device *pdev)
memset(&props, 0, sizeof(props));
props.max_brightness = MAX_USER_VALUE;
props.type = BACKLIGHT_RAW;
- bl = backlight_device_register(pdev->name, &pdev->dev,
- NULL, &pandora_backlight_ops, &props);
+ bl = devm_backlight_device_register(&pdev->dev, pdev->name, &pdev->dev,
+ NULL, &pandora_backlight_ops, &props);
if (IS_ERR(bl)) {
dev_err(&pdev->dev, "failed to register backlight\n");
return PTR_ERR(bl);
@@ -145,20 +145,12 @@ static int pandora_backlight_probe(struct platform_device *pdev)
return 0;
}
-static int pandora_backlight_remove(struct platform_device *pdev)
-{
- struct backlight_device *bl = platform_get_drvdata(pdev);
- backlight_device_unregister(bl);
- return 0;
-}
-
static struct platform_driver pandora_backlight_driver = {
.driver = {
.name = "pandora-backlight",
.owner = THIS_MODULE,
},
.probe = pandora_backlight_probe,
- .remove = pandora_backlight_remove,
};
module_platform_driver(pandora_backlight_driver);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 20/22] backlight: pcf50633: use devm_backlight_device_register()
2013-09-24 9:04 [PATCH 01/22] backlight: 88pm860x_bl: use devm_backlight_device_register() Jingoo Han
` (17 preceding siblings ...)
2013-09-24 9:18 ` [PATCH 19/22] backlight: pandora_bl: " Jingoo Han
@ 2013-09-24 9:19 ` Jingoo Han
2013-09-24 9:20 ` [PATCH 21/22] backlight: tps65217_bl: " Jingoo Han
2013-09-24 9:20 ` [PATCH 22/22] backlight: wm831x_bl: " Jingoo Han
20 siblings, 0 replies; 22+ messages in thread
From: Jingoo Han @ 2013-09-24 9:19 UTC (permalink / raw)
To: 'Andrew Morton'
Cc: linux-kernel, 'Richard Purdie', 'Jingoo Han'
Use devm_backlight_device_register() to make cleanup paths simpler,
and remove unnecessary remove().
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/video/backlight/pcf50633-backlight.c | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/drivers/video/backlight/pcf50633-backlight.c b/drivers/video/backlight/pcf50633-backlight.c
index b2184cf..b95d3b0 100644
--- a/drivers/video/backlight/pcf50633-backlight.c
+++ b/drivers/video/backlight/pcf50633-backlight.c
@@ -126,7 +126,8 @@ static int pcf50633_bl_probe(struct platform_device *pdev)
pcf_bl->pcf = dev_to_pcf50633(pdev->dev.parent);
- pcf_bl->bl = backlight_device_register(pdev->name, &pdev->dev, pcf_bl,
+ pcf_bl->bl = devm_backlight_device_register(&pdev->dev, pdev->name,
+ &pdev->dev, pcf_bl,
&pcf50633_bl_ops, &bl_props);
if (IS_ERR(pcf_bl->bl))
@@ -147,18 +148,8 @@ static int pcf50633_bl_probe(struct platform_device *pdev)
return 0;
}
-static int pcf50633_bl_remove(struct platform_device *pdev)
-{
- struct pcf50633_bl *pcf_bl = platform_get_drvdata(pdev);
-
- backlight_device_unregister(pcf_bl->bl);
-
- return 0;
-}
-
static struct platform_driver pcf50633_bl_driver = {
.probe = pcf50633_bl_probe,
- .remove = pcf50633_bl_remove,
.driver = {
.name = "pcf50633-backlight",
},
--
1.7.10.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 21/22] backlight: tps65217_bl: use devm_backlight_device_register()
2013-09-24 9:04 [PATCH 01/22] backlight: 88pm860x_bl: use devm_backlight_device_register() Jingoo Han
` (18 preceding siblings ...)
2013-09-24 9:19 ` [PATCH 20/22] backlight: pcf50633: " Jingoo Han
@ 2013-09-24 9:20 ` Jingoo Han
2013-09-24 9:20 ` [PATCH 22/22] backlight: wm831x_bl: " Jingoo Han
20 siblings, 0 replies; 22+ messages in thread
From: Jingoo Han @ 2013-09-24 9:20 UTC (permalink / raw)
To: 'Andrew Morton'
Cc: linux-kernel, 'Richard Purdie', 'Jingoo Han'
Use devm_backlight_device_register() to make cleanup paths simpler,
and remove unnecessary remove().
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/video/backlight/tps65217_bl.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/drivers/video/backlight/tps65217_bl.c b/drivers/video/backlight/tps65217_bl.c
index 4ea2039..cbba37e 100644
--- a/drivers/video/backlight/tps65217_bl.c
+++ b/drivers/video/backlight/tps65217_bl.c
@@ -313,7 +313,7 @@ static int tps65217_bl_probe(struct platform_device *pdev)
bl_props.type = BACKLIGHT_RAW;
bl_props.max_brightness = 100;
- tps65217_bl->bl = backlight_device_register(pdev->name,
+ tps65217_bl->bl = devm_backlight_device_register(&pdev->dev, pdev->name,
tps65217_bl->dev, tps65217_bl,
&tps65217_bl_ops, &bl_props);
if (IS_ERR(tps65217_bl->bl)) {
@@ -329,18 +329,8 @@ static int tps65217_bl_probe(struct platform_device *pdev)
return 0;
}
-static int tps65217_bl_remove(struct platform_device *pdev)
-{
- struct tps65217_bl *tps65217_bl = platform_get_drvdata(pdev);
-
- backlight_device_unregister(tps65217_bl->bl);
-
- return 0;
-}
-
static struct platform_driver tps65217_bl_driver = {
.probe = tps65217_bl_probe,
- .remove = tps65217_bl_remove,
.driver = {
.owner = THIS_MODULE,
.name = "tps65217-bl",
--
1.7.10.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 22/22] backlight: wm831x_bl: use devm_backlight_device_register()
2013-09-24 9:04 [PATCH 01/22] backlight: 88pm860x_bl: use devm_backlight_device_register() Jingoo Han
` (19 preceding siblings ...)
2013-09-24 9:20 ` [PATCH 21/22] backlight: tps65217_bl: " Jingoo Han
@ 2013-09-24 9:20 ` Jingoo Han
20 siblings, 0 replies; 22+ messages in thread
From: Jingoo Han @ 2013-09-24 9:20 UTC (permalink / raw)
To: 'Andrew Morton'
Cc: linux-kernel, 'Richard Purdie', 'Jingoo Han'
Use devm_backlight_device_register() to make cleanup paths simpler,
and remove unnecessary remove().
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/video/backlight/wm831x_bl.c | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/drivers/video/backlight/wm831x_bl.c b/drivers/video/backlight/wm831x_bl.c
index 2ccf320..8b9455e 100644
--- a/drivers/video/backlight/wm831x_bl.c
+++ b/drivers/video/backlight/wm831x_bl.c
@@ -195,8 +195,8 @@ static int wm831x_backlight_probe(struct platform_device *pdev)
memset(&props, 0, sizeof(props));
props.type = BACKLIGHT_RAW;
props.max_brightness = max_isel;
- bl = backlight_device_register("wm831x", &pdev->dev, data,
- &wm831x_backlight_ops, &props);
+ bl = devm_backlight_device_register(&pdev->dev, "wm831x", &pdev->dev,
+ data, &wm831x_backlight_ops, &props);
if (IS_ERR(bl)) {
dev_err(&pdev->dev, "failed to register backlight\n");
return PTR_ERR(bl);
@@ -214,21 +214,12 @@ static int wm831x_backlight_probe(struct platform_device *pdev)
return 0;
}
-static int wm831x_backlight_remove(struct platform_device *pdev)
-{
- struct backlight_device *bl = platform_get_drvdata(pdev);
-
- backlight_device_unregister(bl);
- return 0;
-}
-
static struct platform_driver wm831x_backlight_driver = {
.driver = {
.name = "wm831x-backlight",
.owner = THIS_MODULE,
},
.probe = wm831x_backlight_probe,
- .remove = wm831x_backlight_remove,
};
module_platform_driver(wm831x_backlight_driver);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 22+ messages in thread