summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJia-Ju Bai <baijiaju1990@gmail.com>2018-01-26 23:19:15 +0800
committerMiguel Ojeda <miguel.ojeda.sandonis@gmail.com>2018-08-01 18:55:36 +0200
commit171613926abc9980e58cb36d5d54fe60e58a03a5 (patch)
tree76cb1991d1b22c85f916f5ca7c5cfcc5c959f215 /drivers
parentacb1872577b346bd15ab3a3f8dff780d6cca4b70 (diff)
downloadlinux-stable-171613926abc9980e58cb36d5d54fe60e58a03a5.tar.gz
linux-stable-171613926abc9980e58cb36d5d54fe60e58a03a5.tar.bz2
linux-stable-171613926abc9980e58cb36d5d54fe60e58a03a5.zip
auxdisplay: charlcd: delete mdelay in long_sleep
The function long_sleep() calls mdelay() when in an interrupt handler. But only charlcd_clear_display() and charlcd_init_display calls long_sleep(), and my tool finds that the two functions are never called in an interrupt handler. Thus mdelay() and in_interrupt() are not necessary. This is found by a static analysis tool named DCNS written by myself. Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com> Acked-by: Willy Tarreau <w@1wt.eu> Signed-off-by: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/auxdisplay/charlcd.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/auxdisplay/charlcd.c b/drivers/auxdisplay/charlcd.c
index 8673fc2b9eb8..81c22d20d9d9 100644
--- a/drivers/auxdisplay/charlcd.c
+++ b/drivers/auxdisplay/charlcd.c
@@ -99,10 +99,7 @@ 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));
+ schedule_timeout_interruptible(msecs_to_jiffies(ms));
}
/* turn the backlight on or off */