From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752045Ab2AUGnL (ORCPT ); Sat, 21 Jan 2012 01:43:11 -0500 Received: from mail-gx0-f174.google.com ([209.85.161.174]:40257 "EHLO mail-gx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751019Ab2AUGnH (ORCPT ); Sat, 21 Jan 2012 01:43:07 -0500 Message-ID: <1327128174.24831.1.camel@phoenix> Subject: [PATCH] power_supply: Convert power_supply i2c drivers to module_i2c_driver From: Axel Lin To: linux-kernel@vger.kernel.org Cc: Ryan Mallon , Woogyom Kim , Daniel Jeong , Minkyu Kang , MyungJoo Ham , Rhyland Klein , Peter Edwards , Anton Vorontsov Date: Sat, 21 Jan 2012 14:42:54 +0800 Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.1- Content-Transfer-Encoding: 7bit Mime-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Factor out some boilerplate code for i2c driver registration into module_i2c_driver. Signed-off-by: Axel Lin Cc: Ryan Mallon Cc: Woogyom Kim Cc: Daniel Jeong Cc: Minkyu Kang Cc: MyungJoo Ham Cc: Rhyland Klein Cc: Peter Edwards --- drivers/power/ds2782_battery.c | 12 +----------- drivers/power/lp8727_charger.c | 13 +------------ drivers/power/max17040_battery.c | 12 +----------- drivers/power/max17042_battery.c | 12 +----------- drivers/power/sbs-battery.c | 12 +----------- drivers/power/z2_battery.c | 13 +------------ 6 files changed, 6 insertions(+), 68 deletions(-) diff --git a/drivers/power/ds2782_battery.c b/drivers/power/ds2782_battery.c index bfbce5d..6e3d76a 100644 --- a/drivers/power/ds2782_battery.c +++ b/drivers/power/ds2782_battery.c @@ -404,17 +404,7 @@ static struct i2c_driver ds278x_battery_driver = { .id_table = ds278x_id, }; -static int __init ds278x_init(void) -{ - return i2c_add_driver(&ds278x_battery_driver); -} -module_init(ds278x_init); - -static void __exit ds278x_exit(void) -{ - i2c_del_driver(&ds278x_battery_driver); -} -module_exit(ds278x_exit); +module_i2c_driver(ds278x_battery_driver); MODULE_AUTHOR("Ryan Mallon"); MODULE_DESCRIPTION("Maxim/Dallas DS2782 Stand-Alone Fuel Gauage IC driver"); diff --git a/drivers/power/lp8727_charger.c b/drivers/power/lp8727_charger.c index b15b575..30de637 100644 --- a/drivers/power/lp8727_charger.c +++ b/drivers/power/lp8727_charger.c @@ -475,18 +475,7 @@ static struct i2c_driver lp8727_driver = { .id_table = lp8727_ids, }; -static int __init lp8727_init(void) -{ - return i2c_add_driver(&lp8727_driver); -} - -static void __exit lp8727_exit(void) -{ - i2c_del_driver(&lp8727_driver); -} - -module_init(lp8727_init); -module_exit(lp8727_exit); +module_i2c_driver(lp8727_driver); MODULE_DESCRIPTION("National Semiconductor LP8727 charger driver"); MODULE_AUTHOR diff --git a/drivers/power/max17040_battery.c b/drivers/power/max17040_battery.c index 2f2f9a6..1c8dd0e 100644 --- a/drivers/power/max17040_battery.c +++ b/drivers/power/max17040_battery.c @@ -291,17 +291,7 @@ static struct i2c_driver max17040_i2c_driver = { .id_table = max17040_id, }; -static int __init max17040_init(void) -{ - return i2c_add_driver(&max17040_i2c_driver); -} -module_init(max17040_init); - -static void __exit max17040_exit(void) -{ - i2c_del_driver(&max17040_i2c_driver); -} -module_exit(max17040_exit); +module_i2c_driver(max17040_i2c_driver); MODULE_AUTHOR("Minkyu Kang "); MODULE_DESCRIPTION("MAX17040 Fuel Gauge"); diff --git a/drivers/power/max17042_battery.c b/drivers/power/max17042_battery.c index 86acee2..b2fd9e2 100644 --- a/drivers/power/max17042_battery.c +++ b/drivers/power/max17042_battery.c @@ -288,17 +288,7 @@ static struct i2c_driver max17042_i2c_driver = { .id_table = max17042_id, }; -static int __init max17042_init(void) -{ - return i2c_add_driver(&max17042_i2c_driver); -} -module_init(max17042_init); - -static void __exit max17042_exit(void) -{ - i2c_del_driver(&max17042_i2c_driver); -} -module_exit(max17042_exit); +module_i2c_driver(max17042_i2c_driver); MODULE_AUTHOR("MyungJoo Ham "); MODULE_DESCRIPTION("MAX17042 Fuel Gauge"); diff --git a/drivers/power/sbs-battery.c b/drivers/power/sbs-battery.c index 9ff8af0..4f05498 100644 --- a/drivers/power/sbs-battery.c +++ b/drivers/power/sbs-battery.c @@ -853,17 +853,7 @@ static struct i2c_driver sbs_battery_driver = { }, }; -static int __init sbs_battery_init(void) -{ - return i2c_add_driver(&sbs_battery_driver); -} -module_init(sbs_battery_init); - -static void __exit sbs_battery_exit(void) -{ - i2c_del_driver(&sbs_battery_driver); -} -module_exit(sbs_battery_exit); +module_i2c_driver(sbs_battery_driver); MODULE_DESCRIPTION("SBS battery monitor driver"); MODULE_LICENSE("GPL"); diff --git a/drivers/power/z2_battery.c b/drivers/power/z2_battery.c index 636ebb2..15c3fba 100644 --- a/drivers/power/z2_battery.c +++ b/drivers/power/z2_battery.c @@ -317,18 +317,7 @@ static struct i2c_driver z2_batt_driver = { .id_table = z2_batt_id, }; -static int __init z2_batt_init(void) -{ - return i2c_add_driver(&z2_batt_driver); -} - -static void __exit z2_batt_exit(void) -{ - i2c_del_driver(&z2_batt_driver); -} - -module_init(z2_batt_init); -module_exit(z2_batt_exit); +module_i2c_driver(z2_batt_driver); MODULE_LICENSE("GPL"); MODULE_AUTHOR("Peter Edwards "); -- 1.7.5.4