diff options
author | Alan Jenkins <alan-jenkins@tuffmail.co.uk> | 2017-02-08 08:46:26 -0500 |
---|---|---|
committer | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2017-02-26 10:01:07 -0500 |
commit | 1650602691f4e8ea8f6e306452a72ac9a611932a (patch) | |
tree | 5438386d6d7d702e8966df9aff726407f1ad8ccc | |
parent | 6942eabc140eac54d5c0db2695eed63768209c34 (diff) |
platform/x86: fujitsu-laptop: make platform-related variables match naming convention
Replace "fujitsupf" with "fujitsu_pf" in all platform-related variable
names to match the module-wide naming convention.
Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
[kempniu: rebase patch, rewrite commit message]
Signed-off-by: Michał Kępień <kernel@kempniu.pl>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Jonathan Woithe <jwoithe@just42.net>
-rw-r--r-- | drivers/platform/x86/fujitsu-laptop.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c index 70124004b346..6cdd1b334e8a 100644 --- a/drivers/platform/x86/fujitsu-laptop.c +++ b/drivers/platform/x86/fujitsu-laptop.c | |||
@@ -607,7 +607,7 @@ static DEVICE_ATTR(lid, 0444, show_lid_state, ignore_store); | |||
607 | static DEVICE_ATTR(dock, 0444, show_dock_state, ignore_store); | 607 | static DEVICE_ATTR(dock, 0444, show_dock_state, ignore_store); |
608 | static DEVICE_ATTR(radios, 0444, show_radios_state, ignore_store); | 608 | static DEVICE_ATTR(radios, 0444, show_radios_state, ignore_store); |
609 | 609 | ||
610 | static struct attribute *fujitsupf_attributes[] = { | 610 | static struct attribute *fujitsu_pf_attributes[] = { |
611 | &dev_attr_brightness_changed.attr, | 611 | &dev_attr_brightness_changed.attr, |
612 | &dev_attr_max_brightness.attr, | 612 | &dev_attr_max_brightness.attr, |
613 | &dev_attr_lcd_level.attr, | 613 | &dev_attr_lcd_level.attr, |
@@ -617,11 +617,11 @@ static struct attribute *fujitsupf_attributes[] = { | |||
617 | NULL | 617 | NULL |
618 | }; | 618 | }; |
619 | 619 | ||
620 | static struct attribute_group fujitsupf_attribute_group = { | 620 | static struct attribute_group fujitsu_pf_attribute_group = { |
621 | .attrs = fujitsupf_attributes | 621 | .attrs = fujitsu_pf_attributes |
622 | }; | 622 | }; |
623 | 623 | ||
624 | static struct platform_driver fujitsupf_driver = { | 624 | static struct platform_driver fujitsu_pf_driver = { |
625 | .driver = { | 625 | .driver = { |
626 | .name = "fujitsu-laptop", | 626 | .name = "fujitsu-laptop", |
627 | } | 627 | } |
@@ -1226,7 +1226,7 @@ static int __init fujitsu_init(void) | |||
1226 | 1226 | ||
1227 | ret = | 1227 | ret = |
1228 | sysfs_create_group(&fujitsu_bl->pf_device->dev.kobj, | 1228 | sysfs_create_group(&fujitsu_bl->pf_device->dev.kobj, |
1229 | &fujitsupf_attribute_group); | 1229 | &fujitsu_pf_attribute_group); |
1230 | if (ret) | 1230 | if (ret) |
1231 | goto fail_platform_device2; | 1231 | goto fail_platform_device2; |
1232 | 1232 | ||
@@ -1251,7 +1251,7 @@ static int __init fujitsu_init(void) | |||
1251 | fujitsu_bl->bl_device->props.brightness = fujitsu_bl->brightness_level; | 1251 | fujitsu_bl->bl_device->props.brightness = fujitsu_bl->brightness_level; |
1252 | } | 1252 | } |
1253 | 1253 | ||
1254 | ret = platform_driver_register(&fujitsupf_driver); | 1254 | ret = platform_driver_register(&fujitsu_pf_driver); |
1255 | if (ret) | 1255 | if (ret) |
1256 | goto fail_backlight; | 1256 | goto fail_backlight; |
1257 | 1257 | ||
@@ -1284,12 +1284,12 @@ static int __init fujitsu_init(void) | |||
1284 | fail_laptop1: | 1284 | fail_laptop1: |
1285 | kfree(fujitsu_laptop); | 1285 | kfree(fujitsu_laptop); |
1286 | fail_laptop: | 1286 | fail_laptop: |
1287 | platform_driver_unregister(&fujitsupf_driver); | 1287 | platform_driver_unregister(&fujitsu_pf_driver); |
1288 | fail_backlight: | 1288 | fail_backlight: |
1289 | backlight_device_unregister(fujitsu_bl->bl_device); | 1289 | backlight_device_unregister(fujitsu_bl->bl_device); |
1290 | fail_sysfs_group: | 1290 | fail_sysfs_group: |
1291 | sysfs_remove_group(&fujitsu_bl->pf_device->dev.kobj, | 1291 | sysfs_remove_group(&fujitsu_bl->pf_device->dev.kobj, |
1292 | &fujitsupf_attribute_group); | 1292 | &fujitsu_pf_attribute_group); |
1293 | fail_platform_device2: | 1293 | fail_platform_device2: |
1294 | platform_device_del(fujitsu_bl->pf_device); | 1294 | platform_device_del(fujitsu_bl->pf_device); |
1295 | fail_platform_device1: | 1295 | fail_platform_device1: |
@@ -1308,12 +1308,12 @@ static void __exit fujitsu_cleanup(void) | |||
1308 | 1308 | ||
1309 | kfree(fujitsu_laptop); | 1309 | kfree(fujitsu_laptop); |
1310 | 1310 | ||
1311 | platform_driver_unregister(&fujitsupf_driver); | 1311 | platform_driver_unregister(&fujitsu_pf_driver); |
1312 | 1312 | ||
1313 | backlight_device_unregister(fujitsu_bl->bl_device); | 1313 | backlight_device_unregister(fujitsu_bl->bl_device); |
1314 | 1314 | ||
1315 | sysfs_remove_group(&fujitsu_bl->pf_device->dev.kobj, | 1315 | sysfs_remove_group(&fujitsu_bl->pf_device->dev.kobj, |
1316 | &fujitsupf_attribute_group); | 1316 | &fujitsu_pf_attribute_group); |
1317 | 1317 | ||
1318 | platform_device_unregister(fujitsu_bl->pf_device); | 1318 | platform_device_unregister(fujitsu_bl->pf_device); |
1319 | 1319 | ||