diff options
author | Jingoo Han <jg1.han@samsung.com> | 2014-01-23 18:54:28 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-23 19:36:56 -0500 |
commit | ffb1f6c83b273f2b7aac207ad2220c28d3cfa44a (patch) | |
tree | ee6610f43a09079a720c8a22c56a401b82cda06a | |
parent | 443956fdd501bdfa8471191ef23d1432ea5fa928 (diff) |
backlight: tosa: use devm_backlight_device_register()
Use devm_backlight_device_register() to make cleanup paths simpler.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/video/backlight/tosa_bl.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/video/backlight/tosa_bl.c b/drivers/video/backlight/tosa_bl.c index b8db9338cacd..3ad676558c80 100644 --- a/drivers/video/backlight/tosa_bl.c +++ b/drivers/video/backlight/tosa_bl.c | |||
@@ -105,8 +105,9 @@ static int tosa_bl_probe(struct i2c_client *client, | |||
105 | memset(&props, 0, sizeof(struct backlight_properties)); | 105 | memset(&props, 0, sizeof(struct backlight_properties)); |
106 | props.type = BACKLIGHT_RAW; | 106 | props.type = BACKLIGHT_RAW; |
107 | props.max_brightness = 512 - 1; | 107 | props.max_brightness = 512 - 1; |
108 | data->bl = backlight_device_register("tosa-bl", &client->dev, data, | 108 | data->bl = devm_backlight_device_register(&client->dev, "tosa-bl", |
109 | &bl_ops, &props); | 109 | &client->dev, data, &bl_ops, |
110 | &props); | ||
110 | if (IS_ERR(data->bl)) { | 111 | if (IS_ERR(data->bl)) { |
111 | ret = PTR_ERR(data->bl); | 112 | ret = PTR_ERR(data->bl); |
112 | goto err_reg; | 113 | goto err_reg; |
@@ -128,9 +129,7 @@ static int tosa_bl_remove(struct i2c_client *client) | |||
128 | { | 129 | { |
129 | struct tosa_bl_data *data = i2c_get_clientdata(client); | 130 | struct tosa_bl_data *data = i2c_get_clientdata(client); |
130 | 131 | ||
131 | backlight_device_unregister(data->bl); | ||
132 | data->bl = NULL; | 132 | data->bl = NULL; |
133 | |||
134 | return 0; | 133 | return 0; |
135 | } | 134 | } |
136 | 135 | ||