From 4da54d93abe7bdad6880e27270ad50b6303898b6 Mon Sep 17 00:00:00 2001 From: Jonathan Cameron Date: Fri, 7 May 2010 15:38:56 +0100 Subject: [PATCH 496/577] staging: iio: adis16300 clean out some unused code Signed-off-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman --- drivers/staging/iio/imu/adis16300.h | 9 ---- drivers/staging/iio/imu/adis16300_core.c | 70 +----------------------------- 2 files changed, 2 insertions(+), 77 deletions(-) diff --git a/drivers/staging/iio/imu/adis16300.h b/drivers/staging/iio/imu/adis16300.h index 77d890d..1c7ea5c 100644 --- a/drivers/staging/iio/imu/adis16300.h +++ b/drivers/staging/iio/imu/adis16300.h @@ -115,21 +115,12 @@ struct adis16300_state { struct mutex buf_lock; }; -int adis16300_spi_write_reg_8(struct device *dev, - u8 reg_address, - u8 val); - int adis16300_spi_read_burst(struct device *dev, u8 *rx); -int adis16300_spi_read_sequence(struct device *dev, - u8 *tx, u8 *rx, int num); - int adis16300_set_irq(struct device *dev, bool enable); int adis16300_reset(struct device *dev); -int adis16300_stop_device(struct device *dev); - int adis16300_check_status(struct device *dev); #ifdef CONFIG_IIO_RING_BUFFER diff --git a/drivers/staging/iio/imu/adis16300_core.c b/drivers/staging/iio/imu/adis16300_core.c index b923ecc..5a7e5ef 100644 --- a/drivers/staging/iio/imu/adis16300_core.c +++ b/drivers/staging/iio/imu/adis16300_core.c @@ -40,7 +40,7 @@ * @reg_address: the address of the register to be written * @val: the value to write **/ -int adis16300_spi_write_reg_8(struct device *dev, +static int adis16300_spi_write_reg_8(struct device *dev, u8 reg_address, u8 val) { @@ -202,55 +202,6 @@ int adis16300_spi_read_burst(struct device *dev, u8 *rx) return ret; } -/** - * adis16300_spi_read_sequence() - read a sequence of 16-bit registers - * @dev: device associated with child of actual device (iio_dev or iio_trig) - * @tx: register addresses in bytes 0,2,4,6... (min size is 2*num bytes) - * @rx: somewhere to pass back the value read (min size is 2*num bytes) - **/ -int adis16300_spi_read_sequence(struct device *dev, - u8 *tx, u8 *rx, int num) -{ - struct spi_message msg; - struct spi_transfer *xfers; - struct iio_dev *indio_dev = dev_get_drvdata(dev); - struct adis16300_state *st = iio_dev_get_devdata(indio_dev); - int ret, i; - - xfers = kzalloc(num + 1, GFP_KERNEL); - if (xfers == NULL) { - dev_err(&st->us->dev, "memory alloc failed"); - ret = -ENOMEM; - goto error_ret; - } - - /* tx: |add1|addr2|addr3|...|addrN |zero| - * rx: |zero|res1 |res2 |...|resN-1|resN| */ - spi_message_init(&msg); - for (i = 0; i < num + 1; i++) { - if (i > 0) - xfers[i].rx_buf = st->rx + 2*(i - 1); - if (i < num) - xfers[i].tx_buf = st->tx + 2*i; - xfers[i].bits_per_word = 8; - xfers[i].len = 2; - xfers[i].cs_change = 1; - spi_message_add_tail(&xfers[i], &msg); - } - - mutex_lock(&st->buf_lock); - - ret = spi_sync(st->us, &msg); - if (ret) - dev_err(&st->us->dev, "problem when reading sequence"); - - mutex_unlock(&st->buf_lock); - kfree(xfers); - -error_ret: - return ret; -} - static ssize_t adis16300_spi_read_signed(struct device *dev, struct device_attribute *attr, char *buf, @@ -458,7 +409,7 @@ int adis16300_reset(struct device *dev) } /* Power down the device */ -int adis16300_stop_device(struct device *dev) +static int adis16300_stop_device(struct device *dev) { int ret; u16 val = ADIS16300_SLP_CNT_POWER_OFF; @@ -470,23 +421,6 @@ int adis16300_stop_device(struct device *dev) return ret; } -int adis16300_self_test(struct device *dev) -{ - int ret; - ret = adis16300_spi_write_reg_16(dev, - ADIS16300_MSC_CTRL, - ADIS16300_MSC_CTRL_MEM_TEST); - if (ret) { - dev_err(dev, "problem starting self test"); - goto err_ret; - } - - adis16300_check_status(dev); - -err_ret: - return ret; -} - int adis16300_check_status(struct device *dev) { u16 status; -- 1.7.0.3