From d1ec545db09c577f46466dd1a561c47b001a0d17 Mon Sep 17 00:00:00 2001 From: Guenter Roeck Date: Sat, 2 Jun 2012 11:20:20 -0700 Subject: [PATCH] --- yaml --- r: 316001 b: refs/heads/master c: 60c2b5697560b0216ddbebaabebd1aac7abe3012 h: refs/heads/master i: 315999: ed14daf539225b89bd140709ab6a57413b404433 v: v3 --- [refs] | 2 +- trunk/drivers/hwmon/pcf8591.c | 15 +++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 0c27b89890ee..26806ff10376 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 96f316c24c0aea2984c90170966d9a2cb93d1094 +refs/heads/master: 60c2b5697560b0216ddbebaabebd1aac7abe3012 diff --git a/trunk/drivers/hwmon/pcf8591.c b/trunk/drivers/hwmon/pcf8591.c index 4174c7463d70..825883d29002 100644 --- a/trunk/drivers/hwmon/pcf8591.c +++ b/trunk/drivers/hwmon/pcf8591.c @@ -200,11 +200,10 @@ static int pcf8591_probe(struct i2c_client *client, struct pcf8591_data *data; int err; - data = kzalloc(sizeof(struct pcf8591_data), GFP_KERNEL); - if (!data) { - err = -ENOMEM; - goto exit; - } + data = devm_kzalloc(&client->dev, sizeof(struct pcf8591_data), + GFP_KERNEL); + if (!data) + return -ENOMEM; i2c_set_clientdata(client, data); mutex_init(&data->update_lock); @@ -215,7 +214,7 @@ static int pcf8591_probe(struct i2c_client *client, /* Register sysfs hooks */ err = sysfs_create_group(&client->dev.kobj, &pcf8591_attr_group); if (err) - goto exit_kfree; + return err; /* Register input2 if not in "two differential inputs" mode */ if (input_mode != 3) { @@ -242,9 +241,6 @@ static int pcf8591_probe(struct i2c_client *client, exit_sysfs_remove: sysfs_remove_group(&client->dev.kobj, &pcf8591_attr_group_opt); sysfs_remove_group(&client->dev.kobj, &pcf8591_attr_group); -exit_kfree: - kfree(data); -exit: return err; } @@ -255,7 +251,6 @@ static int pcf8591_remove(struct i2c_client *client) hwmon_device_unregister(data->hwmon_dev); sysfs_remove_group(&client->dev.kobj, &pcf8591_attr_group_opt); sysfs_remove_group(&client->dev.kobj, &pcf8591_attr_group); - kfree(i2c_get_clientdata(client)); return 0; }