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

Commit eb39ad25 authored by Jingoo Han's avatar Jingoo Han Committed by Linus Torvalds
Browse files

backlight: vgg2432a4: convert vgg2432a4_driver to dev_pm_ops 



Instead of using legacy suspend/resume methods, using newer dev_pm_ops
structure allows better control over power management. Also, use of
pm_message_t is deprecated. Thus, it is removed.

Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1dde37d4

drivers/video/backlight/ili9320.c

+9 −15
Original line number Diff line number Diff line
@@ -270,14 +270,11 @@ int ili9320_remove(struct ili9320 *ili) 
}

EXPORT_SYMBOL_GPL(ili9320_remove);



#ifdef CONFIG_PM

int ili9320_suspend(struct ili9320 *lcd, pm_message_t state)

#ifdef CONFIG_PM_SLEEP

int ili9320_suspend(struct ili9320 *lcd)

{

	int ret;



	dev_dbg(lcd->dev, "%s: event %d\n", __func__, state.event);



	if (state.event == PM_EVENT_SUSPEND) {

	ret = ili9320_power(lcd, FB_BLANK_POWERDOWN);



	if (lcd->platdata->suspend == ILI9320_SUSPEND_DEEP) {
@@ -289,9 +286,6 @@ int ili9320_suspend(struct ili9320 *lcd, pm_message_t state) 


	return ret;

}



	return 0;

}

EXPORT_SYMBOL_GPL(ili9320_suspend);



int ili9320_resume(struct ili9320 *lcd)

drivers/video/backlight/ili9320.h

+1 −1
Original line number Diff line number Diff line
@@ -76,5 +76,5 @@ extern void ili9320_shutdown(struct ili9320 *lcd); 


/* PM */



extern int ili9320_suspend(struct ili9320 *lcd, pm_message_t state);

extern int ili9320_suspend(struct ili9320 *lcd);

extern int ili9320_resume(struct ili9320 *lcd);

drivers/video/backlight/vgg2432a4.c

+8 −10
Original line number Diff line number Diff line
@@ -205,18 +205,15 @@ static int vgg2432a4_lcd_init(struct ili9320 *lcd, 
	return ret;

}



#ifdef CONFIG_PM

static int vgg2432a4_suspend(struct spi_device *spi, pm_message_t state)

#ifdef CONFIG_PM_SLEEP

static int vgg2432a4_suspend(struct device *dev)

{

	return ili9320_suspend(spi_get_drvdata(spi), state);

	return ili9320_suspend(dev_get_drvdata(dev));

}

static int vgg2432a4_resume(struct spi_device *spi)

static int vgg2432a4_resume(struct device *dev)

{

	return ili9320_resume(spi_get_drvdata(spi));

	return ili9320_resume(dev_get_drvdata(dev));

}

#else

#define vgg2432a4_suspend	NULL

#define vgg2432a4_resume	NULL

#endif



static struct ili9320_client vgg2432a4_client = {
@@ -249,16 +246,17 @@ static void vgg2432a4_shutdown(struct spi_device *spi) 
	ili9320_shutdown(spi_get_drvdata(spi));

}



static SIMPLE_DEV_PM_OPS(vgg2432a4_pm_ops, vgg2432a4_suspend, vgg2432a4_resume);



static struct spi_driver vgg2432a4_driver = {

	.driver = {

		.name		= "VGG2432A4",

		.owner		= THIS_MODULE,

		.pm		= &vgg2432a4_pm_ops,

	},

	.probe		= vgg2432a4_probe,

	.remove		= vgg2432a4_remove,

	.shutdown	= vgg2432a4_shutdown,

	.suspend	= vgg2432a4_suspend,

	.resume		= vgg2432a4_resume,

};



module_spi_driver(vgg2432a4_driver);