diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-22 20:27:18 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-22 20:27:18 +0300 |
| commit | 4512d92b03a6ff4909bcde893752918a88cd4690 (patch) | |
| tree | 1a0d5dc8370bf26789c2f90d1f296d6d8f3c57fe /drivers/video/fbdev/omap2/omapfb/displays | |
| parent | 66615c4ee2874f07f09caa45c0c3f80973a75952 (diff) | |
| parent | 0b5e0f45af403cb6e9df574e1cb52691611dc0b8 (diff) | |
| download | linux-4512d92b03a6ff4909bcde893752918a88cd4690.tar.xz | |
Merge tag 'backlight-next-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight
Pull backlight updates from Lee Jones:
"New Functionality:
- Convert to GPIO descriptors
Fix-ups:
- Trivial: fix coding style in sky81452-backlight
- Ensure backlight state is known on bring-up in ktd253
- Use common platform API in qcom-wled and fbdev"
* tag 'backlight-next-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
backlight/video: Use Platform getter/setter functions
backlight: ktd253: Bring up in a known state
backlight: sky81452-backlight: Convert comma to semicolon
backlight: lms283gf05: Convert to GPIO descriptors
Diffstat (limited to 'drivers/video/fbdev/omap2/omapfb/displays')
| -rw-r--r-- | drivers/video/fbdev/omap2/omapfb/displays/panel-lgphilips-lb035q02.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/fbdev/omap2/omapfb/displays/panel-lgphilips-lb035q02.c b/drivers/video/fbdev/omap2/omapfb/displays/panel-lgphilips-lb035q02.c index 0f93a260e432..1bec7a4422e8 100644 --- a/drivers/video/fbdev/omap2/omapfb/displays/panel-lgphilips-lb035q02.c +++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-lgphilips-lb035q02.c @@ -239,7 +239,7 @@ static struct omap_dss_driver lb035q02_ops = { static int lb035q02_probe_of(struct spi_device *spi) { struct device_node *node = spi->dev.of_node; - struct panel_drv_data *ddata = dev_get_drvdata(&spi->dev); + struct panel_drv_data *ddata = spi_get_drvdata(spi); struct omap_dss_device *in; struct gpio_desc *gpio; @@ -277,7 +277,7 @@ static int lb035q02_panel_spi_probe(struct spi_device *spi) if (ddata == NULL) return -ENOMEM; - dev_set_drvdata(&spi->dev, ddata); + spi_set_drvdata(spi, ddata); ddata->spi = spi; @@ -318,7 +318,7 @@ err_gpio: static int lb035q02_panel_spi_remove(struct spi_device *spi) { - struct panel_drv_data *ddata = dev_get_drvdata(&spi->dev); + struct panel_drv_data *ddata = spi_get_drvdata(spi); struct omap_dss_device *dssdev = &ddata->dssdev; struct omap_dss_device *in = ddata->in; |