diff options
Diffstat (limited to 'kernel/drivers/staging/iio/trigger')
-rw-r--r-- | kernel/drivers/staging/iio/trigger/iio-trig-bfin-timer.c | 11 | ||||
-rw-r--r-- | kernel/drivers/staging/iio/trigger/iio-trig-periodic-rtc.c | 7 |
2 files changed, 10 insertions, 8 deletions
diff --git a/kernel/drivers/staging/iio/trigger/iio-trig-bfin-timer.c b/kernel/drivers/staging/iio/trigger/iio-trig-bfin-timer.c index 3c1c8c6c4..035dd456d 100644 --- a/kernel/drivers/staging/iio/trigger/iio-trig-bfin-timer.c +++ b/kernel/drivers/staging/iio/trigger/iio-trig-bfin-timer.c @@ -79,7 +79,8 @@ static int iio_bfin_tmr_set_state(struct iio_trigger *trig, bool state) } static ssize_t iio_bfin_tmr_frequency_store(struct device *dev, - struct device_attribute *attr, const char *buf, size_t count) + struct device_attribute *attr, + const char *buf, size_t count) { struct iio_trigger *trig = to_iio_trigger(dev); struct bfin_tmr_state *st = iio_trigger_get_drvdata(trig); @@ -99,7 +100,7 @@ static ssize_t iio_bfin_tmr_frequency_store(struct device *dev, if (enabled) disable_gptimers(st->t->bit); - if (val == 0) + if (!val) return count; val = get_sclk() / val; @@ -116,15 +117,15 @@ static ssize_t iio_bfin_tmr_frequency_store(struct device *dev, } static ssize_t iio_bfin_tmr_frequency_show(struct device *dev, - struct device_attribute *attr, - char *buf) + struct device_attribute *attr, + char *buf) { struct iio_trigger *trig = to_iio_trigger(dev); struct bfin_tmr_state *st = iio_trigger_get_drvdata(trig); unsigned int period = get_gptimer_period(st->t->id); unsigned long val; - if (period == 0) + if (!period) val = 0; else val = get_sclk() / get_gptimer_period(st->t->id); diff --git a/kernel/drivers/staging/iio/trigger/iio-trig-periodic-rtc.c b/kernel/drivers/staging/iio/trigger/iio-trig-periodic-rtc.c index 0c1976dde..00d139331 100644 --- a/kernel/drivers/staging/iio/trigger/iio-trig-periodic-rtc.c +++ b/kernel/drivers/staging/iio/trigger/iio-trig-periodic-rtc.c @@ -37,9 +37,9 @@ static int iio_trig_periodic_rtc_set_state(struct iio_trigger *trig, bool state) if (trig_info->frequency == 0 && state) return -EINVAL; dev_dbg(&trig_info->rtc->dev, "trigger frequency is %u\n", - trig_info->frequency); + trig_info->frequency); ret = rtc_irq_set_state(trig_info->rtc, &trig_info->task, state); - if (ret == 0) + if (!ret) trig_info->state = state; return ret; @@ -74,8 +74,9 @@ static ssize_t iio_trig_periodic_write_freq(struct device *dev, if (ret == 0 && trig_info->state && trig_info->frequency == 0) ret = rtc_irq_set_state(trig_info->rtc, &trig_info->task, 1); - } else + } else { ret = rtc_irq_set_state(trig_info->rtc, &trig_info->task, 0); + } if (ret) goto error_ret; |