Merge tag 'staging-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[deliverable/linux.git] / drivers / staging / iio / adc / spear_adc.c

diff --git a/drivers/staging/iio/adc/spear_adc.c b/drivers/staging/iio/adc/spear_adc.c
index 750697832b9649b4936a89551d58a02e921ed189..8ad71691fc090cf183f158291f8a352810a17075 100644 (file)
--- a/drivers/staging/iio/adc/spear_adc.c
+++ b/drivers/staging/iio/adc/spear_adc.c
@@ -98,7 +98,7 @@ static void spear_adc_set_clk(struct spear_adc_state *st, u32 val)
        u32 clk_high, clk_low, count;
        u32 apb_clk = clk_get_rate(st->clk);
 
-       count = (apb_clk + val - 1) / val;
+       count = DIV_ROUND_UP(apb_clk, val);
        clk_low = count / 2;
        clk_high = count - clk_low;
        st->current_clk = apb_clk / count;
@@ -226,7 +226,7 @@ static const struct iio_chan_spec spear_adc_iio_channels[] = {
 
 static irqreturn_t spear_adc_isr(int irq, void *dev_id)
 {
-       struct spear_adc_state *st = (struct spear_adc_state *)dev_id;
+       struct spear_adc_state *st = dev_id;
 
        /* Read value to clear IRQ */
        st->value = spear_adc_get_average(st);