summaryrefslogtreecommitdiffstats
path: root/drivers/hwmon/pmbus/pmbus_core.c
diff options
context:
space:
mode:
authorGuenter Roeck2012-02-22 17:56:44 +0100
committerGuenter Roeck2012-03-19 02:27:46 +0100
commitdd285ad7373bf5d21cceacb3b7a5eb8b72d37085 (patch)
treef46fdda6b48ccb2b3721d7e807b1a41e2c99c8a1 /drivers/hwmon/pmbus/pmbus_core.c
parenthwmon: (pmbus) Convert pmbus drivers to use devm_kzalloc (diff)
downloadkernel-qcow2-linux-dd285ad7373bf5d21cceacb3b7a5eb8b72d37085.tar.gz
kernel-qcow2-linux-dd285ad7373bf5d21cceacb3b7a5eb8b72d37085.tar.xz
kernel-qcow2-linux-dd285ad7373bf5d21cceacb3b7a5eb8b72d37085.zip
hwmon: (pmbus) Simplify remove functions
Since devm_kzalloc() is now used to allocate driver memory, the client driver remove function has no purpose other than to call pmbus_do_remove(). This means we can get rid of it by redefining pmbus_do_remove() to use the same prototype, and pointing to it directly. Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon/pmbus/pmbus_core.c')
-rw-r--r--drivers/hwmon/pmbus/pmbus_core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c
index 26b6542a90cd..aada0c67a911 100644
--- a/drivers/hwmon/pmbus/pmbus_core.c
+++ b/drivers/hwmon/pmbus/pmbus_core.c
@@ -1778,11 +1778,12 @@ out_hwmon_device_register:
}
EXPORT_SYMBOL_GPL(pmbus_do_probe);
-void pmbus_do_remove(struct i2c_client *client)
+int pmbus_do_remove(struct i2c_client *client)
{
struct pmbus_data *data = i2c_get_clientdata(client);
hwmon_device_unregister(data->hwmon_dev);
sysfs_remove_group(&client->dev.kobj, &data->group);
+ return 0;
}
EXPORT_SYMBOL_GPL(pmbus_do_remove);