lkml.org 
[lkml]   [2015]   [May]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 2/2] staging: dgnc: switch timeout to signed type
Date
The schedule_timeout*() helpers take the timeout as signed long, as
ch_close_delay in struct channel_t was not used for other purposes its
type was switched to signed long and the declarations fixed up.

Patch was compile tested with x86_64_defconfig + CONFIG_STAGING=y,
CONFIG_DGNC=m

Patch is against 4.1-rc5 (localversion-next is -next-20150529)

Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
---
Note that there is a "over 80 char" warning here that was not fixed as
there are quite a few in dgnc_driver.h.

drivers/staging/dgnc/dgnc_driver.h | 2 +-
drivers/staging/dgnc/dgnc_utils.c | 2 +-
drivers/staging/dgnc/dgnc_utils.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/dgnc/dgnc_driver.h b/drivers/staging/dgnc/dgnc_driver.h
index f77fed5..5cbeb4d 100644
--- a/drivers/staging/dgnc/dgnc_driver.h
+++ b/drivers/staging/dgnc/dgnc_driver.h
@@ -320,7 +320,7 @@ struct channel_t {
uint ch_open_count; /* open count */
uint ch_flags; /* Channel flags */

- ulong ch_close_delay; /* How long we should drop RTS/DTR for */
+ long ch_close_delay; /* How long we should drop RTS/DTR for */

ulong ch_cpstime; /* Time for CPS calculations */

diff --git a/drivers/staging/dgnc/dgnc_utils.c b/drivers/staging/dgnc/dgnc_utils.c
index 0cbb8a1..4f7f86b 100644
--- a/drivers/staging/dgnc/dgnc_utils.c
+++ b/drivers/staging/dgnc/dgnc_utils.c
@@ -10,7 +10,7 @@
*
* Returns 0 if timed out, !0 (showing signal) if interrupted by a signal.
*/
-int dgnc_ms_sleep(ulong ms)
+int dgnc_ms_sleep(signed long ms)
{
schedule_timeout_interruptible(msecs_to_jiffies(ms));
return signal_pending(current);
diff --git a/drivers/staging/dgnc/dgnc_utils.h b/drivers/staging/dgnc/dgnc_utils.h
index 1164c3a..44cb479 100644
--- a/drivers/staging/dgnc/dgnc_utils.h
+++ b/drivers/staging/dgnc/dgnc_utils.h
@@ -1,6 +1,6 @@
#ifndef __DGNC_UTILS_H
#define __DGNC_UTILS_H

-int dgnc_ms_sleep(ulong ms);
+int dgnc_ms_sleep(signed long ms);

#endif
--
1.7.10.4


\
 
 \ /
  Last update: 2015-05-29 19:21    [W:0.063 / U:3.888 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site