Commit b9a6a237 authored by Peter Meerwald's avatar Peter Meerwald Committed by Jonathan Cameron
Browse files

iio:bma180: Drop _update_scan_mode() 



statically allocate maximum size

Signed-off-by: default avatarPeter Meerwald <pmeerw@pmeerw.net>
Cc: Oleksandr Kravchenko <o.v.kravchenko@globallogic.com>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent b81fbab7

drivers/iio/accel/bma180.c

+1 −17
Original line number Diff line number Diff line
@@ -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,

};