diff options
| author | Peter Meerwald <pmeerw@pmeerw.net> | 2014-08-20 02:43:00 +0400 |
|---|---|---|
| committer | Jonathan Cameron <jic23@kernel.org> | 2014-09-14 23:19:52 +0400 |
| commit | b9a6a237ffc99f63fd96f3ad11b3c5c532d211f8 (patch) | |
| tree | 9b28ed5b63146e7e8e623dc49b7cb5d1935f2e7a | |
| parent | b81fbab7f567aaa12aba6532681b426f3e130e11 (diff) | |
| download | linux-b9a6a237ffc99f63fd96f3ad11b3c5c532d211f8.tar.xz | |
iio:bma180: Drop _update_scan_mode()
statically allocate maximum size
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Cc: Oleksandr Kravchenko <o.v.kravchenko@globallogic.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| -rw-r--r-- | drivers/iio/accel/bma180.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/drivers/iio/accel/bma180.c b/drivers/iio/accel/bma180.c index 91260a071fe9..583831898247 100644 --- a/drivers/iio/accel/bma180.c +++ b/drivers/iio/accel/bma180.c @@ -82,7 +82,7 @@ struct bma180_data { int scale; int bw; bool pmode; - char *buff; + u8 buff[16]; /* 3x 16-bit + 8-bit + padding + timestamp */ }; enum bma180_chan { @@ -408,26 +408,10 @@ static int bma180_write_raw(struct iio_dev *indio_dev, } } -static int bma180_update_scan_mode(struct iio_dev *indio_dev, - const unsigned long *scan_mask) -{ - struct bma180_data *data = iio_priv(indio_dev); - - if (data->buff) - devm_kfree(&indio_dev->dev, data->buff); - data->buff = devm_kzalloc(&indio_dev->dev, - indio_dev->scan_bytes, GFP_KERNEL); - if (!data->buff) - return -ENOMEM; - - return 0; -} - static const struct iio_info bma180_info = { .attrs = &bma180_attrs_group, .read_raw = bma180_read_raw, .write_raw = bma180_write_raw, - .update_scan_mode = bma180_update_scan_mode, .driver_module = THIS_MODULE, }; |