Skip to content

Commit

Permalink
staging:iio:accel:adis16220 allocate tx and rx in state plus state vi…
Browse files Browse the repository at this point in the history 
…a iio_priv

Few other misc cleanups.

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Jonathan Cameron authored and Greg Kroah-Hartman committed Jun 28, 2011
1 parent a22ff70 commit 01a6721
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 76 deletions.
14 changes: 4 additions & 10 deletions drivers/staging/iio/accel/adis16220.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,21 +126,15 @@
/**
* struct adis16220_state - device instance specific data
* @us: actual spi_device
* @work_trigger_to_ring: bh for triggered event handling
* @inter: used to check if new interrupt has been triggered
* @last_timestamp: passing timestamp from th to bh of interrupt handler
* @indio_dev: industrial I/O device structure
* @trig: data ready trigger registered with iio
* @tx: transmit buffer
* @rx: receive buffer
* @buf_lock: mutex to protect tx and rx
**/
struct adis16220_state {
struct spi_device *us;
struct iio_dev *indio_dev;
u8 *tx;
u8 *rx;
struct mutex buf_lock;
struct spi_device *us;
struct mutex buf_lock;
u8 tx[ADIS16220_MAX_TX] ____cacheline_aligned;
u8 rx[ADIS16220_MAX_RX];
};

