UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

media: Revert cleanup ktime_set() usage 

This reverts 8b0e195314, because media-tree drivers should use the
API functions to initialize variables of type ktime_t.

Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Jasmin Jessich <jasmin@anw.at>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Jasmin Jessich 2018-04-28 03:45:51 -04:00 committed by Mauro Carvalho Chehab
parent b3bc535a5c
commit dde67d50ef
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/dvb-core/dmxdev.c
View File

@ -622,7 +622,7 @@ static int dvb_dmxdev_start_feed(struct dmxdev *dmxdev,
struct dmxdev_filter *filter, struct dmxdev_filter *filter,
struct dmxdev_feed *feed) struct dmxdev_feed *feed)
{ {
ktime_t timeout = 0; ktime_t timeout = ktime_set(0, 0);
struct dmx_pes_filter_params *para = &filter->params.pes; struct dmx_pes_filter_params *para = &filter->params.pes;
enum dmx_output otype; enum dmx_output otype;
int ret; int ret;

6
drivers/media/pci/cx88/cx88-input.c
View File

@ -180,7 +180,8 @@ static enum hrtimer_restart cx88_ir_work(struct hrtimer *timer)
struct cx88_IR *ir = container_of(timer, struct cx88_IR, timer); struct cx88_IR *ir = container_of(timer, struct cx88_IR, timer);
cx88_ir_handle_key(ir); cx88_ir_handle_key(ir);
missed = hrtimer_forward_now(&ir->timer, ir->polling * 1000000LL); missed = hrtimer_forward_now(&ir->timer,
ktime_set(0, ir->polling * 1000000));
if (missed > 1) if (missed > 1)
ir_dprintk("Missed ticks %ld\n", missed - 1); ir_dprintk("Missed ticks %ld\n", missed - 1);
@ -200,7 +201,8 @@ static int __cx88_ir_start(void *priv)
if (ir->polling) { if (ir->polling) {
hrtimer_init(&ir->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); hrtimer_init(&ir->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
ir->timer.function = cx88_ir_work; ir->timer.function = cx88_ir_work;
hrtimer_start(&ir->timer, ir->polling * 1000000LL, hrtimer_start(&ir->timer,
ktime_set(0, ir->polling * 1000000),
HRTIMER_MODE_REL); HRTIMER_MODE_REL);
} }
if (ir->sampling) { if (ir->sampling) {

2
drivers/media/pci/pt3/pt3.c
View File

@ -444,7 +444,7 @@ static int pt3_fetch_thread(void *data)
pt3_proc_dma(adap); pt3_proc_dma(adap);
delay = PT3_FETCH_DELAY * NSEC_PER_MSEC; delay = ktime_set(0, PT3_FETCH_DELAY * NSEC_PER_MSEC);
set_current_state(TASK_UNINTERRUPTIBLE); set_current_state(TASK_UNINTERRUPTIBLE);
freezable_schedule_hrtimeout_range(&delay, freezable_schedule_hrtimeout_range(&delay,
PT3_FETCH_DELAY_DELTA * NSEC_PER_MSEC, PT3_FETCH_DELAY_DELTA * NSEC_PER_MSEC,