From 7652c18d5c658a155ec2708c574096ad22d1e8d1 Mon Sep 17 00:00:00 2001 From: Jingoo Han Date: Thu, 21 Feb 2013 16:43:35 -0800 Subject: [PATCH] backlight: s6e63m0: use spi_get_drvdata and spi_set_drvdata Use the wrapper functions for getting and setting the driver data using spi_device instead of using dev_{get|set}_drvdata with &spi->dev, so we can directly pass a struct spi_device Signed-off-by: Jingoo Han Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/video/backlight/s6e63m0.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/video/backlight/s6e63m0.c b/drivers/video/backlight/s6e63m0.c index 0969a4048..2126b96 100644 --- a/drivers/video/backlight/s6e63m0.c +++ b/drivers/video/backlight/s6e63m0.c @@ -793,7 +793,7 @@ static int s6e63m0_probe(struct spi_device *spi) lcd->power = FB_BLANK_UNBLANK; } - dev_set_drvdata(&spi->dev, lcd); + spi_set_drvdata(spi, lcd); dev_info(&spi->dev, "s6e63m0 panel driver has been probed.\n"); @@ -806,7 +806,7 @@ out_lcd_unregister: static int s6e63m0_remove(struct spi_device *spi) { - struct s6e63m0 *lcd = dev_get_drvdata(&spi->dev); + struct s6e63m0 *lcd = spi_get_drvdata(spi); s6e63m0_power(lcd, FB_BLANK_POWERDOWN); device_remove_file(&spi->dev, &dev_attr_gamma_table); @@ -820,7 +820,7 @@ static int s6e63m0_remove(struct spi_device *spi) #if defined(CONFIG_PM) static int s6e63m0_suspend(struct spi_device *spi, pm_message_t mesg) { - struct s6e63m0 *lcd = dev_get_drvdata(&spi->dev); + struct s6e63m0 *lcd = spi_get_drvdata(spi); dev_dbg(&spi->dev, "lcd->power = %d\n", lcd->power); @@ -833,7 +833,7 @@ static int s6e63m0_suspend(struct spi_device *spi, pm_message_t mesg) static int s6e63m0_resume(struct spi_device *spi) { - struct s6e63m0 *lcd = dev_get_drvdata(&spi->dev); + struct s6e63m0 *lcd = spi_get_drvdata(spi); lcd->power = FB_BLANK_POWERDOWN; @@ -847,7 +847,7 @@ static int s6e63m0_resume(struct spi_device *spi) /* Power down all displays on reboot, poweroff or halt. */ static void s6e63m0_shutdown(struct spi_device *spi) { - struct s6e63m0 *lcd = dev_get_drvdata(&spi->dev); + struct s6e63m0 *lcd = spi_get_drvdata(spi); s6e63m0_power(lcd, FB_BLANK_POWERDOWN); } -- 2.7.4