Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dde67d50 authored by Jasmin Jessich's avatar Jasmin Jessich Committed by Mauro Carvalho Chehab
Browse files

media: Revert cleanup ktime_set() usage 



This reverts 8b0e1953, 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: default avatarJasmin Jessich <jasmin@anw.at>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent b3bc535a

drivers/media/dvb-core/dmxdev.c

+1 −1
Original line number Diff line number Diff line
@@ -622,7 +622,7 @@ static int dvb_dmxdev_start_feed(struct dmxdev *dmxdev, 
				 struct dmxdev_filter *filter,

				 struct dmxdev_feed *feed)

{

	ktime_t timeout = 0;

	ktime_t timeout = ktime_set(0, 0);

	struct dmx_pes_filter_params *para = &filter->params.pes;

	enum dmx_output otype;

	int ret;

drivers/media/pci/cx88/cx88-input.c

+4 −2
Original line number Diff line number Diff line
@@ -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);



	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)

		ir_dprintk("Missed ticks %ld\n", missed - 1);
@@ -200,7 +201,8 @@ static int __cx88_ir_start(void *priv) 
	if (ir->polling) {

		hrtimer_init(&ir->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);

		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);

	}

	if (ir->sampling) {

drivers/media/pci/pt3/pt3.c

+1 −1
Original line number Diff line number Diff line
@@ -444,7 +444,7 @@ static int pt3_fetch_thread(void *data) 


		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);

		freezable_schedule_hrtimeout_range(&delay,

					PT3_FETCH_DELAY_DELTA * NSEC_PER_MSEC,