Commit b69e4785 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'backlight-next-7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight 

Pull backlight updates from Lee Jones:
 "Apple Backlight:
   - Convert the Apple Backlight ACPI driver to a proper platform
     driver, aligning with current ACPI binding practices

  Skyworks SKY81452:
   - Check the return value of `devm_gpiod_get_optional()`
     to properly handle GPIO acquisition errors"

* tag 'backlight-next-7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
  backlight: apple_bl: Convert to a platform driver
  backlight: sky81452-backlight: Check return value of devm_gpiod_get_optional() in sky81452_bl_parse_dt()
parents d884efd3 04d8f3fd

drivers/video/backlight/apple_bl.c

+11 −10
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/pci.h>

#include <linux/acpi.h>

#include <linux/atomic.h>

#include <linux/platform_device.h>

#include <acpi/video.h>



static struct backlight_device *apple_backlight_device;
@@ -134,7 +135,7 @@ static const struct hw_data nvidia_chipset_data = { 
	.set_brightness = nvidia_chipset_set_brightness,

};



static int apple_bl_add(struct acpi_device *dev)

static int apple_bl_probe(struct platform_device *pdev)

{

	struct backlight_properties props;

	struct pci_dev *host;
@@ -193,7 +194,7 @@ static int apple_bl_add(struct acpi_device *dev) 
	return 0;

}



static void apple_bl_remove(struct acpi_device *dev)

static void apple_bl_remove(struct platform_device *pdev)

{

	backlight_device_unregister(apple_backlight_device);
@@ -206,12 +207,12 @@ static const struct acpi_device_id apple_bl_ids[] = { 
	{"", 0},

};



static struct acpi_driver apple_bl_driver = {

	.name = "Apple backlight",

	.ids = apple_bl_ids,

	.ops = {

		.add = apple_bl_add,

static struct platform_driver apple_bl_driver = {

	.probe = apple_bl_probe,

	.remove = apple_bl_remove,

	.driver = {

		.name = "Apple backlight",

		.acpi_match_table = apple_bl_ids,

	},

};
@@ -224,12 +225,12 @@ static int __init apple_bl_init(void) 
	if (acpi_video_get_backlight_type() != acpi_backlight_vendor)

		return -ENODEV;



	return acpi_bus_register_driver(&apple_bl_driver);

	return platform_driver_register(&apple_bl_driver);

}



static void __exit apple_bl_exit(void)

{

	acpi_bus_unregister_driver(&apple_bl_driver);

	platform_driver_unregister(&apple_bl_driver);

}



module_init(apple_bl_init);

drivers/video/backlight/sky81452-backlight.c

+3 −0
Original line number Diff line number Diff line
@@ -202,6 +202,9 @@ static struct sky81452_bl_platform_data *sky81452_bl_parse_dt( 
	pdata->dpwm_mode = of_property_read_bool(np, "skyworks,dpwm-mode");

	pdata->phase_shift = of_property_read_bool(np, "skyworks,phase-shift");

	pdata->gpiod_enable = devm_gpiod_get_optional(dev, NULL, GPIOD_OUT_HIGH);

	if (IS_ERR(pdata->gpiod_enable))

		return dev_err_cast_probe(dev, pdata->gpiod_enable,

					  "failed to get gpio\n");



	ret = of_property_count_u32_elems(np, "led-sources");

	if (ret < 0) {