UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging:iio:accel:kxsd9: allocate state with iio_dev and use iio_priv to access. 

V2: Actually allocate the storage.

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Jonathan Cameron 2011-06-27 13:17:56 +01:00 committed by Greg Kroah-Hartman
parent 83f0422dc6
commit ed0c012b85
1 changed files with 17 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
drivers/staging/iio/accel/kxsd9.c
View File

@ -56,17 +56,15 @@
/** /**
* struct kxsd9_state - device related storage * struct kxsd9_state - device related storage
* @buf_lock: protect the rx and tx buffers. * @buf_lock: protect the rx and tx buffers.
* @indio_dev: associated industrial IO device
* @us: spi device * @us: spi device
* @rx: single rx buffer storage * @rx: single rx buffer storage
* @tx: single tx buffer storage * @tx: single tx buffer storage
**/ **/
struct kxsd9_state { struct kxsd9_state {
struct mutex buf_lock; struct mutex buf_lock;
struct iio_dev *indio_dev;
struct spi_device *us; struct spi_device *us;
u8 *rx; u8 rx[KXSD9_STATE_RX_SIZE] ____cacheline_aligned;
u8 *tx; u8 tx[KXSD9_STATE_TX_SIZE];
}; };
/* This may want to move to mili g to allow for non integer ranges */ /* This may want to move to mili g to allow for non integer ranges */
@ -77,7 +75,7 @@ static ssize_t kxsd9_read_scale(struct device *dev,
int ret; int ret;
ssize_t len = 0; ssize_t len = 0;
struct iio_dev *indio_dev = dev_get_drvdata(dev); struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct kxsd9_state *st = indio_dev->dev_data; struct kxsd9_state *st = iio_priv(indio_dev);
struct spi_transfer xfer = { struct spi_transfer xfer = {
.bits_per_word = 8, .bits_per_word = 8,
.len = 2, .len = 2,
@ -125,7 +123,7 @@ static ssize_t kxsd9_write_scale(struct device *dev,
struct spi_message msg; struct spi_message msg;
int ret; int ret;
struct iio_dev *indio_dev = dev_get_drvdata(dev); struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct kxsd9_state *st = indio_dev->dev_data; struct kxsd9_state *st = iio_priv(indio_dev);
u8 val; u8 val;
struct spi_transfer xfers[] = { struct spi_transfer xfers[] = {
{ {
@ -190,7 +188,7 @@ static ssize_t kxsd9_read_accel(struct device *dev,
u16 val; u16 val;
struct iio_dev_attr *this_attr = to_iio_dev_attr(attr); struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
struct iio_dev *indio_dev = dev_get_drvdata(dev); struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct kxsd9_state *st = indio_dev->dev_data; struct kxsd9_state *st = iio_priv(indio_dev);
struct spi_transfer xfers[] = { struct spi_transfer xfers[] = {
{ {
.bits_per_word = 8, .bits_per_word = 8,
@ -308,43 +306,26 @@ static const struct iio_info kxsd9_info = {
static int __devinit kxsd9_probe(struct spi_device *spi) static int __devinit kxsd9_probe(struct spi_device *spi)
{ {
struct iio_dev *indio_dev;
struct kxsd9_state *st; struct kxsd9_state *st;
int ret = 0; int ret = 0;
st = kzalloc(sizeof(*st), GFP_KERNEL); indio_dev = iio_allocate_device(sizeof(*st));
if (st == NULL) { if (indio_dev == NULL) {
ret = -ENOMEM; ret = -ENOMEM;
goto error_ret; goto error_ret;
} }
spi_set_drvdata(spi, st); st = iio_priv(indio_dev);
spi_set_drvdata(spi, indio_dev);
st->rx = kmalloc(sizeof(*st->rx)*KXSD9_STATE_RX_SIZE,
GFP_KERNEL);
if (st->rx == NULL) {
ret = -ENOMEM;
goto error_free_st;
}
st->tx = kmalloc(sizeof(*st->tx)*KXSD9_STATE_TX_SIZE,
GFP_KERNEL);
if (st->tx == NULL) {
ret = -ENOMEM;
goto error_free_rx;
}
st->us = spi; st->us = spi;
mutex_init(&st->buf_lock); mutex_init(&st->buf_lock);
st->indio_dev = iio_allocate_device(0);
if (st->indio_dev == NULL) {
ret = -ENOMEM;
goto error_free_tx;
}
st->indio_dev->dev.parent = &spi->dev;
st->indio_dev->info = &kxsd9_info;
st->indio_dev->dev_data = (void *)(st);
st->indio_dev->modes = INDIO_DIRECT_MODE;
ret = iio_device_register(st->indio_dev); indio_dev->dev.parent = &spi->dev;
indio_dev->info = &kxsd9_info;
indio_dev->modes = INDIO_DIRECT_MODE;
ret = iio_device_register(indio_dev);
if (ret) if (ret)
goto error_free_dev; goto error_free_dev;
@ -355,25 +336,14 @@ static int __devinit kxsd9_probe(struct spi_device *spi)
return 0; return 0;
error_free_dev: error_free_dev:
iio_free_device(st->indio_dev); iio_free_device(indio_dev);
error_free_tx:
kfree(st->tx);
error_free_rx:
kfree(st->rx);
error_free_st:
kfree(st);
error_ret: error_ret:
return ret; return ret;
} }
static int __devexit kxsd9_remove(struct spi_device *spi) static int __devexit kxsd9_remove(struct spi_device *spi)
{ {
struct kxsd9_state *st = spi_get_drvdata(spi); iio_device_unregister(spi_get_drvdata(spi));
iio_device_unregister(st->indio_dev);
kfree(st->tx);
kfree(st->rx);
kfree(st);
return 0; return 0;
} }