drivers/acpi/battery.c cleanups
PATCH 1/1 drivers/acpi/battery.c cleanups
Removed assignment casts, substituted kmalloc+memset with kzalloc, made functions void if they never return a value. Style adjustments.
---
drivers/acpi/battery.c +42 -61
@@ -147,7 +147,7 @@ acpi_battery_get_info(struct acpi_batterreturn -ENODEV ; } - package = (union acpi_object *)buffer.pointer; + package = buffer.pointer;/* Extract Package Data */
@@ -158,12 +158,11 @@ acpi_battery_get_info(struct acpi_batter goto end; } - data.pointer =kmalloc (data.length,GFP_KERNEL ); + data.pointer =kzalloc (data.length,GFP_KERNEL );if (!data.pointer) { result = -ENOMEM ; goto end; } -memset (data.pointer,0 , data.length); status =acpi_extract_package (package, &format, &data);if (ACPI_FAILURE (status)) {
@@ -173,11 +172,11 @@ acpi_battery_get_info(struct acpi_batter goto end; } - end: +end:kfree (buffer.pointer);if (!result) - (*bif) = (struct acpi_battery_info *)data.pointer; + (*bif) = data.pointer;return result; }
@@ -207,7 +206,7 @@ acpi_battery_get_status(struct acpi_battreturn -ENODEV ; } - package = (union acpi_object *)buffer.pointer; + package = buffer.pointer;/* Extract Package Data */
@@ -218,12 +217,11 @@ acpi_battery_get_status(struct acpi_batt goto end; } - data.pointer =kmalloc (data.length,GFP_KERNEL ); + data.pointer =kzalloc (data.length,GFP_KERNEL );if (!data.pointer) { result = -ENOMEM ; goto end; } -memset (data.pointer,0 , data.length); status =acpi_extract_package (package, &format, &data);if (ACPI_FAILURE (status)) {
@@ -233,11 +231,11 @@ acpi_battery_get_status(struct acpi_batt goto end; } - end: +end:kfree (buffer.pointer);if (!result) - (*bst) = (struct acpi_battery_status *)data.pointer; + (*bst) = data.pointer;return result; }
@@ -329,22 +327,22 @@ static int acpi_battery_check(struct acp-------------------------------------------------------------------------- */ static struct proc_dir_entry *acpi_battery_dir; -static int acpi_battery_read_info (struct seq_file *seq,void *offset) +static void acpi_battery_read_info (struct seq_file *seq,void *offset) {int result =0 ; -struct acpi_battery *battery = (struct acpi_battery *)seq->private; +struct acpi_battery *battery = seq->private;struct acpi_battery_info *bif =NULL ;char *units ="?" ;if (!battery) - goto end; +return ;if (battery->flags.present)seq_printf (seq,"present: yes\n" );else {seq_printf (seq,"present: no\n" ); - goto end; +return ; }/* Battery Info (_BIF) */
@@ -402,10 +400,8 @@ static int acpi_battery_read_info(structseq_printf (seq,"battery type: %s\n" , bif->battery_type);seq_printf (seq,"OEM info: %s\n" , bif->oem_info); - end: +end:kfree (bif); - -return 0 ; }static int acpi_battery_info_open_fs (struct inode *inode,struct file *file)
@@ -413,22 +409,22 @@ static int acpi_battery_info_open_fs(strreturn single_open (file, acpi_battery_read_info,PDE (inode)->data); } -static int acpi_battery_read_state (struct seq_file *seq,void *offset) +static void acpi_battery_read_state (struct seq_file *seq,void *offset) {int result =0 ; -struct acpi_battery *battery = (struct acpi_battery *)seq->private; +struct acpi_battery *battery = seq->private;struct acpi_battery_status *bst =NULL ;char *units ="?" ;if (!battery) - goto end; +return ;if (battery->flags.present)seq_printf (seq,"present: yes\n" );else {seq_printf (seq,"present: no\n" ); - goto end; +return ; }/* Battery Units */
@@ -450,16 +446,15 @@ static int acpi_battery_read_state(strucelse seq_printf (seq,"capacity state: critical\n" ); -if ((bst->state &0x01 ) && (bst->state &0x02 )) { +if ((bst->state &0x01 ) && (bst->state &0x02 ))seq_printf (seq,"charging state: charging/discharging\n" ); - }else if (bst->state &0x01 ) +else if (bst->state &0x01 )seq_printf (seq,"charging state: discharging\n" );else if (bst->state &0x02 )seq_printf (seq,"charging state: charging\n" ); -else { +else seq_printf (seq,"charging state: charged\n" ); - }if (bst->present_rate ==ACPI_BATTERY_VALUE_UNKNOWN )seq_printf (seq,"present rate: unknown\n" );
@@ -479,10 +474,8 @@ static int acpi_battery_read_state(strucseq_printf (seq,"present voltage: %d mV\n" , (u32 ) bst->present_voltage); - end: +end:kfree (bst); - -return 0 ; }static int acpi_battery_state_open_fs (struct inode *inode,struct file *file)
@@ -490,18 +483,18 @@ static int acpi_battery_state_open_fs(streturn single_open (file, acpi_battery_read_state,PDE (inode)->data); } -static int acpi_battery_read_alarm (struct seq_file *seq,void *offset) +static void acpi_battery_read_alarm (struct seq_file *seq,void *offset) { -struct acpi_battery *battery = (struct acpi_battery *)seq->private; +struct acpi_battery *battery = seq->private;char *units ="?" ;if (!battery) - goto end; +return ;if (!battery->flags.present) {seq_printf (seq,"present: no\n" ); - goto end; +return ; }/* Battery Units */
@@ -517,9 +510,6 @@ static int acpi_battery_read_alarm(strucseq_printf (seq,"unsupported\n" ); else seq_printf(seq, "%d %sh\n", (u32) battery->alarm, units); - - end: -return 0 ; } static ssize_t
@@ -529,8 +519,8 @@ acpi_battery_write_alarm(struct file *fi {int result =0 ;char alarm_string[12 ] = {'\0' }; -struct seq_file *m = (struct seq_file *)file->private_data; -struct acpi_battery *battery = (struct acpi_battery *)m->private; +struct seq_file *m = file->private_data; +struct acpi_battery *battery = m->private;if (!battery || (count >sizeof (alarm_string) -1 ))
@@ -632,22 +622,20 @@ static int acpi_battery_add_fs(struct acreturn 0 ; } -static int acpi_battery_remove_fs (struct acpi_device *device) +static void acpi_battery_remove_fs (struct acpi_device *device) { +if (!acpi_device_dir (device)) +return ; -if (acpi_device_dir (device)) { -remove_proc_entry (ACPI_BATTERY_FILE_ALARM , -acpi_device_dir (device)); -remove_proc_entry (ACPI_BATTERY_FILE_STATUS , -acpi_device_dir (device)); -remove_proc_entry (ACPI_BATTERY_FILE_INFO , -acpi_device_dir (device)); - -remove_proc_entry (acpi_device_bid (device), acpi_battery_dir); -acpi_device_dir (device) =NULL ; - } +remove_proc_entry (ACPI_BATTERY_FILE_ALARM , +acpi_device_dir (device)); +remove_proc_entry (ACPI_BATTERY_FILE_STATUS , +acpi_device_dir (device)); +remove_proc_entry (ACPI_BATTERY_FILE_INFO , +acpi_device_dir (device)); -return 0 ; +remove_proc_entry (acpi_device_bid (device), acpi_battery_dir); +acpi_device_dir (device) =NULL ; }/* --------------------------------------------------------------------------
@@ -656,7 +644,7 @@ static int acpi_battery_remove_fs(structstatic void acpi_battery_notify (acpi_handle handle,u32 event,void *data) { -struct acpi_battery *battery = (struct acpi_battery *)data; +struct acpi_battery *battery = data;struct acpi_device *device =NULL ;
@@ -678,8 +666,6 @@ static void acpi_battery_notify(acpi_han "Unsupported event [0x%x]\n", event));break ; } - -return ; }static int acpi_battery_add (struct acpi_device *device)
@@ -692,10 +678,9 @@ static int acpi_battery_add(struct acpi_if (!device)return -EINVAL ; - battery =kmalloc (sizeof (struct acpi_battery ),GFP_KERNEL ); + battery =kzalloc (sizeof (*battery),GFP_KERNEL );if (!battery)return -ENOMEM ; -memset (battery,0 ,sizeof (struct acpi_battery )); battery->device = device;strcpy (acpi_device_name (device),ACPI_BATTERY_DEVICE_NAME );
@@ -722,7 +707,7 @@ static int acpi_battery_add(struct acpi_ACPI_BATTERY_DEVICE_NAME ,acpi_device_bid (device), device->status.battery_present ? "present" : "absent"); - end: +end:if (result) {acpi_battery_remove_fs (device);kfree (battery);
@@ -740,7 +725,7 @@ static int acpi_battery_remove(struct acif (!device || !acpi_driver_data (device))return -EINVAL ; - battery = (struct acpi_battery *)acpi_driver_data (device); + battery =acpi_driver_data (device); status = acpi_remove_notify_handler(device->handle, ACPI_ALL_NOTIFY,
@@ -772,12 +757,8 @@ static int __init acpi_battery_init(void static void __exit acpi_battery_exit(void) { -acpi_bus_unregister_driver (&acpi_battery_driver); -acpi_unlock_battery_dir (acpi_battery_dir); - -return ; }module_init (acpi_battery_init);
Johannes Weiner napsal(a):
Quoted 38 lines
Removed assignment casts, substituted kmalloc+memset with kzalloc, made functions void if they never return a value. Style adjustments.
Signed-off-by Johannes Weiner <[email protected]>---
------------------------------------------------------------------------
drivers/acpi/battery.c +2
-3@@ -147,7 +147,7 @@ acpi_battery_get_info(struct acpi_batterreturn -ENODEV ; } - package = (union acpi_object *)buffer.pointer; + package = buffer.pointer;/* Extract Package Data */ @@ -158,12 +158,11 @@ acpi_battery_get_info(struct acpi_batter goto end; } - data.pointer =kmalloc (data.length,GFP_KERNEL ); + data.pointer =kzalloc (data.length,GFP_KERNEL );if (!data.pointer) { result = -ENOMEM ; goto end; } -memset (data.pointer,0 , data.length); status =acpi_extract_package (package, &format, &data);if (ACPI_FAILURE (status)) {
drivers/acpi/battery.c acpi_battery_get_info(struct acpi_batter · line 179
Quoted 10 lines
drivers/acpi/battery.c +2
-2@@ -173,11 +172,11 @@ acpi_battery_get_info(struct acpi_batter goto end; } - end: +end:kfree (buffer.pointer);if (!result) - (*bif) = (struct acpi_battery_info *)data.pointer; + (*bif) = data.pointer;
still unneeded ()
Quoted 27 lines
drivers/acpi/battery.c +2
-3return result; }@@ -207,7 +206,7 @@ acpi_battery_get_status(struct acpi_battreturn -ENODEV ; } - package = (union acpi_object *)buffer.pointer; + package = buffer.pointer;/* Extract Package Data */ @@ -218,12 +217,11 @@ acpi_battery_get_status(struct acpi_batt goto end; } - data.pointer =kmalloc (data.length,GFP_KERNEL ); + data.pointer =kzalloc (data.length,GFP_KERNEL );if (!data.pointer) { result = -ENOMEM ; goto end; } -memset (data.pointer,0 , data.length); status =acpi_extract_package (package, &format, &data);if (ACPI_FAILURE (status)) {
drivers/acpi/battery.c acpi_battery_get_status(struct acpi_batt · line 238
Quoted 10 lines
drivers/acpi/battery.c +2
-2@@ -233,11 +231,11 @@ acpi_battery_get_status(struct acpi_batt goto end; } - end: +end:kfree (buffer.pointer);if (!result) - (*bst) = (struct acpi_battery_status *)data.pointer; + (*bst) = data.pointer;
and here
regards,
Signature · 4 lines
<a href="http://www.fi.muni.cz/~xslaby/">Jiri Slaby</a> faculty of informatics, masaryk university, brno, cz e-mail: jirislaby gmail com, gpg pubkey fingerprint: B674 9967 0407 CE62 ACC8 22A0 32CC 55C3 39D4 7A7E
Removed assignment casts, substituted kmalloc+memset with kzalloc, made functions void if they never return a significant value, style adjustments. Diff against Linus' 2.6 git tree.
---
Removed unneeded paranthesis onto Jiri's hint too. Here goes.
drivers/acpi/battery.c +42 -61
@@ -147,7 +147,7 @@ acpi_battery_get_info(struct acpi_batterreturn -ENODEV ; } - package = (union acpi_object *)buffer.pointer; + package = buffer.pointer;/* Extract Package Data */
@@ -158,12 +158,11 @@ acpi_battery_get_info(struct acpi_batter goto end; } - data.pointer =kmalloc (data.length,GFP_KERNEL ); + data.pointer =kzalloc (data.length,GFP_KERNEL );if (!data.pointer) { result = -ENOMEM ; goto end; } -memset (data.pointer,0 , data.length); status =acpi_extract_package (package, &format, &data);if (ACPI_FAILURE (status)) {
@@ -173,11 +172,11 @@ acpi_battery_get_info(struct acpi_batter goto end; } - end: +end:kfree (buffer.pointer);if (!result) - (*bif) = (struct acpi_battery_info *)data.pointer; + *bif = data.pointer;return result; }
@@ -207,7 +206,7 @@ acpi_battery_get_status(struct acpi_battreturn -ENODEV ; } - package = (union acpi_object *)buffer.pointer; + package = buffer.pointer;/* Extract Package Data */
@@ -218,12 +217,11 @@ acpi_battery_get_status(struct acpi_batt goto end; } - data.pointer =kmalloc (data.length,GFP_KERNEL ); + data.pointer =kzalloc (data.length,GFP_KERNEL );if (!data.pointer) { result = -ENOMEM ; goto end; } -memset (data.pointer,0 , data.length); status =acpi_extract_package (package, &format, &data);if (ACPI_FAILURE (status)) {
@@ -233,11 +231,11 @@ acpi_battery_get_status(struct acpi_batt goto end; } - end: +end:kfree (buffer.pointer);if (!result) - (*bst) = (struct acpi_battery_status *)data.pointer; + *bst = data.pointer;return result; }
@@ -329,22 +327,22 @@ static int acpi_battery_check(struct acp-------------------------------------------------------------------------- */ static struct proc_dir_entry *acpi_battery_dir; -static int acpi_battery_read_info (struct seq_file *seq,void *offset) +static void acpi_battery_read_info (struct seq_file *seq,void *offset) {int result =0 ; -struct acpi_battery *battery = (struct acpi_battery *)seq->private; +struct acpi_battery *battery = seq->private;struct acpi_battery_info *bif =NULL ;char *units ="?" ;if (!battery) - goto end; +return ;if (battery->flags.present)seq_printf (seq,"present: yes\n" );else {seq_printf (seq,"present: no\n" ); - goto end; +return ; }/* Battery Info (_BIF) */
@@ -402,10 +400,8 @@ static int acpi_battery_read_info(structseq_printf (seq,"battery type: %s\n" , bif->battery_type);seq_printf (seq,"OEM info: %s\n" , bif->oem_info); - end: +end:kfree (bif); - -return 0 ; }static int acpi_battery_info_open_fs (struct inode *inode,struct file *file)
@@ -413,22 +409,22 @@ static int acpi_battery_info_open_fs(strreturn single_open (file, acpi_battery_read_info,PDE (inode)->data); } -static int acpi_battery_read_state (struct seq_file *seq,void *offset) +static void acpi_battery_read_state (struct seq_file *seq,void *offset) {int result =0 ; -struct acpi_battery *battery = (struct acpi_battery *)seq->private; +struct acpi_battery *battery = seq->private;struct acpi_battery_status *bst =NULL ;char *units ="?" ;if (!battery) - goto end; +return ;if (battery->flags.present)seq_printf (seq,"present: yes\n" );else {seq_printf (seq,"present: no\n" ); - goto end; +return ; }/* Battery Units */
@@ -450,16 +446,15 @@ static int acpi_battery_read_state(strucelse seq_printf (seq,"capacity state: critical\n" ); -if ((bst->state &0x01 ) && (bst->state &0x02 )) { +if ((bst->state &0x01 ) && (bst->state &0x02 ))seq_printf (seq,"charging state: charging/discharging\n" ); - }else if (bst->state &0x01 ) +else if (bst->state &0x01 )seq_printf (seq,"charging state: discharging\n" );else if (bst->state &0x02 )seq_printf (seq,"charging state: charging\n" ); -else { +else seq_printf (seq,"charging state: charged\n" ); - }if (bst->present_rate ==ACPI_BATTERY_VALUE_UNKNOWN )seq_printf (seq,"present rate: unknown\n" );
@@ -479,10 +474,8 @@ static int acpi_battery_read_state(strucseq_printf (seq,"present voltage: %d mV\n" , (u32 ) bst->present_voltage); - end: +end:kfree (bst); - -return 0 ; }static int acpi_battery_state_open_fs (struct inode *inode,struct file *file)
@@ -490,18 +483,18 @@ static int acpi_battery_state_open_fs(streturn single_open (file, acpi_battery_read_state,PDE (inode)->data); } -static int acpi_battery_read_alarm (struct seq_file *seq,void *offset) +static void acpi_battery_read_alarm (struct seq_file *seq,void *offset) { -struct acpi_battery *battery = (struct acpi_battery *)seq->private; +struct acpi_battery *battery = seq->private;char *units ="?" ;if (!battery) - goto end; +return ;if (!battery->flags.present) {seq_printf (seq,"present: no\n" ); - goto end; +return ; }/* Battery Units */
@@ -517,9 +510,6 @@ static int acpi_battery_read_alarm(strucseq_printf (seq,"unsupported\n" ); else seq_printf(seq, "%d %sh\n", (u32) battery->alarm, units); - - end: -return 0 ; } static ssize_t
@@ -529,8 +519,8 @@ acpi_battery_write_alarm(struct file *fi {int result =0 ;char alarm_string[12 ] = {'\0' }; -struct seq_file *m = (struct seq_file *)file->private_data; -struct acpi_battery *battery = (struct acpi_battery *)m->private; +struct seq_file *m = file->private_data; +struct acpi_battery *battery = m->private;if (!battery || (count >sizeof (alarm_string) -1 ))
@@ -632,22 +622,20 @@ static int acpi_battery_add_fs(struct acreturn 0 ; } -static int acpi_battery_remove_fs (struct acpi_device *device) +static void acpi_battery_remove_fs (struct acpi_device *device) { +if (!acpi_device_dir (device)) +return ; -if (acpi_device_dir (device)) { -remove_proc_entry (ACPI_BATTERY_FILE_ALARM , -acpi_device_dir (device)); -remove_proc_entry (ACPI_BATTERY_FILE_STATUS , -acpi_device_dir (device)); -remove_proc_entry (ACPI_BATTERY_FILE_INFO , -acpi_device_dir (device)); - -remove_proc_entry (acpi_device_bid (device), acpi_battery_dir); -acpi_device_dir (device) =NULL ; - } +remove_proc_entry (ACPI_BATTERY_FILE_ALARM , +acpi_device_dir (device)); +remove_proc_entry (ACPI_BATTERY_FILE_STATUS , +acpi_device_dir (device)); +remove_proc_entry (ACPI_BATTERY_FILE_INFO , +acpi_device_dir (device)); -return 0 ; +remove_proc_entry (acpi_device_bid (device), acpi_battery_dir); +acpi_device_dir (device) =NULL ; }/* --------------------------------------------------------------------------
@@ -656,7 +644,7 @@ static int acpi_battery_remove_fs(structstatic void acpi_battery_notify (acpi_handle handle,u32 event,void *data) { -struct acpi_battery *battery = (struct acpi_battery *)data; +struct acpi_battery *battery = data;struct acpi_device *device =NULL ;
@@ -678,8 +666,6 @@ static void acpi_battery_notify(acpi_han "Unsupported event [0x%x]\n", event));break ; } - -return ; }static int acpi_battery_add (struct acpi_device *device)
@@ -692,10 +678,9 @@ static int acpi_battery_add(struct acpi_if (!device)return -EINVAL ; - battery =kmalloc (sizeof (struct acpi_battery ),GFP_KERNEL ); + battery =kzalloc (sizeof (*battery),GFP_KERNEL );if (!battery)return -ENOMEM ; -memset (battery,0 ,sizeof (struct acpi_battery )); battery->device = device;strcpy (acpi_device_name (device),ACPI_BATTERY_DEVICE_NAME );
@@ -722,7 +707,7 @@ static int acpi_battery_add(struct acpi_ACPI_BATTERY_DEVICE_NAME ,acpi_device_bid (device), device->status.battery_present ? "present" : "absent"); - end: +end:if (result) {acpi_battery_remove_fs (device);kfree (battery);
@@ -740,7 +725,7 @@ static int acpi_battery_remove(struct acif (!device || !acpi_driver_data (device))return -EINVAL ; - battery = (struct acpi_battery *)acpi_driver_data (device); + battery =acpi_driver_data (device); status = acpi_remove_notify_handler(device->handle, ACPI_ALL_NOTIFY,
@@ -772,12 +757,8 @@ static int __init acpi_battery_init(void static void __exit acpi_battery_exit(void) { -acpi_bus_unregister_driver (&acpi_battery_driver); -acpi_unlock_battery_dir (acpi_battery_dir); - -return ; }module_init (acpi_battery_init);