> -----Original Message----- > From: Jonathan Cameron [mailto:jic23@xxxxxxxxxx] > Sent: Monday, February 8, 2021 4:46 AM > To: linux-iio@xxxxxxxxxxxxxxx > Cc: Lars-Peter Clausen <lars@xxxxxxxxxx>; Michael Hennerich > <Michael.Hennerich@xxxxxxxxxx>; Song Bao Hua (Barry Song) > <song.bao.hua@xxxxxxxxxxxxx>; robh+dt@xxxxxxxxxx; Jonathan Cameron > <jonathan.cameron@xxxxxxxxxx> > Subject: [PATCH 15/24] staging:iio:cdc:ad7150: Tidy up local variable > positioning. > > From: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx> > > Where there is no other basis on which to order declarations > let us prefer reverse xmas tree. Also reduce scope where > sensible. > > Signed-off-by: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx> Reviewed-by: Barry Song <song.bao.hua@xxxxxxxxxxxxx> > --- > drivers/staging/iio/cdc/ad7150.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/drivers/staging/iio/cdc/ad7150.c > b/drivers/staging/iio/cdc/ad7150.c > index 9e88e774752f..d530b467d1b2 100644 > --- a/drivers/staging/iio/cdc/ad7150.c > +++ b/drivers/staging/iio/cdc/ad7150.c > @@ -108,9 +108,9 @@ static int ad7150_read_raw(struct iio_dev *indio_dev, > int *val2, > long mask) > { > - int ret; > struct ad7150_chip_info *chip = iio_priv(indio_dev); > int channel = chan->channel; > + int ret; > > switch (mask) { > case IIO_CHAN_INFO_RAW: > @@ -143,10 +143,10 @@ static int ad7150_read_event_config(struct iio_dev > *indio_dev, > enum iio_event_type type, > enum iio_event_direction dir) > { > - int ret; > + struct ad7150_chip_info *chip = iio_priv(indio_dev); > u8 threshtype; > bool thrfixed; > - struct ad7150_chip_info *chip = iio_priv(indio_dev); > + int ret; > > ret = i2c_smbus_read_byte_data(chip->client, AD7150_CFG_REG); > if (ret < 0) > @@ -227,10 +227,8 @@ static int ad7150_write_event_config(struct iio_dev > *indio_dev, > enum iio_event_type type, > enum iio_event_direction dir, int state) > { > - u8 thresh_type, cfg, adaptive; > - int ret; > struct ad7150_chip_info *chip = iio_priv(indio_dev); > - int rising = (dir == IIO_EV_DIR_RISING); > + int ret; > > /* > * There is only a single shared control and no on chip > @@ -251,6 +249,8 @@ static int ad7150_write_event_config(struct iio_dev > *indio_dev, > > mutex_lock(&chip->state_lock); > if ((type != chip->type) || (dir != chip->dir)) { > + int rising = (dir == IIO_EV_DIR_RISING); > + u8 thresh_type, cfg, adaptive; > > /* > * Need to temporarily disable both interrupts if > @@ -533,9 +533,9 @@ static const struct iio_info ad7150_info_no_irq = { > static int ad7150_probe(struct i2c_client *client, > const struct i2c_device_id *id) > { > - int ret; > struct ad7150_chip_info *chip; > struct iio_dev *indio_dev; > + int ret; > > indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*chip)); > if (!indio_dev) > -- > 2.30.0
