From be47bbc6a22dda64d28f9a6ab2d8059c551ec895 Mon Sep 17 00:00:00 2001
From: Michael Hennerich <michael.hennerich@analog.com>
Date: Mon, 11 Oct 2010 18:05:56 +0200
Subject: [PATCH] --- yaml --- r: 220291 b: refs/heads/master c:
 668413e9e7ad0bc53eeba2465dafd66dbc817996 h: refs/heads/master i:   220289:
 0a57a21c1bcaac4d1bba6840286189d8b7788a07   220287:
 57703bba4491da7e369f5a6ea549cd793717d566 v: v3

---
 [refs]                                      |  2 +-
 trunk/drivers/staging/iio/adc/Kconfig       |  5 +++--
 trunk/drivers/staging/iio/adc/ad7476_core.c | 11 +++--------
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index b7079b706486..fadc9843db2b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 349282d82e929e7982ca53510437c0850ab5294a
+refs/heads/master: 668413e9e7ad0bc53eeba2465dafd66dbc817996
diff --git a/trunk/drivers/staging/iio/adc/Kconfig b/trunk/drivers/staging/iio/adc/Kconfig
index 71713eed8abb..81a7d45ec228 100644
--- a/trunk/drivers/staging/iio/adc/Kconfig
+++ b/trunk/drivers/staging/iio/adc/Kconfig
@@ -51,8 +51,9 @@ config AD7476
 	tristate "Analog Devices AD7475/6/7/8 AD7466/7/8 and AD7495 ADC driver"
 	depends on SPI
 	help
-	  Say yes here to build support for Analog Devices AD7475/6/7/8,
-	  AD7466/7/8 and AD7495 ADC driver.
+	  Say yes here to build support for Analog Devices
+	  AD7475, AD7476, AD7477, AD7478, AD7466, AD7467, AD7468, AD7495
+	  SPI analog to digital convertors (ADC).
 	  If unsure, say N (but it's safe to say "Y").
 
 	  To compile this driver as a module, choose M here: the
diff --git a/trunk/drivers/staging/iio/adc/ad7476_core.c b/trunk/drivers/staging/iio/adc/ad7476_core.c
index bbd72a6ef144..deb68c8a6e18 100644
--- a/trunk/drivers/staging/iio/adc/ad7476_core.c
+++ b/trunk/drivers/staging/iio/adc/ad7476_core.c
@@ -26,10 +26,9 @@
 
 static int ad7476_scan_direct(struct ad7476_state *st)
 {
-	struct spi_device *spi = st->spi;
 	int ret;
 
-	ret = spi_sync(spi, &st->msg);
+	ret = spi_sync(st->spi, &st->msg);
 	if (ret)
 		return ret;
 
@@ -67,13 +66,9 @@ static ssize_t ad7476_show_scale(struct device *dev,
 	struct iio_dev *dev_info = dev_get_drvdata(dev);
 	struct ad7476_state *st = iio_dev_get_devdata(dev_info);
 	/* Corresponds to Vref / 2^(bits) */
+	unsigned int scale_uv = (st->int_vref_mv * 1000) >> st->chip_info->bits;
 
-	if ((1 << (st->chip_info->bits + 1)) > st->int_vref_mv)
-		return sprintf(buf, "%d/2^%d\n",
-			       st->int_vref_mv, st->chip_info->bits);
-	else
-		return sprintf(buf, "%d\n",
-			       st->int_vref_mv >> st->chip_info->bits);
+	return sprintf(buf, "%d.%d\n", scale_uv / 1000, scale_uv % 1000);
 }
 static IIO_DEVICE_ATTR(in_scale, S_IRUGO, ad7476_show_scale, NULL, 0);