Skip to content

Commit

Permalink
iio:bma180: Drop _update_scan_mode()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Peter Meerwald authored and Jonathan Cameron committed Sep 14, 2014
1 parent b81fbab commit b9a6a23
Showing 1 changed file with 1 addition and 17 deletions.
18 changes: 1 addition & 17 deletions drivers/iio/accel/bma180.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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,
};

Expand Down

0 comments on commit b9a6a23

Please sign in to comment.