Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[karo-tx-linux.git] / drivers / staging / iio / imu / adis16400_core.c

diff --git a/drivers/staging/iio/imu/adis16400_core.c b/drivers/staging/iio/imu/adis16400_core.c
index 0d8df6282b21bb13af9ad5ef96cb57587265ebc4..540bde69cc3b8451c4a4805541542025e5b2759c 100644 (file)
--- a/drivers/staging/iio/imu/adis16400_core.c
+++ b/drivers/staging/iio/imu/adis16400_core.c
@@ -6,6 +6,7 @@
  *
  * Copyright (c) 2009 Manuel Stahl <manuel.stahl@iis.fraunhofer.de>
  * Copyright (c) 2007 Jonathan Cameron <jic23@cam.ac.uk>
+ * Copyright (c) 2011 Analog Devices Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -472,7 +473,8 @@ static int adis16400_initial_setup(struct adis16400_state *st)
        if ((prod_id & 0xF000) != ADIS16400_PRODUCT_ID_DEFAULT)
                dev_warn(dev, "unknown product id");
 
-       printk(KERN_INFO DRIVER_NAME ": prod_id 0x%04x at CS%d (irq %d)\n",
+
+       dev_info(dev, ": prod_id 0x%04x at CS%d (irq %d)\n",
                        prod_id, st->us->chip_select, st->us->irq);
 
        /* use high spi speed if possible */
@@ -645,7 +647,7 @@ static int __devinit adis16400_probe(struct spi_device *spi)
 
        ret = iio_ring_buffer_register(st->indio_dev->ring, 0);
        if (ret) {
-               printk(KERN_ERR "failed to initialize the ring\n");
+               dev_err(&spi->dev, "failed to initialize the ring\n");
                goto error_unreg_ring_funcs;
        }