Skip to content

Commit

Permalink
fbdev: bfin-lq035q1-fb: Use dev_pm_ops
Browse files Browse the repository at this point in the history
Use dev_pm_ops instead of the legacy suspend/resume callbacks.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
  • Loading branch information
Lars-Peter Clausen authored and Tomi Valkeinen committed Jun 26, 2013
1 parent 2c30aba commit 0268d13
Showing 1 changed file with 14 additions and 8 deletions.
22 changes: 14 additions & 8 deletions drivers/video/bfin-lq035q1-fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -170,26 +170,33 @@ static int lq035q1_spidev_remove(struct spi_device *spi)
return lq035q1_control(spi, LQ035_SHUT_CTL, LQ035_SHUT);
}

#ifdef CONFIG_PM
static int lq035q1_spidev_suspend(struct spi_device *spi, pm_message_t state)
#ifdef CONFIG_PM_SLEEP
static int lq035q1_spidev_suspend(struct device *dev)
{
struct spi_device *spi = to_spi_device(dev);

return lq035q1_control(spi, LQ035_SHUT_CTL, LQ035_SHUT);
}

static int lq035q1_spidev_resume(struct spi_device *spi)
static int lq035q1_spidev_resume(struct device *dev)
{
int ret;
struct spi_device *spi = to_spi_device(dev);
struct spi_control *ctl = spi_get_drvdata(spi);
int ret;

ret = lq035q1_control(spi, LQ035_DRIVER_OUTPUT_CTL, ctl->mode);
if (ret)
return ret;

return lq035q1_control(spi, LQ035_SHUT_CTL, LQ035_ON);
}

static SIMPLE_DEV_PM_OPS(lq035q1_spidev_pm_ops, lq035q1_spidev_suspend,
lq035q1_spidev_resume);
#define LQ035Q1_SPIDEV_PM_OPS (&lq035q1_spidev_pm_ops)

#else
# define lq035q1_spidev_suspend NULL
# define lq035q1_spidev_resume NULL
#define LQ035Q1_SPIDEV_PM_OPS NULL
#endif

/* Power down all displays on reboot, poweroff or halt */
Expand Down Expand Up @@ -708,8 +715,7 @@ static int bfin_lq035q1_probe(struct platform_device *pdev)
info->spidrv.probe = lq035q1_spidev_probe;
info->spidrv.remove = lq035q1_spidev_remove;
info->spidrv.shutdown = lq035q1_spidev_shutdown;
info->spidrv.suspend = lq035q1_spidev_suspend;
info->spidrv.resume = lq035q1_spidev_resume;
info->spidrv.driver.pm = LQ035Q1_SPIDEV_PM_OPS;

ret = spi_register_driver(&info->spidrv);
if (ret < 0) {
Expand Down

0 comments on commit 0268d13

Please sign in to comment.