Merge branch 'vmwgfx-fixes-5.1' of git://people.freedesktop.org/~thomash/linux into...

[sfrench/cifs-2.6.git] / drivers / auxdisplay / arm-charlcd.c

diff --git a/drivers/auxdisplay/arm-charlcd.c b/drivers/auxdisplay/arm-charlcd.c
index 296fb30dfa006567c75715cb985e1c4a15c592f2..dea031484cc4874a4ccad0f47b45ff5208a05088 100644 (file)
--- a/drivers/auxdisplay/arm-charlcd.c
+++ b/drivers/auxdisplay/arm-charlcd.c
@@ -331,8 +331,7 @@ out_no_resource:
 
 static int charlcd_suspend(struct device *dev)
 {
-       struct platform_device *pdev = to_platform_device(dev);
-       struct charlcd *lcd = platform_get_drvdata(pdev);
+       struct charlcd *lcd = dev_get_drvdata(dev);
 
        /* Power the display off */
        charlcd_4bit_command(lcd, HD_DISPCTRL);
@@ -341,8 +340,7 @@ static int charlcd_suspend(struct device *dev)
 
 static int charlcd_resume(struct device *dev)
 {
-       struct platform_device *pdev = to_platform_device(dev);
-       struct charlcd *lcd = platform_get_drvdata(pdev);
+       struct charlcd *lcd = dev_get_drvdata(dev);
 
        /* Turn the display back on */
        charlcd_4bit_command(lcd, HD_DISPCTRL | HD_DISPCTRL_ON);