2014-06-29 09:40:30

by Federico Di Pierro

Subject: [PATCH 1/1] staging: iio: Coding style issues fix.

Fix some little style issues in drivers/staging/iio/frequency/ad9832.c .
This is my latest task of the eudyptula challenge (third attempt!)

Signed-off-by: Federico Di Pierro <[email protected]>
---
drivers/staging/iio/frequency/ad9832.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/iio/frequency/ad9832.c b/drivers/staging/iio/frequency/ad9832.c
index c7d0307..b7c8351 100644
--- a/drivers/staging/iio/frequency/ad9832.c
+++ b/drivers/staging/iio/frequency/ad9832.c
@@ -57,7 +57,7 @@ static int ad9832_write_frequency(struct ad9832_state *st,
}

static int ad9832_write_phase(struct ad9832_state *st,
- unsigned long addr, unsigned long phase)
+ unsigned long addr, unsigned long phase)
{
if (phase > (1 << AD9832_PHASE_BITS))
return -EINVAL;
@@ -72,10 +72,8 @@ static int ad9832_write_phase(struct ad9832_state *st,
return spi_sync(st->spi, &st->phase_msg);
}

-static ssize_t ad9832_write(struct device *dev,
- struct device_attribute *attr,
- const char *buf,
- size_t len)
+static ssize_t ad9832_write(struct device *dev, struct device_attribute *attr,
+ const char *buf, size_t len)
{
struct iio_dev *indio_dev = dev_to_iio_dev(dev);
struct ad9832_state *st = iio_priv(indio_dev);
@@ -109,11 +107,11 @@ static ssize_t ad9832_write(struct device *dev,
ret = spi_sync(st->spi, &st->msg);
break;
case AD9832_FREQ_SYM:
- if (val == 1)
+ if (val == 1) {
st->ctrl_fp |= AD9832_FREQ;
- else if (val == 0)
+ } else if (val == 0) {
st->ctrl_fp &= ~AD9832_FREQ;
- else {
+ } else {
ret = -EINVAL;
break;
}
--
2.0.1

2014-06-29 13:35:46

by Jonathan Cameron

Subject: Re: [PATCH 1/1] staging: iio: Coding style issues fix.

On 29/06/14 10:41, Federico Di Pierro wrote:
> Fix some little style issues in drivers/staging/iio/frequency/ad9832.c .
> This is my latest task of the eudyptula challenge (third attempt!)
>
> Signed-off-by: Federico Di Pierro <[email protected]>
I'd have preferred more meaty work on this driver, but I guess every
little bit helps...

Applied to the togreg branch of iio.git

Thanks,


> ---
> drivers/staging/iio/frequency/ad9832.c | 14 ++++++--------
> 1 file changed, 6 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/staging/iio/frequency/ad9832.c b/drivers/staging/iio/frequency/ad9832.c
> index c7d0307..b7c8351 100644
> --- a/drivers/staging/iio/frequency/ad9832.c
> +++ b/drivers/staging/iio/frequency/ad9832.c
> @@ -57,7 +57,7 @@ static int ad9832_write_frequency(struct ad9832_state *st,
> }
>
> static int ad9832_write_phase(struct ad9832_state *st,
> - unsigned long addr, unsigned long phase)
> + unsigned long addr, unsigned long phase)
> {
> if (phase > (1 << AD9832_PHASE_BITS))
> return -EINVAL;
> @@ -72,10 +72,8 @@ static int ad9832_write_phase(struct ad9832_state *st,
> return spi_sync(st->spi, &st->phase_msg);
> }
>
> -static ssize_t ad9832_write(struct device *dev,
> - struct device_attribute *attr,
> - const char *buf,
> - size_t len)
> +static ssize_t ad9832_write(struct device *dev, struct device_attribute *attr,
> + const char *buf, size_t len)
> {
> struct iio_dev *indio_dev = dev_to_iio_dev(dev);
> struct ad9832_state *st = iio_priv(indio_dev);
> @@ -109,11 +107,11 @@ static ssize_t ad9832_write(struct device *dev,
> ret = spi_sync(st->spi, &st->msg);
> break;
> case AD9832_FREQ_SYM:
> - if (val == 1)
> + if (val == 1) {
> st->ctrl_fp |= AD9832_FREQ;
> - else if (val == 0)
> + } else if (val == 0) {
> st->ctrl_fp &= ~AD9832_FREQ;
> - else {
> + } else {
> ret = -EINVAL;
> break;
> }
>