Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1616631

[PATCH v2 02/11] platform/x86: fujitsu-laptop: switch to a managed backlight device

Show all headers | View raw

Use a managed backlight device to get rid of acpi_fujitsu_bl_remove().
Change the parent of the backlight device from NULL to the FUJ02B1 ACPI
device as the latter is required for the backlight device to work.

Signed-off-by: Michał Kępień <kernel@kempniu.pl>
---
 drivers/platform/x86/fujitsu-laptop.c | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
index 722250d1aa20..59107a599d22 100644
--- a/drivers/platform/x86/fujitsu-laptop.c
+++ b/drivers/platform/x86/fujitsu-laptop.c
@@ -565,17 +565,18 @@ static int acpi_fujitsu_bl_input_setup(struct acpi_device *device)
 	return input_register_device(fujitsu_bl->input);
 }
 
-static int fujitsu_backlight_register(void)
+static int fujitsu_backlight_register(struct acpi_device *device)
 {
-	struct backlight_properties props = {
+	const struct backlight_properties props = {
 		.brightness = fujitsu_bl->brightness_level,
 		.max_brightness = fujitsu_bl->max_brightness - 1,
 		.type = BACKLIGHT_PLATFORM
 	};
 	struct backlight_device *bd;
 
-	bd = backlight_device_register("fujitsu-laptop", NULL, NULL,
-				       &fujitsu_bl_ops, &props);
+	bd = devm_backlight_device_register(&device->dev, "fujitsu-laptop",
+					    &device->dev, NULL,
+					    &fujitsu_bl_ops, &props);
 	if (IS_ERR(bd))
 		return PTR_ERR(bd);
 
@@ -644,24 +645,13 @@ static int acpi_fujitsu_bl_add(struct acpi_device *device)
 		fujitsu_bl->max_brightness = FUJITSU_LCD_N_LEVELS;
 	get_lcd_level();
 
-	error = fujitsu_backlight_register();
+	error = fujitsu_backlight_register(device);
 	if (error)
 		return error;
 
 	return 0;
 }
 
-static int acpi_fujitsu_bl_remove(struct acpi_device *device)
-{
-	struct fujitsu_bl *fujitsu_bl = acpi_driver_data(device);
-
-	backlight_device_unregister(fujitsu_bl->bl_device);
-
-	fujitsu_bl->acpi_handle = NULL;
-
-	return 0;
-}
-
 /* Brightness notify */
 
 static void acpi_fujitsu_bl_notify(struct acpi_device *device, u32 event)
@@ -1092,7 +1082,6 @@ static struct acpi_driver acpi_fujitsu_bl_driver = {
 	.ids = fujitsu_bl_device_ids,
 	.ops = {
 		.add = acpi_fujitsu_bl_add,
-		.remove = acpi_fujitsu_bl_remove,
 		.notify = acpi_fujitsu_bl_notify,
 		},
 };
-- 
2.12.2

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 00/11] fujitsu-laptop: backlight cleanup Michał Kępień <kernel@kempniu.pl> - 2017-04-05 08:50 +0200
  [PATCH v2 11/11] platform/x86: fujitsu-laptop: remove redundant fields from struct fujitsu_bl Michał Kępień <kernel@kempniu.pl> - 2017-04-05 08:50 +0200
  [PATCH v2 10/11] platform/x86: fujitsu-laptop: account for backlight power when determining brightness Michał Kępień <kernel@kempniu.pl> - 2017-04-05 08:50 +0200
  [PATCH v2 07/11] platform/x86: fujitsu-laptop: make disable_brightness_adjust a boolean Michał Kępień <kernel@kempniu.pl> - 2017-04-05 08:50 +0200
  [PATCH v2 08/11] platform/x86: fujitsu-laptop: ignore errors when setting backlight power Michał Kępień <kernel@kempniu.pl> - 2017-04-05 09:00 +0200
  [PATCH v2 06/11] platform/x86: fujitsu-laptop: clean up use_alt_lcd_levels handling Michał Kępień <kernel@kempniu.pl> - 2017-04-05 09:00 +0200
  [PATCH v2 02/11] platform/x86: fujitsu-laptop: switch to a managed backlight device Michał Kępień <kernel@kempniu.pl> - 2017-04-05 09:00 +0200
  [PATCH v2 04/11] platform/x86: fujitsu-laptop: simplify set_lcd_level() Michał Kępień <kernel@kempniu.pl> - 2017-04-05 09:00 +0200
  [PATCH v2 05/11] platform/x86: fujitsu-laptop: sync brightness in set_lcd_level() Michał Kępień <kernel@kempniu.pl> - 2017-04-05 09:00 +0200
  [PATCH v2 01/11] platform/x86: fujitsu-laptop: only handle backlight when appropriate Michał Kępień <kernel@kempniu.pl> - 2017-04-05 09:00 +0200
  [PATCH v2 09/11] platform/x86: fujitsu-laptop: do not log set_lcd_level() failures in bl_update_status() Michał Kępień <kernel@kempniu.pl> - 2017-04-05 09:00 +0200
  [PATCH v2 03/11] platform/x86: fujitsu-laptop: merge set_lcd_level_alt() into set_lcd_level() Michał Kępień <kernel@kempniu.pl> - 2017-04-05 09:00 +0200
    Re: [PATCH v2 03/11] platform/x86: fujitsu-laptop: merge  set_lcd_level_alt() into set_lcd_level() Jonathan Woithe <jwoithe@just42.net> - 2017-04-07 14:00 +0200
      Re: [PATCH v2 03/11] platform/x86: fujitsu-laptop: merge  set_lcd_level_alt() into set_lcd_level() Jonathan Woithe <jwoithe@just42.net> - 2017-04-07 14:10 +0200
  Re: [PATCH v2 00/11] fujitsu-laptop: backlight cleanup Darren Hart <dvhart@infradead.org> - 2017-04-05 17:40 +0200
    Re: [PATCH v2 00/11] fujitsu-laptop: backlight cleanup Michał Kępień <kernel@kempniu.pl> - 2017-04-05 22:00 +0200
      Re: [PATCH v2 00/11] fujitsu-laptop: backlight cleanup Jonathan Woithe <jwoithe@just42.net> - 2017-04-06 02:50 +0200
        Re: [PATCH v2 00/11] fujitsu-laptop: backlight cleanup Darren Hart <dvhart@infradead.org> - 2017-04-06 05:10 +0200
          Re: [PATCH v2 00/11] fujitsu-laptop: backlight cleanup Jonathan Woithe <jwoithe@just42.net> - 2017-04-07 14:20 +0200
            Re: [PATCH v2 00/11] fujitsu-laptop: backlight cleanup Darren Hart <dvhart@infradead.org> - 2017-04-07 20:00 +0200

csiph-web