#endif /* SPI_ADIS16220_H_ */
105 changes: 39 additions & 66 deletions drivers/staging/iio/accel/adis16220_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ static int adis16220_spi_write_reg_8(struct device *dev,
{
int ret;
struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct adis16220_state *st = iio_dev_get_devdata(indio_dev);
struct adis16220_state *st = iio_priv(indio_dev);

mutex_lock(&st->buf_lock);
st->tx[0] = ADIS16220_WRITE_REG(reg_address);
Expand All @@ -65,7 +65,7 @@ static int adis16220_spi_write_reg_16(struct device *dev,
int ret;
struct spi_message msg;
struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct adis16220_state *st = iio_dev_get_devdata(indio_dev);
struct adis16220_state *st = iio_priv(indio_dev);
struct spi_transfer xfers[] = {
{
.tx_buf = st->tx,
Expand Down Expand Up @@ -110,7 +110,7 @@ static int adis16220_spi_read_reg_16(struct device *dev,
{
struct spi_message msg;
struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct adis16220_state *st = iio_dev_get_devdata(indio_dev);
struct adis16220_state *st = iio_priv(indio_dev);
int ret;
struct spi_transfer xfers[] = {
{
Expand Down Expand Up @@ -316,10 +316,10 @@ static int adis16220_self_test(struct device *dev)
return ret;
}

static int adis16220_initial_setup(struct adis16220_state *st)
static int adis16220_initial_setup(struct iio_dev *indio_dev)
{
int ret;
struct device *dev = &st->indio_dev->dev;
struct device *dev = &indio_dev->dev;

/* Do self test */
ret = adis16220_self_test(dev);
Expand All @@ -341,19 +341,17 @@ static int adis16220_initial_setup(struct adis16220_state *st)
}
}

printk(KERN_INFO DRIVER_NAME ": at CS%d (irq %d)\n",
st->us->chip_select, st->us->irq);

err_ret:
return ret;
}

static ssize_t adis16220_capture_buffer_read(struct adis16220_state *st,
static ssize_t adis16220_capture_buffer_read(struct iio_dev *indio_dev,
char *buf,
loff_t off,
size_t count,
int addr)
{
struct adis16220_state *st = iio_priv(indio_dev);
struct spi_message msg;
struct spi_transfer xfers[] = {
{
Expand Down Expand Up @@ -383,7 +381,7 @@ static ssize_t adis16220_capture_buffer_read(struct adis16220_state *st,
count = ADIS16220_CAPTURE_SIZE - off;

/* write the begin position of capture buffer */
ret = adis16220_spi_write_reg_16(&st->indio_dev->dev,
ret = adis16220_spi_write_reg_16(&indio_dev->dev,
ADIS16220_CAPT_PNTR,
off > 1);
if (ret)
Expand Down Expand Up @@ -422,9 +420,8 @@ static ssize_t adis16220_accel_bin_read(struct file *filp, struct kobject *kobj,
{
struct device *dev = container_of(kobj, struct device, kobj);
struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct adis16220_state *st = iio_dev_get_devdata(indio_dev);

return adis16220_capture_buffer_read(st, buf,
return adis16220_capture_buffer_read(indio_dev, buf,
off, count,
ADIS16220_CAPT_BUFA);
}
Expand All @@ -445,9 +442,8 @@ static ssize_t adis16220_adc1_bin_read(struct file *filp, struct kobject *kobj,
{
struct device *dev = container_of(kobj, struct device, kobj);
struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct adis16220_state *st = iio_dev_get_devdata(indio_dev);

return adis16220_capture_buffer_read(st, buf,
return adis16220_capture_buffer_read(indio_dev, buf,
off, count,
ADIS16220_CAPT_BUF1);
}
Expand All @@ -468,9 +464,8 @@ static ssize_t adis16220_adc2_bin_read(struct file *filp, struct kobject *kobj,
{
struct device *dev = container_of(kobj, struct device, kobj);
struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct adis16220_state *st = iio_dev_get_devdata(indio_dev);

return adis16220_capture_buffer_read(st, buf,
return adis16220_capture_buffer_read(indio_dev, buf,
off, count,
ADIS16220_CAPT_BUF2);
}
Expand Down Expand Up @@ -551,98 +546,76 @@ static const struct iio_info adis16220_info = {
static int __devinit adis16220_probe(struct spi_device *spi)
{
int ret, regdone = 0;
struct adis16220_state *st = kzalloc(sizeof *st, GFP_KERNEL);
if (!st) {
ret = -ENOMEM;
struct adis16220_state *st;
struct iio_dev *indio_dev;

/* setup the industrialio driver allocated elements */
indio_dev = iio_allocate_device(sizeof(*st));
if (indio_dev == NULL) {
ret = -ENOMEM;
goto error_ret;
}

st = iio_priv(indio_dev);
/* this is only used for removal purposes */
spi_set_drvdata(spi, st);
spi_set_drvdata(spi, indio_dev);

/* Allocate the comms buffers */
st->rx = kzalloc(sizeof(*st->rx)*ADIS16220_MAX_RX, GFP_KERNEL);
if (st->rx == NULL) {
ret = -ENOMEM;
goto error_free_st;
}
st->tx = kzalloc(sizeof(*st->tx)*ADIS16220_MAX_TX, GFP_KERNEL);
if (st->tx == NULL) {
ret = -ENOMEM;
goto error_free_rx;
}
st->us = spi;
mutex_init(&st->buf_lock);
/* setup the industrialio driver allocated elements */
st->indio_dev = iio_allocate_device(0);
if (st->indio_dev == NULL) {
ret = -ENOMEM;
goto error_free_tx;
}

st->indio_dev->name = spi->dev.driver->name;
st->indio_dev->dev.parent = &spi->dev;
st->indio_dev->info = &adis16220_info;
st->indio_dev->dev_data = (void *)(st);
st->indio_dev->modes = INDIO_DIRECT_MODE;
indio_dev->name = spi->dev.driver->name;
indio_dev->dev.parent = &spi->dev;
indio_dev->info = &adis16220_info;
indio_dev->modes = INDIO_DIRECT_MODE;

ret = iio_device_register(st->indio_dev);
ret = iio_device_register(indio_dev);
if (ret)
goto error_free_dev;
regdone = 1;

ret = sysfs_create_bin_file(&st->indio_dev->dev.kobj, &accel_bin);
ret = sysfs_create_bin_file(&indio_dev->dev.kobj, &accel_bin);
if (ret)
goto error_free_dev;

ret = sysfs_create_bin_file(&st->indio_dev->dev.kobj, &adc1_bin);
ret = sysfs_create_bin_file(&indio_dev->dev.kobj, &adc1_bin);
if (ret)
goto error_rm_accel_bin;

ret = sysfs_create_bin_file(&st->indio_dev->dev.kobj, &adc2_bin);
ret = sysfs_create_bin_file(&indio_dev->dev.kobj, &adc2_bin);
if (ret)
goto error_rm_adc1_bin;

/* Get the device into a sane initial state */
ret = adis16220_initial_setup(st);
ret = adis16220_initial_setup(indio_dev);
if (ret)
goto error_rm_adc2_bin;
return 0;

error_rm_adc2_bin:
sysfs_remove_bin_file(&st->indio_dev->dev.kobj, &adc2_bin);
sysfs_remove_bin_file(&indio_dev->dev.kobj, &adc2_bin);
error_rm_adc1_bin:
sysfs_remove_bin_file(&st->indio_dev->dev.kobj, &adc1_bin);
sysfs_remove_bin_file(&indio_dev->dev.kobj, &adc1_bin);
error_rm_accel_bin:
sysfs_remove_bin_file(&st->indio_dev->dev.kobj, &accel_bin);
sysfs_remove_bin_file(&indio_dev->dev.kobj, &accel_bin);
error_free_dev:
if (regdone)
iio_device_unregister(st->indio_dev);
iio_device_unregister(indio_dev);
else
iio_free_device(st->indio_dev);
error_free_tx:
kfree(st->tx);
error_free_rx:
kfree(st->rx);
error_free_st:
kfree(st);
iio_free_device(indio_dev);
error_ret:
return ret;
}

static int adis16220_remove(struct spi_device *spi)
{
struct adis16220_state *st = spi_get_drvdata(spi);
struct iio_dev *indio_dev = st->indio_dev;
struct iio_dev *indio_dev = spi_get_drvdata(spi);

flush_scheduled_work();

sysfs_remove_bin_file(&st->indio_dev->dev.kobj, &adc2_bin);
sysfs_remove_bin_file(&st->indio_dev->dev.kobj, &adc1_bin);
sysfs_remove_bin_file(&st->indio_dev->dev.kobj, &accel_bin);
sysfs_remove_bin_file(&indio_dev->dev.kobj, &adc2_bin);
sysfs_remove_bin_file(&indio_dev->dev.kobj, &adc1_bin);
sysfs_remove_bin_file(&indio_dev->dev.kobj, &accel_bin);
iio_device_unregister(indio_dev);
kfree(st->tx);
kfree(st->rx);
kfree(st);

return 0;
}
Expand Down

0 comments on commit 01a6721

Please sign in to comment.