Signed-off-by: Maxime Ripard <maxime.ripard@xxxxxxxxxxxxxxxxxx> Cc: Patrice Vilchez <patrice.vilchez@xxxxxxxxx> Cc: Nicolas Ferre <nicolas.ferre@xxxxxxxxx> Cc: Thomas Petazzoni <thomas.petazzoni@xxxxxxxxxxxxxxxxxx> --- drivers/staging/iio/adc/at91_adc.c | 34 +++++++++++++++++++--------------- 1 files changed, 19 insertions(+), 15 deletions(-) diff --git a/drivers/staging/iio/adc/at91_adc.c b/drivers/staging/iio/adc/at91_adc.c index 4a0421e..9d6e351 100644 --- a/drivers/staging/iio/adc/at91_adc.c +++ b/drivers/staging/iio/adc/at91_adc.c @@ -42,16 +42,16 @@ struct at91_adc_desc { }; struct at91_adc_state { - struct clk *clk; - bool done; - struct mutex lock; - int irq; - wait_queue_head_t wq_data_avail; - u16 last_value; - void __iomem *reg_base; - unsigned int vref_mv; - unsigned long channels_mask; - struct at91_adc_desc *desc; + u32 channels_mask; + struct clk *clk; + bool done; + struct at91_adc_desc *desc; + int irq; + u16 last_value; + struct mutex lock; + void __iomem *reg_base; + u32 vref_mv; + wait_queue_head_t wq_data_avail; }; static struct at91_adc_desc at91_adc_desc_sam9g20 = { @@ -103,7 +103,7 @@ static irqreturn_t at91_adc_eoc_trigger(int irq, void *private) } static int at91_adc_channel_init(struct iio_dev *idev, - struct at91_adc_data *pdata) + struct at91_adc_data *pdata) { struct at91_adc_state *st = iio_priv(idev); struct iio_chan_spec *chan_array; @@ -139,8 +139,8 @@ static void at91_adc_channel_remove(struct iio_dev *idev) } static int at91_adc_read_raw(struct iio_dev *idev, - struct iio_chan_spec const *chan, - int *val, int *val2, long mask) + struct iio_chan_spec const *chan, + int *val, int *val2, long mask) { struct at91_adc_state *st = iio_priv(idev); int ret; @@ -310,8 +310,10 @@ static int __devinit at91_adc_probe(struct platform_device *pdev) /* Setup the ADC channels available on the board */ ret = at91_adc_channel_init(idev, pdata); - if (ret < 0) + if (ret < 0) { + dev_err(&pdev->dev, "Couldn't initialize the channels.\n"); goto error_free_clk; + } init_waitqueue_head(&st->wq_data_avail); mutex_init(&st->lock); @@ -320,8 +322,10 @@ static int __devinit at91_adc_probe(struct platform_device *pdev) st->channels_mask = pdata->channels_used; ret = iio_device_register(idev); - if (ret < 0) + if (ret < 0) { + dev_err(&pdev->dev, "Couldn't register the device.\n"); goto error_free_channels; + } return 0; -- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html