Commit f75c1b29 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

staging: dgnc: delete dgnc_utils.c

There was just one function in it, and it duplicated what
msleep_interruptable() was doing, which is pointless, so delete it and
fix up the one calling site.

Cc: Lidza Louina <lidza.louina@gmail.com>
Cc: Mark Hounschell <markh@compro.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 78c00ccc
...@@ -2,4 +2,4 @@ obj-$(CONFIG_DGNC) += dgnc.o ...@@ -2,4 +2,4 @@ obj-$(CONFIG_DGNC) += dgnc.o
dgnc-objs := dgnc_cls.o dgnc_driver.o\ dgnc-objs := dgnc_cls.o dgnc_driver.o\
dgnc_mgmt.o dgnc_neo.o\ dgnc_mgmt.o dgnc_neo.o\
dgnc_tty.o dgnc_utils.o dgnc_tty.o
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
#include "dgnc_tty.h" #include "dgnc_tty.h"
#include "dgnc_neo.h" #include "dgnc_neo.h"
#include "dgnc_cls.h" #include "dgnc_cls.h"
#include "dgnc_utils.h"
/* Default transparent print information. */ /* Default transparent print information. */
...@@ -1229,7 +1228,7 @@ static void dgnc_tty_close(struct tty_struct *tty, struct file *file) ...@@ -1229,7 +1228,7 @@ static void dgnc_tty_close(struct tty_struct *tty, struct file *file)
if (ch->ch_close_delay) { if (ch->ch_close_delay) {
spin_unlock_irqrestore(&ch->ch_lock, spin_unlock_irqrestore(&ch->ch_lock,
flags); flags);
dgnc_ms_sleep(ch->ch_close_delay); msleep_interruptible(ch->ch_close_delay);
spin_lock_irqsave(&ch->ch_lock, flags); spin_lock_irqsave(&ch->ch_lock, flags);
} }
} }
......
// SPDX-License-Identifier: GPL-2.0
#include <linux/tty.h>
#include <linux/sched/signal.h>
#include "dgnc_utils.h"
/**
* dgnc_ms_sleep - Put the driver to sleep
* @ms - milliseconds to sleep
*
* Return: 0 if timed out, if interrupted by a signal return signal.
*/
int dgnc_ms_sleep(ulong ms)
{
__set_current_state(TASK_INTERRUPTIBLE);
schedule_timeout((ms * HZ) / 1000);
return signal_pending(current);
}
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef _DGNC_UTILS_H
#define _DGNC_UTILS_H
int dgnc_ms_sleep(ulong ms);
#endif /* _DGNC_UTILS_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment