summaryrefslogtreecommitdiffstats
path: root/drivers/hwmon/pmbus/pmbus.c
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2012-02-22 08:56:44 -0800
committerGuenter Roeck <guenter.roeck@ericsson.com>2012-03-18 18:27:46 -0700
commitdd285ad7373bf5d21cceacb3b7a5eb8b72d37085 (patch)
treef46fdda6b48ccb2b3721d7e807b1a41e2c99c8a1 /drivers/hwmon/pmbus/pmbus.c
parent8b313ca7f1b98263ce22519b25a9c2a362eeb898 (diff)
downloadlinux-dd285ad7373bf5d21cceacb3b7a5eb8b72d37085.tar.bz2
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.c')
-rw-r--r--drivers/hwmon/pmbus/pmbus.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/hwmon/pmbus/pmbus.c b/drivers/hwmon/pmbus/pmbus.c
index b94bec23d95c..34887408505b 100644
--- a/drivers/hwmon/pmbus/pmbus.c
+++ b/drivers/hwmon/pmbus/pmbus.c
@@ -178,12 +178,6 @@ static int pmbus_probe(struct i2c_client *client,
return pmbus_do_probe(client, id, info);
}
-static int pmbus_remove(struct i2c_client *client)
-{
- pmbus_do_remove(client);
- return 0;
-}
-
/*
* Use driver_data to set the number of pages supported by the chip.
*/
@@ -209,7 +203,7 @@ static struct i2c_driver pmbus_driver = {
.name = "pmbus",
},
.probe = pmbus_probe,
- .remove = pmbus_remove,
+ .remove = pmbus_do_remove,
.id_table = pmbus_id,
};