platform/x86: thinkpad_acpi: Sort headers for better maintenance
PATCH 1/2 platform/x86: thinkpad_acpi: Sort headers for better maintenance
It's quite hard to understand in that zillions of headers that are included if any specific one is already listed. Sort headers for better maintenance.
--- drivers/platform/x86/thinkpad_acpi.c | 58 +++++++++++++++------------- 1 file changed, 31 insertions(+), 27 deletions(-)
drivers/platform/x86/thinkpad_acpi.c +31 -27
@@ -34,46 +34,50 @@* thanks to Chris Wright <[email protected]> */ -#include <linux/kernel.h> -#include <linux/module.h> -#include <linux/init.h> -#include <linux/types.h> -#include <linux/string.h> -#include <linux/list.h> -#include <linux/mutex.h> -#include <linux/sched.h> -#include <linux/sched/signal.h> -#include <linux/kthread.h> -#include <linux/freezer.h> -#include <linux/delay.h> -#include <linux/slab.h> -#include <linux/nvram.h> -#include <linux/proc_fs.h> -#include <linux/seq_file.h> -#include <linux/sysfs.h> +#include <linux/acpi.h> #include <linux/backlight.h> #include <linux/bitops.h> +#include <linux/delay.h> +#include <linux/dmi.h> #include <linux/fb.h> -#include <linux/platform_device.h> +#include <linux/freezer.h> #include <linux/hwmon.h> #include <linux/hwmon-sysfs.h> +#include <linux/init.h> #include <linux/input.h> -#include <linux/leds.h> -#include <linux/rfkill.h> -#include <linux/dmi.h> #include <linux/jiffies.h> -#include <linux/workqueue.h> -#include <linux/acpi.h> +#include <linux/kernel.h> +#include <linux/kthread.h> +#include <linux/leds.h> +#include <linux/list.h> +#include <linux/module.h> +#include <linux/mutex.h> +#include <linux/nvram.h> #include <linux/pci.h> -#include <linux/power_supply.h> +#include <linux/platform_device.h> #include <linux/platform_profile.h> -#include <sound/core.h> -#include <sound/control.h> -#include <sound/initval.h> +#include <linux/power_supply.h> +#include <linux/proc_fs.h> +#include <linux/rfkill.h> +#include <linux/sched.h> +#include <linux/sched/signal.h> +#include <linux/seq_file.h> +#include <linux/slab.h> +#include <linux/string.h> +#include <linux/sysfs.h> +#include <linux/types.h> #include <linux/uaccess.h> +#include <linux/workqueue.h> +#include <acpi/battery.h> #include <acpi/video.h> +#include <drm/drm_privacy_screen_driver.h> + +#include <sound/control.h> +#include <sound/core.h> +#include <sound/initval.h> +#include "dual_accel_detect.h" /* ThinkPad CMOS commands */
Signature · 1 line
2.35.1
PATCH 2/2 platform/x86: thinkpad_acpi: Replace custom str_on_off() etc
Replace enabled(), onoff() and other similar places by str_*() helpers.
--- drivers/platform/x86/thinkpad_acpi.c | 55 +++++++++++----------------- 1 file changed, 21 insertions(+), 34 deletions(-)
drivers/platform/x86/thinkpad_acpi.c +21 -34
@@ -64,6 +64,7 @@#include <linux/seq_file.h> #include <linux/slab.h> #include <linux/string.h> +#include <linux/string_helpers.h> #include <linux/sysfs.h> #include <linux/types.h> #include <linux/uaccess.h>
@@ -261,8 +262,6 @@ enum tpacpi_hkey_event_t {#define TPACPI_DBG_BRGHT 0x0020#define TPACPI_DBG_MIXER 0x0040 -#define onoff (status, bit) ((status) & (1 << (bit)) ? "on" : "off") -#define enabled (status, bit) ((status) & (1 << (bit)) ? "enabled" : "disabled")#define strlencmp (a, b) (strncmp((a), (b), strlen(b)))
@@ -1316,9 +1315,7 @@ static int tpacpi_rfk_procfs_read(const enum tpacpi_rfk_id id, struct seq_file *return status; } -seq_printf (m,"status:\t\t%s\n" , - (status ==TPACPI_RFK_RADIO_ON ) ? -"enabled" :"disabled" ); +seq_printf (m,"status:\t\t%s\n" ,str_enabled_disabled (status ==TPACPI_RFK_RADIO_ON ));seq_printf (m,"commands:\tenable, disable\n" ); }
@@ -1345,8 +1342,7 @@ static int tpacpi_rfk_procfs_write(const enum tpacpi_rfk_id id, char *buf)if (status !=-1 ) {tpacpi_disclose_usertask ("procfs" ,"attempt to %s %s\n" , - (status ==TPACPI_RFK_RADIO_ON ) ? -"enable" :"disable" , +str_enable_disable (status ==TPACPI_RFK_RADIO_ON ), tpacpi_rfkill_names[id]); res = (tpacpi_rfkill_switches[id]->ops->set_status)(status);tpacpi_rfk_update_swstate (tpacpi_rfkill_switches[id]);
@@ -3503,8 +3499,7 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)if (acpi_evalf (hkey_handle, &status,"WLSW" ,"qd" )) { tp_features.hotkey_wlsw =1 ; radiosw_state = !!status; -pr_info ("radio switch found; radios are %s\n" , -enabled (status,0 )); +pr_info ("radio switch found; radios are %s\n" ,str_enabled_disabled (status &BIT (0 ))); } tabletsw_state =hotkey_init_tablet_mode ();
@@ -4163,7 +4158,7 @@ static int hotkey_read(struct seq_file *m)if (res)return res; -seq_printf (m,"status:\t\t%s\n" ,enabled (status,0 )); +seq_printf (m,"status:\t\t%s\n" ,str_enabled_disabled (status &BIT (0 )));if (hotkey_all_mask) {seq_printf (m,"mask:\t\t0x%08x\n" , hotkey_user_mask);seq_printf (m,"commands:\tenable, disable, reset, <mask>\n" );
@@ -4296,9 +4291,8 @@ static int bluetooth_set_status(enum tpacpi_rfkill_state state) {int status; -vdbg_printk (TPACPI_DBG_RFKILL , -"will attempt to %s bluetooth\n" , - (state ==TPACPI_RFK_RADIO_ON ) ?"enable" :"disable" ); +vdbg_printk (TPACPI_DBG_RFKILL ,"will attempt to %s bluetooth\n" , +str_enable_disable (state ==TPACPI_RFK_RADIO_ON ));#ifdef CONFIG_THINKPAD_ACPI_DEBUGFACILITIES if (dbg_bluetoothemul) {
@@ -4662,9 +4656,8 @@ static int wan_set_status(enum tpacpi_rfkill_state state) {int status; -vdbg_printk (TPACPI_DBG_RFKILL , -"will attempt to %s wwan\n" , - (state ==TPACPI_RFK_RADIO_ON ) ?"enable" :"disable" ); +vdbg_printk (TPACPI_DBG_RFKILL ,"will attempt to %s wwan\n" , +str_enable_disable (state ==TPACPI_RFK_RADIO_ON ));#ifdef CONFIG_THINKPAD_ACPI_DEBUGFACILITIES if (dbg_wwanemul) {
@@ -4840,9 +4833,8 @@ static int uwb_set_status(enum tpacpi_rfkill_state state) {int status; -vdbg_printk (TPACPI_DBG_RFKILL , -"will attempt to %s UWB\n" , - (state ==TPACPI_RFK_RADIO_ON ) ?"enable" :"disable" ); +vdbg_printk (TPACPI_DBG_RFKILL ,"will attempt to %s UWB\n" , +str_enable_disable (state ==TPACPI_RFK_RADIO_ON ));#ifdef CONFIG_THINKPAD_ACPI_DEBUGFACILITIES if (dbg_uwbemul) {
@@ -5196,11 +5188,11 @@ static int video_read(struct seq_file *m)return autosw;seq_printf (m,"status:\t\tsupported\n" ); -seq_printf (m,"lcd:\t\t%s\n" ,enabled (status,0 )); -seq_printf (m,"crt:\t\t%s\n" ,enabled (status,1 )); +seq_printf (m,"lcd:\t\t%s\n" ,str_enabled_disabled (status &BIT (0 ))); +seq_printf (m,"crt:\t\t%s\n" ,str_enabled_disabled (status &BIT (1 )));if (video_supported ==TPACPI_VIDEO_NEW ) -seq_printf (m,"dvi:\t\t%s\n" ,enabled (status,3 )); -seq_printf (m,"auto:\t\t%s\n" ,enabled (autosw,0 )); +seq_printf (m,"dvi:\t\t%s\n" ,str_enabled_disabled (status &BIT (3 ))); +seq_printf (m,"auto:\t\t%s\n" ,str_enabled_disabled (autosw &BIT (0 )));seq_printf (m,"commands:\tlcd_enable, lcd_disable\n" );seq_printf (m,"commands:\tcrt_enable, crt_disable\n" );if (video_supported ==TPACPI_VIDEO_NEW )
@@ -5631,7 +5623,7 @@ static int light_read(struct seq_file *m) status =light_get_status ();if (status <0 )return status; -seq_printf (m,"status:\t\t%s\n" ,onoff (status,0 )); +seq_printf (m,"status:\t\t%s\n" ,str_on_off (status &BIT (0 )));seq_printf (m,"commands:\ton, off\n" ); }
@@ -6087,9 +6079,7 @@ static int __init led_init(struct ibm_init_struct *iibm)return 0 ; } -#define str_led_status (s) \ - ((s) == TPACPI_LED_OFF ? "off" : \ - ((s) == TPACPI_LED_ON ? "on" : "blinking")) +#define str_led_status (s) ((s) >= TPACPI_LED_BLINK ? "blinking" : str_on_off(s))static int led_read (struct seq_file *m) {
@@ -6106,8 +6096,7 @@ static int led_read(struct seq_file *m) status =led_get_status (i);if (status <0 )return -EIO ; -seq_printf (m,"%d:\t\t%s\n" , - i,str_led_status (status)); +seq_printf (m,"%d:\t\t%s\n" , i,str_led_status (status)); } }
@@ -7832,8 +7821,7 @@ static int volume_read(struct seq_file *m)seq_printf (m,"level:\t\t%d\n" , status &TP_EC_AUDIO_LVL_MSK ); -seq_printf (m,"mute:\t\t%s\n" , -onoff (status,TP_EC_AUDIO_MUTESW )); +seq_printf (m,"mute:\t\t%s\n" ,str_on_off (status &BIT (TP_EC_AUDIO_MUTESW )));if (volume_control_allowed) {seq_printf (m,"commands:\tunmute, mute\n" );
@@ -9062,7 +9050,7 @@ static int fan_read(struct seq_file *m)seq_printf (m,"status:\t\t%s\n" "level:\t\t%d\n" , - (status !=0 ) ?"enabled" :"disabled" , status); +str_enabled_disabled (status), status);break ;case TPACPI_FAN_RD_TPEC :
@@ -9071,8 +9059,7 @@ static int fan_read(struct seq_file *m)if (rc)return rc; -seq_printf (m,"status:\t\t%s\n" , - (status !=0 ) ?"enabled" :"disabled" ); +seq_printf (m,"status:\t\t%s\n" ,str_enabled_disabled (status)); rc =fan_get_speed (&speed);if (rc <0 )
Signature · 1 line
2.35.1
Hi,
Quoted 7 lines · Andy Shevchenko
It's quite hard to understand in that zillions of headers that are included if any specific one is already listed. Sort headers for better maintenance.
Signed-off-by Andy Shevchenko <[email protected]>--- drivers/platform/x86/thinkpad_acpi.c | 58 +++++++++++++++------------- 1 file changed, 31 insertions(+), 27 deletions(-)
Thank you for your patch-series, I've applied the series to my review-hans branch:
https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=review-hans
Note it will show up in my review-hans branch once I've pushed my local branch there, which might take a while.
Once I've run some tests on this branch the patches there will be added to the platform-drivers-x86/for-next branch and eventually will be included in the pdx86 pull-request to Linus for the next merge-window.
Regards,
Hans
Quoted 83 lines
drivers/platform/x86/thinkpad_acpi.c +31
-27@@ -34,46 +34,50 @@* thanks to Chris Wright <[email protected]> */ -#include <linux/kernel.h> -#include <linux/module.h> -#include <linux/init.h> -#include <linux/types.h> -#include <linux/string.h> -#include <linux/list.h> -#include <linux/mutex.h> -#include <linux/sched.h> -#include <linux/sched/signal.h> -#include <linux/kthread.h> -#include <linux/freezer.h> -#include <linux/delay.h> -#include <linux/slab.h> -#include <linux/nvram.h> -#include <linux/proc_fs.h> -#include <linux/seq_file.h> -#include <linux/sysfs.h> +#include <linux/acpi.h> #include <linux/backlight.h> #include <linux/bitops.h> +#include <linux/delay.h> +#include <linux/dmi.h> #include <linux/fb.h> -#include <linux/platform_device.h> +#include <linux/freezer.h> #include <linux/hwmon.h> #include <linux/hwmon-sysfs.h> +#include <linux/init.h> #include <linux/input.h> -#include <linux/leds.h> -#include <linux/rfkill.h> -#include <linux/dmi.h> #include <linux/jiffies.h> -#include <linux/workqueue.h> -#include <linux/acpi.h> +#include <linux/kernel.h> +#include <linux/kthread.h> +#include <linux/leds.h> +#include <linux/list.h> +#include <linux/module.h> +#include <linux/mutex.h> +#include <linux/nvram.h> #include <linux/pci.h> -#include <linux/power_supply.h> +#include <linux/platform_device.h> #include <linux/platform_profile.h> -#include <sound/core.h> -#include <sound/control.h> -#include <sound/initval.h> +#include <linux/power_supply.h> +#include <linux/proc_fs.h> +#include <linux/rfkill.h> +#include <linux/sched.h> +#include <linux/sched/signal.h> +#include <linux/seq_file.h> +#include <linux/slab.h> +#include <linux/string.h> +#include <linux/sysfs.h> +#include <linux/types.h> #include <linux/uaccess.h> +#include <linux/workqueue.h> +#include <acpi/battery.h> #include <acpi/video.h> +#include <drm/drm_privacy_screen_driver.h> + +#include <sound/control.h> +#include <sound/core.h> +#include <sound/initval.h> +#include "dual_accel_detect.h" /* ThinkPad CMOS commands */