mirror of
https://github.com/torvalds/linux.git
synced 2026-06-06 13:37:36 +02:00
- Fix-ups
- Remove unused .owner assignment; tosa_bl
- Enable GPIO sleeping; pwm_bl
-----BEGIN PGP SIGNATURE-----
iQIcBAABCAAGBQJX9jERAAoJEFGvii+H/Hdh9G4QAIekjeSNslU2HWtm5LWC19vV
6mgvBqmEoRR1BEYmuJJB8V1PY1u39fnOC7e4jHJheWwP0rrZ+N+MKqS5ME0O6Jqo
s/rthPwILJfqEjNUU3C6yvetUvmXelDGUFES725n245t23nyLPGoa2IDBg6/Wr8B
Q2XcQGZVk/b5d6zp4BYe0IySEvgYBM8Jjs9KCN393und9A9ERQUUWJ2rtlBcJ6pt
sSOCg6DknexyfKJUZg/c5mLqgIjXNNs4Lcx/mCJ60UXvhHewooJdY+QaYb43ApMT
xLItOGHtvQToypFoWJU47yoPAij0FhJV9/wzIECOeJGpiKBbDB8IfrVRfSY1xpsJ
JdmwTmapVe4eTmTVKsOWzVYD7FTJH4XVQqEoILFIOrjB+ODD7StFlKtKNHE3htb8
KLai4vBVERzPzvcRvcBygMFTVbLFleWFx97PTYbvC6vE9SvL7PiiAzBbH4JcyLaE
kumCaWuwa585NWvlogodkyySpohm+K6aV2gAL5qnqy+TlZ2sh0C6d0hShgIBCwiy
wT4kcLpkQK9V2VOTkL2NHeHnhst4UDqulXuaa3iOwCIf4m8+8UIVdskiHoshvXok
LPsyRHwiBHqbsaNlzdvvkfUQUJ6Wx0SKbc00/K1/mSU7wxEwoFVVq22bqqbcJBn2
D1sA7tKwHlnvF3N0i+KW
=NThN
-----END PGP SIGNATURE-----
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"
This commit is contained in:
commit
3477d168ba
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user