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

Commit 25ca1d74 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'auxdisplay-for-linus-v4.19' of git://github.com/ojeda/linux 

Pull auxdisplay updates from Miguel Ojeda:
 "Two cleanups for char_lcd:

   - simplify getting .drvdata (Wolfram Sang)

   - delete mdelay in long_sleep (Jia-Ju Bai)"

* tag 'auxdisplay-for-linus-v4.19' of git://github.com/ojeda/linux:
  auxdisplay: simplify getting .drvdata
  auxdisplay: charlcd: delete mdelay in long_sleep
parents 70b20dd7 ada953de

drivers/auxdisplay/arm-charlcd.c

+2 −4
Original line number Diff line number Diff line
@@ -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);

drivers/auxdisplay/charlcd.c

+1 −4
Original line number Diff line number Diff line
@@ -99,9 +99,6 @@ static atomic_t charlcd_available = ATOMIC_INIT(1); 
/* sleeps that many milliseconds with a reschedule */

static void long_sleep(int ms)

{

	if (in_interrupt())

		mdelay(ms);

	else

	schedule_timeout_interruptible(msecs_to_jiffies(ms));

}