From e9aee8c1da6c1f5ab993a27f6bfceddb34beb523 Mon Sep 17 00:00:00 2001 From: Guenter Roeck Date: Sat, 2 Jun 2012 11:20:23 -0700 Subject: [PATCH] --- yaml --- r: 316006 b: refs/heads/master c: bd91d3bab8787f53c1b937ac817b0c59f8146b97 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/hwmon/thmc50.c | 17 +++++------------ 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 6bcee284b1fd..183c7efeb832 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d224ade31f0a08c0a0eef9e74a6187c0b8747b4 +refs/heads/master: bd91d3bab8787f53c1b937ac817b0c59f8146b97 diff --git a/trunk/drivers/hwmon/thmc50.c b/trunk/drivers/hwmon/thmc50.c index add9f019b24f..080c26370480 100644 --- a/trunk/drivers/hwmon/thmc50.c +++ b/trunk/drivers/hwmon/thmc50.c @@ -361,12 +361,10 @@ static int thmc50_probe(struct i2c_client *client, struct thmc50_data *data; int err; - data = kzalloc(sizeof(struct thmc50_data), GFP_KERNEL); - if (!data) { - pr_debug("thmc50: detect failed, kzalloc failed!\n"); - err = -ENOMEM; - goto exit; - } + data = devm_kzalloc(&client->dev, sizeof(struct thmc50_data), + GFP_KERNEL); + if (!data) + return -ENOMEM; i2c_set_clientdata(client, data); data->type = id->driver_data; @@ -377,7 +375,7 @@ static int thmc50_probe(struct i2c_client *client, /* Register sysfs hooks */ err = sysfs_create_group(&client->dev.kobj, &thmc50_group); if (err) - goto exit_free; + return err; /* Register ADM1022 sysfs hooks */ if (data->has_temp3) { @@ -400,9 +398,6 @@ static int thmc50_probe(struct i2c_client *client, sysfs_remove_group(&client->dev.kobj, &temp3_group); exit_remove_sysfs_thmc50: sysfs_remove_group(&client->dev.kobj, &thmc50_group); -exit_free: - kfree(data); -exit: return err; } @@ -415,8 +410,6 @@ static int thmc50_remove(struct i2c_client *client) if (data->has_temp3) sysfs_remove_group(&client->dev.kobj, &temp3_group); - kfree(data); - return 0; }