lkml.org 
[lkml]   [2018]   [Jun]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH v2] staging:iio:impedance-analyzer:ad5933: Macro replacement Cleanups.
On Mon, 25 Jun 2018 21:11:23 +0200
Karim Eshapa <karim.eshapa@gmail.com> wrote:

> Doing some macro replacement to start an array of structures
> so it can be reused by manipulating it with different values.
>
> Signed-off-by: Karim Eshapa <karim.eshapa@gmail.com>
There are all sorts of issues with the ABI this driver is providing to
userspace, but this isn't a bad bit of cleanup none the less.

Applied to the togreg branch of iio.git and pushed out as testing
for the autobuilders to play with it.

Thanks,

Jonathan

> ---
> .../staging/iio/impedance-analyzer/ad5933.c | 57 +++++++------------
> 1 file changed, 19 insertions(+), 38 deletions(-)
>
> diff --git a/drivers/staging/iio/impedance-analyzer/ad5933.c b/drivers/staging/iio/impedance-analyzer/ad5933.c
> index 3bcf49466361..14df89510396 100644
> --- a/drivers/staging/iio/impedance-analyzer/ad5933.c
> +++ b/drivers/staging/iio/impedance-analyzer/ad5933.c
> @@ -116,45 +116,26 @@ static struct ad5933_platform_data ad5933_default_pdata = {
> .vref_mv = 3300,
> };
>
> +#define AD5933_CHANNEL(_type, _extend_name, _info_mask_separate, _address, \
> + _scan_index, _realbits) { \
> + .type = (_type), \
> + .extend_name = (_extend_name), \
> + .info_mask_separate = (_info_mask_separate), \
> + .address = (_address), \
> + .scan_index = (_scan_index), \
> + .scan_type = { \
> + .sign = 's', \
> + .realbits = (_realbits), \
> + .storagebits = 16, \
> + }, \
> +}
> +
> static const struct iio_chan_spec ad5933_channels[] = {
> - {
> - .type = IIO_TEMP,
> - .indexed = 1,
> - .channel = 0,
> - .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
> - BIT(IIO_CHAN_INFO_SCALE),
> - .address = AD5933_REG_TEMP_DATA,
> - .scan_index = -1,
> - .scan_type = {
> - .sign = 's',
> - .realbits = 14,
> - .storagebits = 16,
> - },
> - }, { /* Ring Channels */
> - .type = IIO_VOLTAGE,
> - .indexed = 1,
> - .channel = 0,
> - .extend_name = "real",
> - .address = AD5933_REG_REAL_DATA,
> - .scan_index = 0,
> - .scan_type = {
> - .sign = 's',
> - .realbits = 16,
> - .storagebits = 16,
> - },
> - }, {
> - .type = IIO_VOLTAGE,
> - .indexed = 1,
> - .channel = 0,
> - .extend_name = "imag",
> - .address = AD5933_REG_IMAG_DATA,
> - .scan_index = 1,
> - .scan_type = {
> - .sign = 's',
> - .realbits = 16,
> - .storagebits = 16,
> - },
> - },
> + AD5933_CHANNEL(IIO_TEMP, NULL, BIT(IIO_CHAN_INFO_RAW) |
> + BIT(IIO_CHAN_INFO_SCALE), AD5933_REG_TEMP_DATA, -1, 14),
> + /* Ring Channels */
> + AD5933_CHANNEL(IIO_VOLTAGE, "real", 0, AD5933_REG_REAL_DATA, 0, 16),
> + AD5933_CHANNEL(IIO_VOLTAGE, "imag", 0, AD5933_REG_IMAG_DATA, 1, 16),
> };
>
> static int ad5933_i2c_write(struct i2c_client *client, u8 reg, u8 len, u8 *data)

\
 
 \ /
  Last update: 2018-06-30 19:23    [W:0.039 / U:0.056 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site