UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

backlight: adp8860: use devm_ functions 

The devm_ functions allocate memory that is released when a driver
detaches.  This patch uses devm_kzalloc of these functions.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jingoo Han 2012-05-29 15:07:21 -07:00 committed by Linus Torvalds
parent f5f4fd4516
commit 58875ea925
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/video/backlight/adp8860_bl.c
View File

@ -222,7 +222,8 @@ static int __devinit adp8860_led_probe(struct i2c_client *client)
struct led_info *cur_led; struct led_info *cur_led;
int ret, i; int ret, i;
led = kzalloc(sizeof(*led) * pdata->num_leds, GFP_KERNEL); led = devm_kzalloc(&client->dev, sizeof(*led) * pdata->num_leds,
GFP_KERNEL);
if (led == NULL) { if (led == NULL) {
dev_err(&client->dev, "failed to alloc memory\n"); dev_err(&client->dev, "failed to alloc memory\n");
return -ENOMEM; return -ENOMEM;
@ -236,7 +237,7 @@ static int __devinit adp8860_led_probe(struct i2c_client *client)
if (ret) { if (ret) {
dev_err(&client->dev, "failed to write\n"); dev_err(&client->dev, "failed to write\n");
goto err_free; return ret;
} }
for (i = 0; i < pdata->num_leds; ++i) { for (i = 0; i < pdata->num_leds; ++i) {
@ -291,9 +292,6 @@ static int __devinit adp8860_led_probe(struct i2c_client *client)
cancel_work_sync(&led[i].work); cancel_work_sync(&led[i].work);
} }
err_free:
kfree(led);
return ret; return ret;
} }
@ -309,7 +307,6 @@ static int __devexit adp8860_led_remove(struct i2c_client *client)
cancel_work_sync(&data->led[i].work); cancel_work_sync(&data->led[i].work);
} }
kfree(data->led);
return 0; return 0;
} }
#else #else
@ -675,13 +672,13 @@ static int __devinit adp8860_probe(struct i2c_client *client,
return -EINVAL; return -EINVAL;
} }
data = kzalloc(sizeof(*data), GFP_KERNEL); data = devm_kzalloc(&client->dev, sizeof(*data), GFP_KERNEL);
if (data == NULL) if (data == NULL)
return -ENOMEM; return -ENOMEM;
ret = adp8860_read(client, ADP8860_MFDVID, &reg_val); ret = adp8860_read(client, ADP8860_MFDVID, &reg_val);
if (ret < 0) if (ret < 0)
goto out2; return ret;
switch (ADP8860_MANID(reg_val)) { switch (ADP8860_MANID(reg_val)) {
case ADP8863_MANUFID: case ADP8863_MANUFID:
@ -694,8 +691,7 @@ static int __devinit adp8860_probe(struct i2c_client *client,
break; break;
default: default:
dev_err(&client->dev, "failed to probe\n"); dev_err(&client->dev, "failed to probe\n");
ret = -ENODEV; return -ENODEV;
goto out2;
} }
/* It's confirmed that the DEVID field is actually a REVID */ /* It's confirmed that the DEVID field is actually a REVID */
@ -717,8 +713,7 @@ static int __devinit adp8860_probe(struct i2c_client *client,
&client->dev, data, &adp8860_bl_ops, &props); &client->dev, data, &adp8860_bl_ops, &props);
if (IS_ERR(bl)) { if (IS_ERR(bl)) {
dev_err(&client->dev, "failed to register backlight\n"); dev_err(&client->dev, "failed to register backlight\n");
ret = PTR_ERR(bl); return PTR_ERR(bl);
goto out2;
} }
bl->props.brightness = ADP8860_MAX_BRIGHTNESS; bl->props.brightness = ADP8860_MAX_BRIGHTNESS;
@ -756,8 +751,6 @@ out:
&adp8860_bl_attr_group); &adp8860_bl_attr_group);
out1: out1:
backlight_device_unregister(bl); backlight_device_unregister(bl);
out2:
kfree(data);
return ret; return ret;
} }
@ -776,7 +769,6 @@ static int __devexit adp8860_remove(struct i2c_client *client)
&adp8860_bl_attr_group); &adp8860_bl_attr_group);
backlight_device_unregister(data->bl); backlight_device_unregister(data->bl);
kfree(data);
return 0; return 0;
} }