Commit ac63ff50 authored by Bryan Wu's avatar Bryan Wu

leds: convert BD2802 RGB LED driver to devm_kzalloc() and cleanup error exit path

Cc: Kim Kyuwon <q1.kim@samsung.com>
Signed-off-by: default avatarBryan Wu <bryan.wu@canonical.com>
parent e430dc00
...@@ -677,7 +677,7 @@ static int __devinit bd2802_probe(struct i2c_client *client, ...@@ -677,7 +677,7 @@ static int __devinit bd2802_probe(struct i2c_client *client,
struct bd2802_led_platform_data *pdata; struct bd2802_led_platform_data *pdata;
int ret, i; int ret, i;
led = kzalloc(sizeof(struct bd2802_led), GFP_KERNEL); led = devm_kzalloc(&client->dev, sizeof(struct bd2802_led), GFP_KERNEL);
if (!led) { if (!led) {
dev_err(&client->dev, "failed to allocate driver data\n"); dev_err(&client->dev, "failed to allocate driver data\n");
return -ENOMEM; return -ENOMEM;
...@@ -697,7 +697,7 @@ static int __devinit bd2802_probe(struct i2c_client *client, ...@@ -697,7 +697,7 @@ static int __devinit bd2802_probe(struct i2c_client *client,
ret = bd2802_write_byte(client, BD2802_REG_CLKSETUP, 0x00); ret = bd2802_write_byte(client, BD2802_REG_CLKSETUP, 0x00);
if (ret < 0) { if (ret < 0) {
dev_err(&client->dev, "failed to detect device\n"); dev_err(&client->dev, "failed to detect device\n");
goto failed_free; return ret;
} else } else
dev_info(&client->dev, "return 0x%02x\n", ret); dev_info(&client->dev, "return 0x%02x\n", ret);
...@@ -729,9 +729,6 @@ static int __devinit bd2802_probe(struct i2c_client *client, ...@@ -729,9 +729,6 @@ static int __devinit bd2802_probe(struct i2c_client *client,
failed_unregister_dev_file: failed_unregister_dev_file:
for (i--; i >= 0; i--) for (i--; i >= 0; i--)
device_remove_file(&led->client->dev, bd2802_attributes[i]); device_remove_file(&led->client->dev, bd2802_attributes[i]);
failed_free:
kfree(led);
return ret; return ret;
} }
...@@ -746,7 +743,6 @@ static int __exit bd2802_remove(struct i2c_client *client) ...@@ -746,7 +743,6 @@ static int __exit bd2802_remove(struct i2c_client *client)
bd2802_disable_adv_conf(led); bd2802_disable_adv_conf(led);
for (i = 0; i < ARRAY_SIZE(bd2802_attributes); i++) for (i = 0; i < ARRAY_SIZE(bd2802_attributes); i++)
device_remove_file(&led->client->dev, bd2802_attributes[i]); device_remove_file(&led->client->dev, bd2802_attributes[i]);
kfree(led);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment