| Message ID | 20190301025230.2cws5uths6yyuo5t@smtp.gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | staging: iio: ad5933: move out of staging | expand |
On Thu, 28 Feb 2019 23:52:30 -0300 Marcelo Schmitt <marcelo.schmitt1@gmail.com> wrote: > Add SPDX identifier of GPL-2.0 for the ad5933 driver. > Organize imports. > Make multi-line comments compliant with the preferred code style. One type of change per patch please. So this is at least 3 patches. SPDX, Imports, comment style. Actual contents looks fine. Jonathan > > Signed-off-by: Marcelo Schmitt <marcelo.schmitt1@gmail.com> > --- > .../staging/iio/impedance-analyzer/ad5933.c | 30 ++++++++++--------- > 1 file changed, 16 insertions(+), 14 deletions(-) > > diff --git a/drivers/staging/iio/impedance-analyzer/ad5933.c b/drivers/staging/iio/impedance-analyzer/ad5933.c > index 3134295f014f..d75bdfbf93de 100644 > --- a/drivers/staging/iio/impedance-analyzer/ad5933.c > +++ b/drivers/staging/iio/impedance-analyzer/ad5933.c > @@ -1,27 +1,26 @@ > +// SPDX-License-Identifier: GPL-2.0 > /* > * AD5933 AD5934 Impedance Converter, Network Analyzer > * > * Copyright 2011 Analog Devices Inc. > - * > - * Licensed under the GPL-2. > */ > > -#include <linux/interrupt.h> > +#include <linux/clk.h> > +#include <linux/delay.h> > #include <linux/device.h> > -#include <linux/kernel.h> > -#include <linux/sysfs.h> > +#include <linux/err.h> > #include <linux/i2c.h> > +#include <linux/interrupt.h> > +#include <linux/kernel.h> > +#include <linux/module.h> > #include <linux/regulator/consumer.h> > +#include <linux/sysfs.h> > #include <linux/types.h> > -#include <linux/err.h> > -#include <linux/delay.h> > -#include <linux/module.h> > -#include <linux/clk.h> > > -#include <linux/iio/iio.h> > -#include <linux/iio/sysfs.h> > #include <linux/iio/buffer.h> > +#include <linux/iio/iio.h> > #include <linux/iio/kfifo_buf.h> > +#include <linux/iio/sysfs.h> > > /* AD5933/AD5934 Registers */ > #define AD5933_REG_CONTROL_HB 0x80 /* R/W, 1 byte */ > @@ -474,7 +473,8 @@ static IIO_DEVICE_ATTR(out_voltage0_settling_cycles, 0644, > ad5933_store, > AD5933_OUT_SETTLING_CYCLES); > > -/* note: > +/* > + * note: > * ideally we would handle the scale attributes via the iio_info > * (read|write)_raw methods, however this part is a untypical since we > * don't create dedicated sysfs channel attributes for out0 and in0. > @@ -572,7 +572,8 @@ static int ad5933_ring_postenable(struct iio_dev *indio_dev) > { > struct ad5933_state *st = iio_priv(indio_dev); > > - /* AD5933_CTRL_INIT_START_FREQ: > + /* > + * AD5933_CTRL_INIT_START_FREQ: > * High Q complex circuits require a long time to reach steady state. > * To facilitate the measurement of such impedances, this mode allows > * the user full control of the settling time requirement before > @@ -663,7 +664,8 @@ static void ad5933_work(struct work_struct *work) > } > > if (status & AD5933_STAT_SWEEP_DONE) { > - /* last sample received - power down do > + /* > + * last sample received - power down do > * nothing until the ring enable is toggled > */ > ad5933_cmd(st, AD5933_CTRL_POWER_DOWN);
diff --git a/drivers/staging/iio/impedance-analyzer/ad5933.c b/drivers/staging/iio/impedance-analyzer/ad5933.c index 3134295f014f..d75bdfbf93de 100644 --- a/drivers/staging/iio/impedance-analyzer/ad5933.c +++ b/drivers/staging/iio/impedance-analyzer/ad5933.c @@ -1,27 +1,26 @@ +// SPDX-License-Identifier: GPL-2.0 /* * AD5933 AD5934 Impedance Converter, Network Analyzer * * Copyright 2011 Analog Devices Inc. - * - * Licensed under the GPL-2. */ -#include <linux/interrupt.h> +#include <linux/clk.h> +#include <linux/delay.h> #include <linux/device.h> -#include <linux/kernel.h> -#include <linux/sysfs.h> +#include <linux/err.h> #include <linux/i2c.h> +#include <linux/interrupt.h> +#include <linux/kernel.h> +#include <linux/module.h> #include <linux/regulator/consumer.h> +#include <linux/sysfs.h> #include <linux/types.h> -#include <linux/err.h> -#include <linux/delay.h> -#include <linux/module.h> -#include <linux/clk.h> -#include <linux/iio/iio.h> -#include <linux/iio/sysfs.h> #include <linux/iio/buffer.h> +#include <linux/iio/iio.h> #include <linux/iio/kfifo_buf.h> +#include <linux/iio/sysfs.h> /* AD5933/AD5934 Registers */ #define AD5933_REG_CONTROL_HB 0x80 /* R/W, 1 byte */ @@ -474,7 +473,8 @@ static IIO_DEVICE_ATTR(out_voltage0_settling_cycles, 0644, ad5933_store, AD5933_OUT_SETTLING_CYCLES); -/* note: +/* + * note: * ideally we would handle the scale attributes via the iio_info * (read|write)_raw methods, however this part is a untypical since we * don't create dedicated sysfs channel attributes for out0 and in0. @@ -572,7 +572,8 @@ static int ad5933_ring_postenable(struct iio_dev *indio_dev) { struct ad5933_state *st = iio_priv(indio_dev); - /* AD5933_CTRL_INIT_START_FREQ: + /* + * AD5933_CTRL_INIT_START_FREQ: * High Q complex circuits require a long time to reach steady state. * To facilitate the measurement of such impedances, this mode allows * the user full control of the settling time requirement before @@ -663,7 +664,8 @@ static void ad5933_work(struct work_struct *work) } if (status & AD5933_STAT_SWEEP_DONE) { - /* last sample received - power down do + /* + * last sample received - power down do * nothing until the ring enable is toggled */ ad5933_cmd(st, AD5933_CTRL_POWER_DOWN);
Add SPDX identifier of GPL-2.0 for the ad5933 driver. Organize imports. Make multi-line comments compliant with the preferred code style. Signed-off-by: Marcelo Schmitt <marcelo.schmitt1@gmail.com> --- .../staging/iio/impedance-analyzer/ad5933.c | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-)