From ada953de4486a3e2a42c3b8146adb36d0dcbded2 Mon Sep 17 00:00:00 2001 From: Wolfram Sang Date: Thu, 19 Apr 2018 16:05:33 +0200 Subject: [PATCH] auxdisplay: simplify getting .drvdata We should get drvdata from struct device directly. Going via platform_device is an unneeded step back and forth. Signed-off-by: Wolfram Sang Acked-by: Linus Walleij Signed-off-by: Miguel Ojeda --- drivers/auxdisplay/arm-charlcd.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/auxdisplay/arm-charlcd.c b/drivers/auxdisplay/arm-charlcd.c index 296fb30dfa00..dea031484cc4 100644 --- a/drivers/auxdisplay/arm-charlcd.c +++ b/drivers/auxdisplay/arm-charlcd.c @@ -331,8 +331,7 @@ static int __init charlcd_probe(struct platform_device *pdev) 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);