ACPI: AC: fix some errors and warnings reported by checkpatch.pl
PATCH 1/1 ACPI: AC: fix some errors and warnings reported by checkpatch.pl
Fix some errors and warnings reported by checkpatch.pl, including following five types:
ERROR: "foo * bar" should be "foo *bar"
ERROR: code indent should use tabs where possible
WARNING: Block comments use a trailing */ on a separate line
WARNING: braces {} are not necessary for single statement blocks
WARNING: void function return statements are not generally useful
--- drivers/acpi/ac.c | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-)
drivers/acpi/ac.c +13 -19
@@ -78,17 +78,16 @@ static struct acpi_driver acpi_ac_driver = {struct acpi_ac {struct power_supply *charger;struct power_supply_desc charger_desc; -struct acpi_device * device; +struct acpi_device *device;unsigned long long state;struct notifier_block battery_nb; };#define to_acpi_ac (x) power_supply_get_drvdata(x) -/* -------------------------------------------------------------------------- -AC Adapter Management --------------------------------------------------------------------------- */ - +/* +* AC Adapter Management +*/ static int acpi_ac_get_state (struct acpi_ac *ac) {acpi_status status =AE_OK ;
@@ -109,9 +108,9 @@ static int acpi_ac_get_state(struct acpi_ac *ac)return 0 ; } -/* -------------------------------------------------------------------------- -sysfs I/F --------------------------------------------------------------------------- */ +/* +* sysfs I/F +*/ static int get_ac_property (struct power_supply *psy,enum power_supply_property psp,union power_supply_propval *val)
@@ -138,10 +137,9 @@ static enum power_supply_property ac_props[] = { POWER_SUPPLY_PROP_ONLINE, }; -/* -------------------------------------------------------------------------- -Driver Model --------------------------------------------------------------------------- */ - +/* +* Driver Model +*/ static void acpi_ac_notify (struct acpi_device *device,u32 event) {struct acpi_ac *ac =acpi_driver_data (device);
@@ -174,8 +172,6 @@ static void acpi_ac_notify(struct acpi_device *device, u32 event)acpi_notifier_call_chain (device, event, (u32 ) ac->state);kobject_uevent (&ac->charger->dev.kobj,KOBJ_CHANGE ); } - -return ; } static int acpi_ac_battery_notify(struct notifier_block *nb,
@@ -282,9 +278,8 @@ static int acpi_ac_add(struct acpi_device *device) ac->battery_nb.notifier_call = acpi_ac_battery_notify;register_acpi_notifier (&ac->battery_nb); end: -if (result) { +if (result)kfree (ac); - }return result; }
@@ -293,7 +288,7 @@ static int acpi_ac_add(struct acpi_device *device)static int acpi_ac_resume (struct device *dev) {struct acpi_ac *ac; -unsigned old_state; +unsigned int old_state;if (!dev)return -EINVAL ;
@@ -352,9 +347,8 @@ static int __init acpi_ac_init(void) } result =acpi_bus_register_driver (&acpi_ac_driver); -if (result <0 ) { +if (result <0 )return -ENODEV ; - }return 0 ; }
Signature · 1 line
2.8.1
Rafael J. Wysocki
maintainerQuoted 3 lines · Xiaofei Tan
Fix some errors and warnings reported by checkpatch.pl, including following five types:
Well, they are coding style issues rather than errors.
Quoted 24 lines
ERROR: "foo * bar" should be "foo *bar"
ERROR: code indent should use tabs where possible
WARNING: Block comments use a trailing */ on a separate line
WARNING: braces {} are not necessary for single statement blocks
WARNING: void function return statements are not generally usefulSigned-off-by Xiaofei Tan <[email protected]>--- drivers/acpi/ac.c | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-)drivers/acpi/ac.c +1
-1@@ -78,17 +78,16 @@ static struct acpi_driver acpi_ac_driver = {struct acpi_ac {struct power_supply *charger;struct power_supply_desc charger_desc; -struct acpi_device * device; +struct acpi_device *device;unsigned long long state;struct notifier_block battery_nb; };
drivers/acpi/ac.c static struct acpi_driver acpi_ac_driver = { · line 90
Quoted 10 lines
drivers/acpi/ac.c +3
-4#define to_acpi_ac (x) power_supply_get_drvdata(x) -/* -------------------------------------------------------------------------- -AC Adapter Management --------------------------------------------------------------------------- */ - +/* +* AC Adapter Management +*/
Please use the /* ... */ (one-line) comment format here and below for comments that aren't longer than one line.
Quoted 71 lines
drivers/acpi/ac.c +9
-15static int acpi_ac_get_state (struct acpi_ac *ac) {acpi_status status =AE_OK ;@@ -109,9 +108,9 @@ static int acpi_ac_get_state(struct acpi_ac *ac)return 0 ; } -/* -------------------------------------------------------------------------- -sysfs I/F --------------------------------------------------------------------------- */ +/* +* sysfs I/F +*/ static int get_ac_property (struct power_supply *psy,enum power_supply_property psp,union power_supply_propval *val)@@ -138,10 +137,9 @@ static enum power_supply_property ac_props[] = { POWER_SUPPLY_PROP_ONLINE, }; -/* -------------------------------------------------------------------------- -Driver Model --------------------------------------------------------------------------- */ - +/* +* Driver Model +*/ static void acpi_ac_notify (struct acpi_device *device,u32 event) {struct acpi_ac *ac =acpi_driver_data (device);@@ -174,8 +172,6 @@ static void acpi_ac_notify(struct acpi_device *device, u32 event)acpi_notifier_call_chain (device, event, (u32 ) ac->state);kobject_uevent (&ac->charger->dev.kobj,KOBJ_CHANGE ); } - -return ; } static int acpi_ac_battery_notify(struct notifier_block *nb,@@ -282,9 +278,8 @@ static int acpi_ac_add(struct acpi_device *device) ac->battery_nb.notifier_call = acpi_ac_battery_notify;register_acpi_notifier (&ac->battery_nb); end: -if (result) { +if (result)kfree (ac); - }return result; }@@ -293,7 +288,7 @@ static int acpi_ac_add(struct acpi_device *device)static int acpi_ac_resume (struct device *dev) {struct acpi_ac *ac; -unsigned old_state; +unsigned int old_state;if (!dev)return -EINVAL ;@@ -352,9 +347,8 @@ static int __init acpi_ac_init(void) } result =acpi_bus_register_driver (&acpi_ac_driver); -if (result <0 ) { +if (result <0 )return -ENODEV ; - }return 0 ; } --
Hi Rafael,
Quoted 7 lines · Rafael J. Wysocki
Quoted 3 lines · Xiaofei Tan
Fix some errors and warnings reported by checkpatch.pl, including following five types:
Well, they are coding style issues rather than errors.
Right, i could change the description.
Quoted 27 lines
Quoted 27 lines
ERROR: "foo * bar" should be "foo *bar"
ERROR: code indent should use tabs where possible
WARNING: Block comments use a trailing */ on a separate line
WARNING: braces {} are not necessary for single statement blocks
WARNING: void function return statements are not generally usefulSigned-off-by Xiaofei Tan <[email protected]>--- drivers/acpi/ac.c | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-)drivers/acpi/ac.c +1
-1@@ -78,17 +78,16 @@ static struct acpi_driver acpi_ac_driver = {struct acpi_ac {struct power_supply *charger;struct power_supply_desc charger_desc; -struct acpi_device * device; +struct acpi_device *device;unsigned long long state;struct notifier_block battery_nb; };#define to_acpi_ac (x) power_supply_get_drvdata(x)
Quoted 11 lines
drivers/acpi/ac.c static struct acpi_driver acpi_ac_driver = { · line 90
Quoted 7 lines
drivers/acpi/ac.c +3
-4-/* -------------------------------------------------------------------------- -AC Adapter Management --------------------------------------------------------------------------- */ - +/* +* AC Adapter Management +*/ Please use the /* ... */ (one-line) comment format here and below for comments that aren't longer than one line.
Sure.
Quoted 74 lines
Quoted 61 lines
drivers/acpi/ac.c +8
-12static int acpi_ac_get_state (struct acpi_ac *ac) {acpi_status status =AE_OK ;@@ -109,9 +108,9 @@ static int acpi_ac_get_state(struct acpi_ac *ac)return 0 ; } -/* -------------------------------------------------------------------------- -sysfs I/F --------------------------------------------------------------------------- */ +/* +* sysfs I/F +*/ static int get_ac_property (struct power_supply *psy,enum power_supply_property psp,union power_supply_propval *val)@@ -138,10 +137,9 @@ static enum power_supply_property ac_props[] = { POWER_SUPPLY_PROP_ONLINE, }; -/* -------------------------------------------------------------------------- -Driver Model --------------------------------------------------------------------------- */ - +/* +* Driver Model +*/ static void acpi_ac_notify (struct acpi_device *device,u32 event) {struct acpi_ac *ac =acpi_driver_data (device);@@ -174,8 +172,6 @@ static void acpi_ac_notify(struct acpi_device *device, u32 event)acpi_notifier_call_chain (device, event, (u32 ) ac->state);kobject_uevent (&ac->charger->dev.kobj,KOBJ_CHANGE ); } - -return ; } static int acpi_ac_battery_notify(struct notifier_block *nb,@@ -282,9 +278,8 @@ static int acpi_ac_add(struct acpi_device *device) ac->battery_nb.notifier_call = acpi_ac_battery_notify;register_acpi_notifier (&ac->battery_nb); end: -if (result) { +if (result)kfree (ac); - }return result; }@@ -293,7 +288,7 @@ static int acpi_ac_add(struct acpi_device *device)static int acpi_ac_resume (struct device *dev) {struct acpi_ac *ac; -unsigned old_state; +unsigned int old_state;if (!dev)return -EINVAL ;@@ -352,9 +347,8 @@ static int __init acpi_ac_init(void) }drivers/acpi/ac.c static int __init acpi_ac_init(void)
Quoted 10 lines
drivers/acpi/ac.c +1
-3result =acpi_bus_register_driver (&acpi_ac_driver); -if (result <0 ) { +if (result <0 )return -ENODEV ; - }return 0 ; } --.
Hi Rafael,
BTW, there is still one warning left reported by checkpatch.pl in this file. The cause of the warning is that it contains an special character '$'. Does it have any special purpose? If no, i can fix it in the new version, too. thanks.
WARNING: CVS style keyword markers, these will _not_ be updated #3: FILE: drivers/acpi/ac.c:3:
+ * acpi_ac.c - ACPI AC Adapter Driver ($Revision: 27 $)
Quoted 143 lines · Xiaofei Tan
Hi Rafael,
Quoted 8 lines · Rafael J. Wysocki
Quoted 3 lines · Xiaofei Tan
Fix some errors and warnings reported by checkpatch.pl, including following five types:
Well, they are coding style issues rather than errors.
Right, i could change the description.
Quoted 30 lines
Quoted 30 lines
ERROR: "foo * bar" should be "foo *bar"
ERROR: code indent should use tabs where possible
WARNING: Block comments use a trailing */ on a separate line
WARNING: braces {} are not necessary for single statement blocks
WARNING: void function return statements are not generally usefulSigned-off-by Xiaofei Tan <[email protected]>--- drivers/acpi/ac.c | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-)drivers/acpi/ac.c +1
-3@@ -78,17 +78,16 @@ static struct acpi_driver acpi_ac_driver = {struct acpi_ac {struct power_supply *charger;struct power_supply_desc charger_desc; -struct acpi_device * device; +struct acpi_device *device;unsigned long long state;struct notifier_block battery_nb; };#define to_acpi_ac (x) power_supply_get_drvdata(x) -/* -------------------------------------------------------------------------- Quoted 12 lines
drivers/acpi/ac.c static struct acpi_driver acpi_ac_driver = { · line 90
Quoted 8 lines
drivers/acpi/ac.c +3
-4-AC Adapter Management - -------------------------------------------------------------------------- */ - +/* +* AC Adapter Management +*/ Please use the /* ... */ (one-line) comment format here and below for comments that aren't longer than one line.
Sure.
Quoted 84 lines
Quoted 71 lines
static int
acpi_ac_get_state(struct acpi_ac *ac){ acpi_status status = AE_OK;drivers/acpi/ac.c +0
-5@@ -109,9 +108,9 @@ static int acpi_ac_get_state(struct acpi_ac *ac)return 0 ; } -/* -------------------------------------------------------------------------- -sysfs I/F - -------------------------------------------------------------------------- */
drivers/acpi/ac.c +6
-8+/* +* sysfs I/F +*/ static int get_ac_property (struct power_supply *psy,enum power_supply_property psp,union power_supply_propval *val)@@ -138,10 +137,9 @@ static enum power_supply_property ac_props[] = {POWER_SUPPLY_PROP_ONLINE, }; -/* -------------------------------------------------------------------------- -Driver Model - -------------------------------------------------------------------------- */ - +/* +* Driver Model +*/ static void acpi_ac_notify (struct acpi_device *device,u32 event) {struct acpi_ac *ac =acpi_driver_data (device);@@ -174,8 +172,6 @@ static void acpi_ac_notify(struct acpi_device *device, u32 event)acpi_notifier_call_chain (device, event, (u32 ) ac->state);kobject_uevent (&ac->charger->dev.kobj,KOBJ_CHANGE ); } - -return ; }static int acpi_ac_battery_notify(struct
notifier_block*nb,drivers/acpi/ac.c +2
-3@@ -282,9 +278,8 @@ static int acpi_ac_add(struct acpi_device *device) ac->battery_nb.notifier_call = acpi_ac_battery_notify;register_acpi_notifier (&ac->battery_nb); end: -if (result) { +if (result)kfree (ac); - }return result; }@@ -293,7 +288,7 @@ static int acpi_ac_add(struct acpi_device *device)static int acpi_ac_resume (struct device *dev) {struct acpi_ac *ac; -unsigned old_state; +unsigned int old_state;if (!dev)return -EINVAL ;@@ -352,9 +347,8 @@ static int __init acpi_ac_init(void) }drivers/acpi/ac.c static int __init acpi_ac_init(void)
Quoted 10 lines
drivers/acpi/ac.c +1
-3result =acpi_bus_register_driver (&acpi_ac_driver); -if (result <0 ) { +if (result <0 )return -ENODEV ; - }return 0 ; } --.