ACPI: sysfs: Use __ATTR_RO() and __ATTR_RW() macros
PATCH v2 1/2 ACPI: sysfs: Use __ATTR_RO() and __ATTR_RW() macros
We have a few open-coded __ATTR_RO() and __ATTR_RW() macros. Replace the custom code with generic macros.
Signed-off-by Andy Shevchenko <[email protected]>
---
v2: rebased on top of bleeding-edge (Rafael)
drivers/acpi/sysfs.c | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-)
drivers/acpi/sysfs.c +7 -16
@@ -907,27 +907,22 @@ static void __exit interrupt_stats_exit(void)delete_gpe_attr_array (); } -static ssize_t -acpi_show_profile (struct kobject *kobj,struct kobj_attribute *attr, -char *buf) +static ssize_t pm_profile_show (struct kobject *kobj,struct kobj_attribute *attr,char *buf) {return sprintf (buf,"%d\n" , acpi_gbl_FADT.preferred_profile); } -static const struct kobj_attribute pm_profile_attr = -__ATTR (pm_profile,S_IRUGO , acpi_show_profile,NULL ); +static const struct kobj_attribute pm_profile_attr =__ATTR_RO (pm_profile); -static ssize_t hotplug_enabled_show (struct kobject *kobj, -struct kobj_attribute *attr,char *buf) +static ssize_t enabled_show (struct kobject *kobj,struct kobj_attribute *attr,char *buf) {struct acpi_hotplug_profile *hotplug =to_acpi_hotplug_profile (kobj);return sprintf (buf,"%d\n" , hotplug->enabled); } -static ssize_t hotplug_enabled_store (struct kobject *kobj, -struct kobj_attribute *attr, -const char *buf,size_t size) +static ssize_t enabled_store (struct kobject *kobj,struct kobj_attribute *attr, +const char *buf,size_t size) {struct acpi_hotplug_profile *hotplug =to_acpi_hotplug_profile (kobj);unsigned int val;
@@ -939,9 +934,7 @@ static ssize_t hotplug_enabled_store(struct kobject *kobj,return size; } -static struct kobj_attribute hotplug_enabled_attr = -__ATTR (enabled,S_IRUGO |S_IWUSR , hotplug_enabled_show, - hotplug_enabled_store); +static struct kobj_attribute hotplug_enabled_attr =__ATTR_RW (enabled);static struct attribute *hotplug_profile_attrs[] = { &hotplug_enabled_attr.attr,
@@ -999,9 +992,7 @@ static ssize_t force_remove_store(struct kobject *kobj,return size; } -static const struct kobj_attribute force_remove_attr = -__ATTR (force_remove,S_IRUGO |S_IWUSR , force_remove_show, - force_remove_store); +static const struct kobj_attribute force_remove_attr =__ATTR_RW (force_remove);int __init acpi_sysfs_init (void ) {
Signature · 1 line
2.30.2
PATCH v2 2/2 ACPI: sysfs: Remove tailing return statement in void function
The tail return statement is redundant in void functions. Remove it.
Signed-off-by Andy Shevchenko <[email protected]>
---
v2: rebased on top of bleeding-edge (Rafael)
drivers/acpi/sysfs.c | 1 - 1 file changed, 1 deletion(-)
drivers/acpi/sysfs.c +0 -1
@@ -897,7 +897,6 @@ void acpi_irq_stats_init(void) fail:delete_gpe_attr_array (); -return ; } static void __exit interrupt_stats_exit(void)
Signature · 1 line
2.30.2
Re: [PATCH v2 2/2] ACPI: sysfs: Remove tailing return statement in void function
Quoted 15 lines · Andy Shevchenko
The tail return statement is redundant in void functions. Remove it.
Signed-off-by Andy Shevchenko <[email protected]>---
v2: rebased on top of bleeding-edge (Rafael)drivers/acpi/sysfs.c | 1 - 1 file changed, 1 deletion(-)drivers/acpi/sysfs.c +0
-0
drivers/acpi/sysfs.c void acpi_irq_stats_init(void)
Quoted 8 lines
drivers/acpi/sysfs.c +0
-2@@ -897,7 +897,6 @@ void acpi_irq_stats_init(void) fail:delete_gpe_attr_array (); -return ; } static void __exit interrupt_stats_exit(void) --
Applied as 5.14 material along with the [2/2], thanks!