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

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
...@@ -55,7 +55,7 @@ static void pwm_backlight_power_on(struct pwm_bl_data *pb, int brightness) ...@@ -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"); dev_err(pb->dev, "failed to enable power supply\n");
if (pb->enable_gpio) if (pb->enable_gpio)
gpiod_set_value(pb->enable_gpio, 1); gpiod_set_value_cansleep(pb->enable_gpio, 1);
pwm_enable(pb->pwm); pwm_enable(pb->pwm);
pb->enabled = true; pb->enabled = true;
...@@ -70,7 +70,7 @@ static void pwm_backlight_power_off(struct pwm_bl_data *pb) ...@@ -70,7 +70,7 @@ static void pwm_backlight_power_off(struct pwm_bl_data *pb)
pwm_disable(pb->pwm); pwm_disable(pb->pwm);
if (pb->enable_gpio) if (pb->enable_gpio)
gpiod_set_value(pb->enable_gpio, 0); gpiod_set_value_cansleep(pb->enable_gpio, 0);
regulator_disable(pb->power_supply); regulator_disable(pb->power_supply);
pb->enabled = false; pb->enabled = false;
......
...@@ -163,7 +163,6 @@ MODULE_DEVICE_TABLE(i2c, tosa_bl_id); ...@@ -163,7 +163,6 @@ MODULE_DEVICE_TABLE(i2c, tosa_bl_id);
static struct i2c_driver tosa_bl_driver = { static struct i2c_driver tosa_bl_driver = {
.driver = { .driver = {
.name = "tosa-bl", .name = "tosa-bl",
.owner = THIS_MODULE,
.pm = &tosa_bl_pm_ops, .pm = &tosa_bl_pm_ops,
}, },
.probe = tosa_bl_probe, .probe = tosa_bl_probe,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment