Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3477d168 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'backlight-for-linus-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight 

Pull backlight updates from Lee Jones:
 "Fix-ups:

   - Remove unused .owner assignment; tosa_bl
   - Enable GPIO sleeping; pwm_bl"

* tag 'backlight-for-linus-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
  backlight: pwm_bl: Handle gpio that can sleep
  backlight-tosa: Delete unnecessary assignment for the field "owner"
parents 9a687aea 0c9501f8

drivers/video/backlight/pwm_bl.c

+2 −2
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ static void pwm_backlight_power_on(struct pwm_bl_data *pb, int brightness) 
		dev_err(pb->dev, "failed to enable power supply\n");



	if (pb->enable_gpio)

		gpiod_set_value(pb->enable_gpio, 1);

		gpiod_set_value_cansleep(pb->enable_gpio, 1);



	pwm_enable(pb->pwm);

	pb->enabled = true;
@@ -70,7 +70,7 @@ static void pwm_backlight_power_off(struct pwm_bl_data *pb) 
	pwm_disable(pb->pwm);



	if (pb->enable_gpio)

		gpiod_set_value(pb->enable_gpio, 0);

		gpiod_set_value_cansleep(pb->enable_gpio, 0);



	regulator_disable(pb->power_supply);

	pb->enabled = false;

drivers/video/backlight/tosa_bl.c

+0 −1
Original line number Diff line number Diff line
@@ -163,7 +163,6 @@ MODULE_DEVICE_TABLE(i2c, tosa_bl_id); 
static struct i2c_driver tosa_bl_driver = {

	.driver = {

		.name		= "tosa-bl",

		.owner		= THIS_MODULE,

		.pm		= &tosa_bl_pm_ops,

	},

	.probe		= tosa_bl_probe,