From 940e868c50c163ef2d31bfc974579f2990006857 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Wed, 25 Apr 2012 09:44:56 +0200 Subject: [PATCH] --- yaml --- r: 304468 b: refs/heads/master c: 4e5d3f92cfe79c928414ec497f04a831e5c63a83 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/dac/ad5446.c | 20 +++++--------------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/[refs] b/[refs] index f81600476802..f473c966c6a8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 39c58b607948c731cc1b4c64a1f22f90f72684e2 +refs/heads/master: 4e5d3f92cfe79c928414ec497f04a831e5c63a83 diff --git a/trunk/drivers/staging/iio/dac/ad5446.c b/trunk/drivers/staging/iio/dac/ad5446.c index 2ce6b5be84e2..659d0834bb19 100644 --- a/trunk/drivers/staging/iio/dac/ad5446.c +++ b/trunk/drivers/staging/iio/dac/ad5446.c @@ -344,22 +344,12 @@ static int __devinit ad5446_probe(struct spi_device *spi) indio_dev->channels = &st->chip_info->channel; indio_dev->num_channels = 1; - switch (spi_get_device_id(spi)->driver_data) { - case ID_AD5620_2500: - case ID_AD5620_1250: - case ID_AD5640_2500: - case ID_AD5640_1250: - case ID_AD5660_2500: - case ID_AD5660_1250: + if (st->chip_info->int_vref_mv) st->vref_mv = st->chip_info->int_vref_mv; - break; - default: - if (voltage_uv) - st->vref_mv = voltage_uv / 1000; - else - dev_warn(&spi->dev, - "reference voltage unspecified\n"); - } + else if (voltage_uv) + st->vref_mv = voltage_uv / 1000; + else + dev_warn(&spi->dev, "reference voltage unspecified\n"); ret = iio_device_register(indio_dev); if (ret)