From 34f70eefee2b3011a6fba7695f120ae0f2c7b65c Mon Sep 17 00:00:00 2001 From: Guenter Roeck Date: Fri, 26 Aug 2011 08:12:38 -0700 Subject: [PATCH] --- yaml --- r: 267261 b: refs/heads/master c: 866cf12a0eab65f94e40608bdd21ca8dea4d0ac2 h: refs/heads/master i: 267259: 6133041af4c7fa20ec68f314a4082f52fa86ec0d v: v3 --- [refs] | 2 +- trunk/drivers/hwmon/pmbus/adm1275.c | 5 ++--- trunk/drivers/hwmon/pmbus/lm25066.c | 5 ++--- trunk/drivers/hwmon/pmbus/max16064.c | 3 ++- trunk/drivers/hwmon/pmbus/max34440.c | 3 ++- trunk/drivers/hwmon/pmbus/max8688.c | 3 ++- trunk/drivers/hwmon/pmbus/pmbus.c | 5 ++--- trunk/drivers/hwmon/pmbus/pmbus.h | 2 +- trunk/drivers/hwmon/pmbus/pmbus_core.c | 3 +-- trunk/drivers/hwmon/pmbus/ucd9000.c | 5 ++--- trunk/drivers/hwmon/pmbus/ucd9200.c | 5 ++--- 11 files changed, 19 insertions(+), 22 deletions(-) diff --git a/[refs] b/[refs] index f7ef1a49baec..909edb69f796 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 20fcfe172190704918969695a16cf621e2f4ce25 +refs/heads/master: 866cf12a0eab65f94e40608bdd21ca8dea4d0ac2 diff --git a/trunk/drivers/hwmon/pmbus/adm1275.c b/trunk/drivers/hwmon/pmbus/adm1275.c index c936e2782309..424d0d711ccb 100644 --- a/trunk/drivers/hwmon/pmbus/adm1275.c +++ b/trunk/drivers/hwmon/pmbus/adm1275.c @@ -152,11 +152,10 @@ static int adm1275_probe(struct i2c_client *client, static int adm1275_remove(struct i2c_client *client) { const struct pmbus_driver_info *info = pmbus_get_driver_info(client); - int ret; - ret = pmbus_do_remove(client); + pmbus_do_remove(client); kfree(info); - return ret; + return 0; } static const struct i2c_device_id adm1275_id[] = { diff --git a/trunk/drivers/hwmon/pmbus/lm25066.c b/trunk/drivers/hwmon/pmbus/lm25066.c index ac254fba551b..2107f413e4fc 100644 --- a/trunk/drivers/hwmon/pmbus/lm25066.c +++ b/trunk/drivers/hwmon/pmbus/lm25066.c @@ -309,11 +309,10 @@ static int lm25066_remove(struct i2c_client *client) { const struct pmbus_driver_info *info = pmbus_get_driver_info(client); const struct lm25066_data *data = to_lm25066_data(info); - int ret; - ret = pmbus_do_remove(client); + pmbus_do_remove(client); kfree(data); - return ret; + return 0; } static const struct i2c_device_id lm25066_id[] = { diff --git a/trunk/drivers/hwmon/pmbus/max16064.c b/trunk/drivers/hwmon/pmbus/max16064.c index e50b296e8db4..1d77cf4d2d44 100644 --- a/trunk/drivers/hwmon/pmbus/max16064.c +++ b/trunk/drivers/hwmon/pmbus/max16064.c @@ -105,7 +105,8 @@ static int max16064_probe(struct i2c_client *client, static int max16064_remove(struct i2c_client *client) { - return pmbus_do_remove(client); + pmbus_do_remove(client); + return 0; } static const struct i2c_device_id max16064_id[] = { diff --git a/trunk/drivers/hwmon/pmbus/max34440.c b/trunk/drivers/hwmon/pmbus/max34440.c index fda621d2e458..c824365e4aa4 100644 --- a/trunk/drivers/hwmon/pmbus/max34440.c +++ b/trunk/drivers/hwmon/pmbus/max34440.c @@ -224,7 +224,8 @@ static int max34440_probe(struct i2c_client *client, static int max34440_remove(struct i2c_client *client) { - return pmbus_do_remove(client); + pmbus_do_remove(client); + return 0; } static const struct i2c_device_id max34440_id[] = { diff --git a/trunk/drivers/hwmon/pmbus/max8688.c b/trunk/drivers/hwmon/pmbus/max8688.c index c3e72f1a3cfb..e148e2c5a756 100644 --- a/trunk/drivers/hwmon/pmbus/max8688.c +++ b/trunk/drivers/hwmon/pmbus/max8688.c @@ -182,7 +182,8 @@ static int max8688_probe(struct i2c_client *client, static int max8688_remove(struct i2c_client *client) { - return pmbus_do_remove(client); + pmbus_do_remove(client); + return 0; } static const struct i2c_device_id max8688_id[] = { diff --git a/trunk/drivers/hwmon/pmbus/pmbus.c b/trunk/drivers/hwmon/pmbus/pmbus.c index 73de9f1f3194..1dfba4477498 100644 --- a/trunk/drivers/hwmon/pmbus/pmbus.c +++ b/trunk/drivers/hwmon/pmbus/pmbus.c @@ -187,13 +187,12 @@ static int pmbus_probe(struct i2c_client *client, static int pmbus_remove(struct i2c_client *client) { - int ret; const struct pmbus_driver_info *info; info = pmbus_get_driver_info(client); - ret = pmbus_do_remove(client); + pmbus_do_remove(client); kfree(info); - return ret; + return 0; } /* diff --git a/trunk/drivers/hwmon/pmbus/pmbus.h b/trunk/drivers/hwmon/pmbus/pmbus.h index 8751f4073ec2..cfa912d0f0b0 100644 --- a/trunk/drivers/hwmon/pmbus/pmbus.h +++ b/trunk/drivers/hwmon/pmbus/pmbus.h @@ -361,7 +361,7 @@ bool pmbus_check_byte_register(struct i2c_client *client, int page, int reg); bool pmbus_check_word_register(struct i2c_client *client, int page, int reg); int pmbus_do_probe(struct i2c_client *client, const struct i2c_device_id *id, struct pmbus_driver_info *info); -int pmbus_do_remove(struct i2c_client *client); +void pmbus_do_remove(struct i2c_client *client); const struct pmbus_driver_info *pmbus_get_driver_info(struct i2c_client *client); diff --git a/trunk/drivers/hwmon/pmbus/pmbus_core.c b/trunk/drivers/hwmon/pmbus/pmbus_core.c index 397fc59b5682..36f287076ee2 100644 --- a/trunk/drivers/hwmon/pmbus/pmbus_core.c +++ b/trunk/drivers/hwmon/pmbus/pmbus_core.c @@ -1764,7 +1764,7 @@ int pmbus_do_probe(struct i2c_client *client, const struct i2c_device_id *id, } EXPORT_SYMBOL_GPL(pmbus_do_probe); -int pmbus_do_remove(struct i2c_client *client) +void pmbus_do_remove(struct i2c_client *client) { struct pmbus_data *data = i2c_get_clientdata(client); hwmon_device_unregister(data->hwmon_dev); @@ -1774,7 +1774,6 @@ int pmbus_do_remove(struct i2c_client *client) kfree(data->booleans); kfree(data->sensors); kfree(data); - return 0; } EXPORT_SYMBOL_GPL(pmbus_do_remove); diff --git a/trunk/drivers/hwmon/pmbus/ucd9000.c b/trunk/drivers/hwmon/pmbus/ucd9000.c index d0ddb60155c9..640a9c9de7f8 100644 --- a/trunk/drivers/hwmon/pmbus/ucd9000.c +++ b/trunk/drivers/hwmon/pmbus/ucd9000.c @@ -239,13 +239,12 @@ static int ucd9000_probe(struct i2c_client *client, static int ucd9000_remove(struct i2c_client *client) { - int ret; struct ucd9000_data *data; data = to_ucd9000_data(pmbus_get_driver_info(client)); - ret = pmbus_do_remove(client); + pmbus_do_remove(client); kfree(data); - return ret; + return 0; } diff --git a/trunk/drivers/hwmon/pmbus/ucd9200.c b/trunk/drivers/hwmon/pmbus/ucd9200.c index c65e9da707cc..6e1c1a80ab85 100644 --- a/trunk/drivers/hwmon/pmbus/ucd9200.c +++ b/trunk/drivers/hwmon/pmbus/ucd9200.c @@ -171,13 +171,12 @@ static int ucd9200_probe(struct i2c_client *client, static int ucd9200_remove(struct i2c_client *client) { - int ret; const struct pmbus_driver_info *info; info = pmbus_get_driver_info(client); - ret = pmbus_do_remove(client); + pmbus_do_remove(client); kfree(info); - return ret; + return 0; }