summaryrefslogtreecommitdiffstats
path: root/drivers/iio
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-12 12:26:33 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-12 12:26:33 -0700
commitfc6ed2c6411e3ee0a3775d6d822f9b0169cc40a2 (patch)
tree5f7900d05ce0c113641609d8a251ad3487b871a3 /drivers/iio
parentd99b5ac65e7827f10ba60b1ea44d7bd041d58d1d (diff)
parente59b9afecf7ddf52d31d24e800b473f19c23cfe0 (diff)
downloadop-kernel-dev-fc6ed2c6411e3ee0a3775d6d822f9b0169cc40a2.zip
op-kernel-dev-fc6ed2c6411e3ee0a3775d6d822f9b0169cc40a2.tar.gz
Merge tag 'fixes-togreg-3.6a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into work-next
Various minor IIO fixes for staging-next.
Diffstat (limited to 'drivers/iio')
-rw-r--r--drivers/iio/dac/ad5064.c40
-rw-r--r--drivers/iio/inkern.c3
2 files changed, 22 insertions, 21 deletions
diff --git a/drivers/iio/dac/ad5064.c b/drivers/iio/dac/ad5064.c
index aa739c4..eb281a2 100644
--- a/drivers/iio/dac/ad5064.c
+++ b/drivers/iio/dac/ad5064.c
@@ -122,25 +122,6 @@ enum ad5064_type {
ID_AD5668_2,
};
-static int ad5064_i2c_write(struct ad5064_state *st, unsigned int cmd,
- unsigned int addr, unsigned int val)
-{
- struct i2c_client *i2c = to_i2c_client(st->dev);
-
- st->data.i2c[0] = (cmd << 4) | addr;
- put_unaligned_be16(val, &st->data.i2c[1]);
- return i2c_master_send(i2c, st->data.i2c, 3);
-}
-
-static int ad5064_spi_write(struct ad5064_state *st, unsigned int cmd,
- unsigned int addr, unsigned int val)
-{
- struct spi_device *spi = to_spi_device(st->dev);
-
- st->data.spi = cpu_to_be32(AD5064_CMD(cmd) | AD5064_ADDR(addr) | val);
- return spi_write(spi, &st->data.spi, sizeof(st->data.spi));
-}
-
static int ad5064_write(struct ad5064_state *st, unsigned int cmd,
unsigned int addr, unsigned int val, unsigned int shift)
{
@@ -533,6 +514,15 @@ static int __devexit ad5064_remove(struct device *dev)
#if IS_ENABLED(CONFIG_SPI_MASTER)
+static int ad5064_spi_write(struct ad5064_state *st, unsigned int cmd,
+ unsigned int addr, unsigned int val)
+{
+ struct spi_device *spi = to_spi_device(st->dev);
+
+ st->data.spi = cpu_to_be32(AD5064_CMD(cmd) | AD5064_ADDR(addr) | val);
+ return spi_write(spi, &st->data.spi, sizeof(st->data.spi));
+}
+
static int __devinit ad5064_spi_probe(struct spi_device *spi)
{
const struct spi_device_id *id = spi_get_device_id(spi);
@@ -582,7 +572,7 @@ static int __init ad5064_spi_register_driver(void)
return spi_register_driver(&ad5064_spi_driver);
}
-static void __exit ad5064_spi_unregister_driver(void)
+static void ad5064_spi_unregister_driver(void)
{
spi_unregister_driver(&ad5064_spi_driver);
}
@@ -596,6 +586,16 @@ static inline void ad5064_spi_unregister_driver(void) { }
#if IS_ENABLED(CONFIG_I2C)
+static int ad5064_i2c_write(struct ad5064_state *st, unsigned int cmd,
+ unsigned int addr, unsigned int val)
+{
+ struct i2c_client *i2c = to_i2c_client(st->dev);
+
+ st->data.i2c[0] = (cmd << 4) | addr;
+ put_unaligned_be16(val, &st->data.i2c[1]);
+ return i2c_master_send(i2c, st->data.i2c, 3);
+}
+
static int __devinit ad5064_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
diff --git a/drivers/iio/inkern.c b/drivers/iio/inkern.c
index e2aded0..b5afc2f 100644
--- a/drivers/iio/inkern.c
+++ b/drivers/iio/inkern.c
@@ -198,11 +198,12 @@ struct iio_channel *iio_channel_get_all(const char *name)
iio_device_get(chans[mapind].indio_dev);
mapind++;
}
- mutex_unlock(&iio_map_list_lock);
if (mapind == 0) {
ret = -ENODEV;
goto error_free_chans;
}
+ mutex_unlock(&iio_map_list_lock);
+
return chans;
error_free_chans:
OpenPOWER on IntegriCloud