hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

media: cec-pin.c: use proper ktime accessor functions 

Use ktime_to_ns/ns_to_ktime. This makes it possible to work with older kernels
and the media_build compatibility system.

For the mainline kernel these functions are NOPs.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Hans Verkuil <hansverk@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Hans Verkuil 2017-09-01 04:37:54 -04:00 committed by Mauro Carvalho Chehab
parent 845d6524d6
commit 805f23af6f
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/media/cec/cec-pin.c
View File

@ -132,7 +132,7 @@ static void cec_pin_to_idle(struct cec_pin *pin)
pin->rx_msg.len = 0; pin->rx_msg.len = 0;
memset(pin->rx_msg.msg, 0, sizeof(pin->rx_msg.msg)); memset(pin->rx_msg.msg, 0, sizeof(pin->rx_msg.msg));
pin->state = CEC_ST_IDLE; pin->state = CEC_ST_IDLE;
pin->ts = 0; pin->ts = ns_to_ktime(0);
} }
/* /*
@ -426,7 +426,7 @@ static void cec_pin_rx_states(struct cec_pin *pin, ktime_t ts)
v = cec_pin_read(pin); v = cec_pin_read(pin);
if (v && pin->rx_eom) { if (v && pin->rx_eom) {
pin->work_rx_msg = pin->rx_msg; pin->work_rx_msg = pin->rx_msg;
pin->work_rx_msg.rx_ts = ts; pin->work_rx_msg.rx_ts = ktime_to_ns(ts);
wake_up_interruptible(&pin->kthread_waitq); wake_up_interruptible(&pin->kthread_waitq);
pin->ts = ts; pin->ts = ts;
pin->state = CEC_ST_RX_ACK_FINISH; pin->state = CEC_ST_RX_ACK_FINISH;
@ -457,7 +457,7 @@ static enum hrtimer_restart cec_pin_timer(struct hrtimer *timer)
s32 delta; s32 delta;
ts = ktime_get(); ts = ktime_get();
if (pin->timer_ts) { if (ktime_to_ns(pin->timer_ts)) {
delta = ktime_us_delta(ts, pin->timer_ts); delta = ktime_us_delta(ts, pin->timer_ts);
pin->timer_cnt++; pin->timer_cnt++;
if (delta > 100 && pin->state != CEC_ST_IDLE) { if (delta > 100 && pin->state != CEC_ST_IDLE) {
@ -481,17 +481,19 @@ static enum hrtimer_restart cec_pin_timer(struct hrtimer *timer)
if (pin->wait_usecs > 150) { if (pin->wait_usecs > 150) {
pin->wait_usecs -= 100; pin->wait_usecs -= 100;
pin->timer_ts = ktime_add_us(ts, 100); pin->timer_ts = ktime_add_us(ts, 100);
hrtimer_forward_now(timer, 100000); hrtimer_forward_now(timer, ns_to_ktime(100000));
return HRTIMER_RESTART; return HRTIMER_RESTART;
} }
if (pin->wait_usecs > 100) { if (pin->wait_usecs > 100) {
pin->wait_usecs /= 2; pin->wait_usecs /= 2;
pin->timer_ts = ktime_add_us(ts, pin->wait_usecs); pin->timer_ts = ktime_add_us(ts, pin->wait_usecs);
hrtimer_forward_now(timer, pin->wait_usecs * 1000); hrtimer_forward_now(timer,
ns_to_ktime(pin->wait_usecs * 1000));
return HRTIMER_RESTART; return HRTIMER_RESTART;
} }
pin->timer_ts = ktime_add_us(ts, pin->wait_usecs); pin->timer_ts = ktime_add_us(ts, pin->wait_usecs);
hrtimer_forward_now(timer, pin->wait_usecs * 1000); hrtimer_forward_now(timer,
ns_to_ktime(pin->wait_usecs * 1000));
pin->wait_usecs = 0; pin->wait_usecs = 0;
return HRTIMER_RESTART; return HRTIMER_RESTART;
} }
@ -531,7 +533,7 @@ static enum hrtimer_restart cec_pin_timer(struct hrtimer *timer)
pin->state = CEC_ST_RX_START_BIT_LOW; pin->state = CEC_ST_RX_START_BIT_LOW;
break; break;
} }
if (pin->ts == 0) if (ktime_to_ns(pin->ts) == 0)
pin->ts = ts; pin->ts = ts;
if (pin->tx_msg.len) { if (pin->tx_msg.len) {
/* /*
@ -572,12 +574,13 @@ static enum hrtimer_restart cec_pin_timer(struct hrtimer *timer)
if (!adap->monitor_pin_cnt || states[pin->state].usecs <= 150) { if (!adap->monitor_pin_cnt || states[pin->state].usecs <= 150) {
pin->wait_usecs = 0; pin->wait_usecs = 0;
pin->timer_ts = ktime_add_us(ts, states[pin->state].usecs); pin->timer_ts = ktime_add_us(ts, states[pin->state].usecs);
hrtimer_forward_now(timer, states[pin->state].usecs * 1000); hrtimer_forward_now(timer,
ns_to_ktime(states[pin->state].usecs * 1000));
return HRTIMER_RESTART; return HRTIMER_RESTART;
} }
pin->wait_usecs = states[pin->state].usecs - 100; pin->wait_usecs = states[pin->state].usecs - 100;
pin->timer_ts = ktime_add_us(ts, 100); pin->timer_ts = ktime_add_us(ts, 100);
hrtimer_forward_now(timer, 100000); hrtimer_forward_now(timer, ns_to_ktime(100000));
return HRTIMER_RESTART; return HRTIMER_RESTART;
} }
@ -596,7 +599,7 @@ static int cec_pin_thread_func(void *_adap)
if (pin->work_rx_msg.len) { if (pin->work_rx_msg.len) {
cec_received_msg_ts(adap, &pin->work_rx_msg, cec_received_msg_ts(adap, &pin->work_rx_msg,
pin->work_rx_msg.rx_ts); ns_to_ktime(pin->work_rx_msg.rx_ts));
pin->work_rx_msg.len = 0; pin->work_rx_msg.len = 0;
} }
if (pin->work_tx_status) { if (pin->work_tx_status) {
@ -623,13 +626,15 @@ static int cec_pin_thread_func(void *_adap)
pin->ops->disable_irq(adap); pin->ops->disable_irq(adap);
cec_pin_high(pin); cec_pin_high(pin);
cec_pin_to_idle(pin); cec_pin_to_idle(pin);
hrtimer_start(&pin->timer, 0, HRTIMER_MODE_REL); hrtimer_start(&pin->timer, ns_to_ktime(0),
HRTIMER_MODE_REL);
break; break;
case CEC_PIN_IRQ_ENABLE: case CEC_PIN_IRQ_ENABLE:
pin->enable_irq_failed = !pin->ops->enable_irq(adap); pin->enable_irq_failed = !pin->ops->enable_irq(adap);
if (pin->enable_irq_failed) { if (pin->enable_irq_failed) {
cec_pin_to_idle(pin); cec_pin_to_idle(pin);
hrtimer_start(&pin->timer, 0, HRTIMER_MODE_REL); hrtimer_start(&pin->timer, ns_to_ktime(0),
HRTIMER_MODE_REL);
} }
break; break;
default: default:
@ -653,7 +658,7 @@ static int cec_pin_adap_enable(struct cec_adapter *adap, bool enable)
cec_pin_read(pin); cec_pin_read(pin);
cec_pin_to_idle(pin); cec_pin_to_idle(pin);
pin->tx_msg.len = 0; pin->tx_msg.len = 0;
pin->timer_ts = 0; pin->timer_ts = ns_to_ktime(0);
atomic_set(&pin->work_irq_change, CEC_PIN_IRQ_UNCHANGED); atomic_set(&pin->work_irq_change, CEC_PIN_IRQ_UNCHANGED);
pin->kthread = kthread_run(cec_pin_thread_func, adap, pin->kthread = kthread_run(cec_pin_thread_func, adap,
"cec-pin"); "cec-pin");
@ -661,7 +666,8 @@ static int cec_pin_adap_enable(struct cec_adapter *adap, bool enable)
pr_err("cec-pin: kernel_thread() failed\n"); pr_err("cec-pin: kernel_thread() failed\n");
return PTR_ERR(pin->kthread); return PTR_ERR(pin->kthread);
} }
hrtimer_start(&pin->timer, 0, HRTIMER_MODE_REL); hrtimer_start(&pin->timer, ns_to_ktime(0),
HRTIMER_MODE_REL);
} else { } else {
if (pin->ops->disable_irq) if (pin->ops->disable_irq)
pin->ops->disable_irq(adap); pin->ops->disable_irq(adap);
@ -699,7 +705,8 @@ static int cec_pin_adap_transmit(struct cec_adapter *adap, u8 attempts,
pin->ops->disable_irq(adap); pin->ops->disable_irq(adap);
cec_pin_high(pin); cec_pin_high(pin);
cec_pin_to_idle(pin); cec_pin_to_idle(pin);
hrtimer_start(&pin->timer, 0, HRTIMER_MODE_REL); hrtimer_start(&pin->timer, ns_to_ktime(0),
HRTIMER_MODE_REL);
} }
return 0; return 0;
} }