diff options
author | Sean Young <sean@mess.org> | 2017-12-02 07:47:16 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2017-12-18 15:18:39 -0500 |
commit | e607486c4cfcddbdbce5485f5bef8566352ffd05 (patch) | |
tree | 3cd07140a20611c72f77ce286d32e581ebd04407 | |
parent | 6a489f760ea1b789ebc01eed70e169ce58371360 (diff) |
media: imon: remove unused function tv2int
Since commit 9c7fd60e951d ("media: rc: Replace timeval with ktime_t in
imon.c"), the function tv2int() is no longer used. Remove it.
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
-rw-r--r-- | drivers/media/rc/imon.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/drivers/media/rc/imon.c b/drivers/media/rc/imon.c index 6c873a3c4720..950d068ba806 100644 --- a/drivers/media/rc/imon.c +++ b/drivers/media/rc/imon.c | |||
@@ -1168,29 +1168,6 @@ out: | |||
1168 | return retval; | 1168 | return retval; |
1169 | } | 1169 | } |
1170 | 1170 | ||
1171 | static inline int tv2int(const struct timeval *a, const struct timeval *b) | ||
1172 | { | ||
1173 | int usecs = 0; | ||
1174 | int sec = 0; | ||
1175 | |||
1176 | if (b->tv_usec > a->tv_usec) { | ||
1177 | usecs = 1000000; | ||
1178 | sec--; | ||
1179 | } | ||
1180 | |||
1181 | usecs += a->tv_usec - b->tv_usec; | ||
1182 | |||
1183 | sec += a->tv_sec - b->tv_sec; | ||
1184 | sec *= 1000; | ||
1185 | usecs /= 1000; | ||
1186 | sec += usecs; | ||
1187 | |||
1188 | if (sec < 0) | ||
1189 | sec = 1000; | ||
1190 | |||
1191 | return sec; | ||
1192 | } | ||
1193 | |||
1194 | /* | 1171 | /* |
1195 | * The directional pad behaves a bit differently, depending on whether this is | 1172 | * The directional pad behaves a bit differently, depending on whether this is |
1196 | * one of the older ffdc devices or a newer device. Newer devices appear to | 1173 | * one of the older ffdc devices or a newer device. Newer devices appear to |