* [PATCH 4/4] staging: iio: dac: Cleanup style - no functional changes
@ 2010-11-19 12:47 michael.hennerich
2010-11-19 14:14 ` Jonathan Cameron
0 siblings, 1 reply; 3+ messages in thread
From: michael.hennerich @ 2010-11-19 12:47 UTC (permalink / raw)
To: jic23; +Cc: linux-iio, drivers, device-drivers-devel, Michael Hennerich
From: Michael Hennerich <michael.hennerich@analog.com>
Stick to the 80 character line limit at least for code
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
---
drivers/staging/iio/dac/ad5624r_spi.c | 67 +++++++++++++++++----------------
1 files changed, 35 insertions(+), 32 deletions(-)
diff --git a/drivers/staging/iio/dac/ad5624r_spi.c b/drivers/staging/iio/dac/ad5624r_spi.c
index b7c1661..8c1b6b1 100644
--- a/drivers/staging/iio/dac/ad5624r_spi.c
+++ b/drivers/staging/iio/dac/ad5624r_spi.c
@@ -57,9 +57,8 @@ static int ad5624r_spi_write(struct spi_device *spi,
}
static ssize_t ad5624r_write_dac(struct device *dev,
- struct device_attribute *attr,
- const char *buf,
- size_t len)
+ struct device_attribute *attr,
+ const char *buf, size_t len)
{
long readin;
int ret;
@@ -72,13 +71,12 @@ static ssize_t ad5624r_write_dac(struct device *dev,
return ret;
ret = ad5624r_spi_write(st->us, AD5624R_CMD_WRITE_INPUT_N_UPDATE_N,
- this_attr->address, readin, st->data_len);
+ this_attr->address, readin, st->data_len);
return ret ? ret : len;
}
static ssize_t ad5624r_read_ldac_mode(struct device *dev,
- struct device_attribute *attr,
- char *buf)
+ struct device_attribute *attr, char *buf)
{
struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct ad5624r_state *st = indio_dev->dev_data;
@@ -87,9 +85,8 @@ static ssize_t ad5624r_read_ldac_mode(struct device *dev,
}
static ssize_t ad5624r_write_ldac_mode(struct device *dev,
- struct device_attribute *attr,
- const char *buf,
- size_t len)
+ struct device_attribute *attr,
+ const char *buf, size_t len)
{
long readin;
int ret;
@@ -100,15 +97,16 @@ static ssize_t ad5624r_write_ldac_mode(struct device *dev,
if (ret)
return ret;
- ret = ad5624r_spi_write(st->us, AD5624R_CMD_LDAC_SETUP, 0, readin & 0xF, 16);
+ ret = ad5624r_spi_write(st->us, AD5624R_CMD_LDAC_SETUP, 0,
+ readin & 0xF, 16);
st->ldac_mode = readin & 0xF;
return ret ? ret : len;
}
static ssize_t ad5624r_read_dac_power_mode(struct device *dev,
- struct device_attribute *attr,
- char *buf)
+ struct device_attribute *attr,
+ char *buf)
{
struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct ad5624r_state *st = indio_dev->dev_data;
@@ -118,9 +116,8 @@ static ssize_t ad5624r_read_dac_power_mode(struct device *dev,
}
static ssize_t ad5624r_write_dac_power_mode(struct device *dev,
- struct device_attribute *attr,
- const char *buf,
- size_t len)
+ struct device_attribute *attr,
+ const char *buf, size_t len)
{
long readin;
int ret;
@@ -133,7 +130,8 @@ static ssize_t ad5624r_write_dac_power_mode(struct device *dev,
return ret;
ret = ad5624r_spi_write(st->us, AD5624R_CMD_POWERDOWN_DAC, 0,
- ((readin & 0x3) << 4) | (1 << this_attr->address), 16);
+ ((readin & 0x3) << 4) | (1 << this_attr->
+ address), 16);
st->dac_power_mode[this_attr->address] = readin & 0x3;
@@ -141,8 +139,8 @@ static ssize_t ad5624r_write_dac_power_mode(struct device *dev,
}
static ssize_t ad5624r_read_internal_ref_mode(struct device *dev,
- struct device_attribute *attr,
- char *buf)
+ struct device_attribute *attr,
+ char *buf)
{
struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct ad5624r_state *st = indio_dev->dev_data;
@@ -151,9 +149,8 @@ static ssize_t ad5624r_read_internal_ref_mode(struct device *dev,
}
static ssize_t ad5624r_write_internal_ref_mode(struct device *dev,
- struct device_attribute *attr,
- const char *buf,
- size_t len)
+ struct device_attribute *attr,
+ const char *buf, size_t len)
{
long readin;
int ret;
@@ -164,7 +161,8 @@ static ssize_t ad5624r_write_internal_ref_mode(struct device *dev,
if (ret)
return ret;
- ret = ad5624r_spi_write(st->us, AD5624R_CMD_INTERNAL_REFER_SETUP, 0, !!readin, 16);
+ ret = ad5624r_spi_write(st->us, AD5624R_CMD_INTERNAL_REFER_SETUP, 0,
+ !!readin, 16);
st->internal_ref = !!readin;
@@ -177,17 +175,22 @@ static IIO_DEV_ATTR_OUT_RAW(2, ad5624r_write_dac, AD5624R_ADDR_DAC2);
static IIO_DEV_ATTR_OUT_RAW(3, ad5624r_write_dac, AD5624R_ADDR_DAC3);
static IIO_DEVICE_ATTR(ldac_mode, S_IRUGO | S_IWUSR, ad5624r_read_ldac_mode,
- ad5624r_write_ldac_mode, 0);
-static IIO_DEVICE_ATTR(internal_ref, S_IRUGO | S_IWUSR, ad5624r_read_internal_ref_mode,
- ad5624r_write_internal_ref_mode, 0);
+ ad5624r_write_ldac_mode, 0);
+static IIO_DEVICE_ATTR(internal_ref, S_IRUGO | S_IWUSR,
+ ad5624r_read_internal_ref_mode,
+ ad5624r_write_internal_ref_mode, 0);
#define IIO_DEV_ATTR_DAC_POWER_MODE(_num, _show, _store, _addr) \
IIO_DEVICE_ATTR(dac_power_mode_##_num, S_IRUGO | S_IWUSR, _show, _store, _addr)
-static IIO_DEV_ATTR_DAC_POWER_MODE(0, ad5624r_read_dac_power_mode, ad5624r_write_dac_power_mode, 0);
-static IIO_DEV_ATTR_DAC_POWER_MODE(1, ad5624r_read_dac_power_mode, ad5624r_write_dac_power_mode, 1);
-static IIO_DEV_ATTR_DAC_POWER_MODE(2, ad5624r_read_dac_power_mode, ad5624r_write_dac_power_mode, 2);
-static IIO_DEV_ATTR_DAC_POWER_MODE(3, ad5624r_read_dac_power_mode, ad5624r_write_dac_power_mode, 3);
+static IIO_DEV_ATTR_DAC_POWER_MODE(0, ad5624r_read_dac_power_mode,
+ ad5624r_write_dac_power_mode, 0);
+static IIO_DEV_ATTR_DAC_POWER_MODE(1, ad5624r_read_dac_power_mode,
+ ad5624r_write_dac_power_mode, 1);
+static IIO_DEV_ATTR_DAC_POWER_MODE(2, ad5624r_read_dac_power_mode,
+ ad5624r_write_dac_power_mode, 2);
+static IIO_DEV_ATTR_DAC_POWER_MODE(3, ad5624r_read_dac_power_mode,
+ ad5624r_write_dac_power_mode, 3);
static struct attribute *ad5624r_attributes[] = {
&iio_dev_attr_out0_raw.dev_attr.attr,
@@ -272,9 +275,9 @@ static const struct spi_device_id ad5624r_id[] = {
static struct spi_driver ad5624r_driver = {
.driver = {
- .name = "ad5624r",
- .owner = THIS_MODULE,
- },
+ .name = "ad5624r",
+ .owner = THIS_MODULE,
+ },
.probe = ad5624r_probe,
.remove = __devexit_p(ad5624r_remove),
.id_table = ad5624r_id,
--
1.6.0.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH 4/4] staging: iio: dac: Cleanup style - no functional changes
2010-11-19 12:47 [PATCH 4/4] staging: iio: dac: Cleanup style - no functional changes michael.hennerich
@ 2010-11-19 14:14 ` Jonathan Cameron
0 siblings, 0 replies; 3+ messages in thread
From: Jonathan Cameron @ 2010-11-19 14:14 UTC (permalink / raw)
To: michael.hennerich; +Cc: linux-iio, drivers, device-drivers-devel
On 11/19/10 12:47, michael.hennerich@analog.com wrote:
> From: Michael Hennerich <michael.hennerich@analog.com>
>
> Stick to the 80 character line limit at least for code
One nitpick on exactly where the line break goes.
>
> Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
> ---
> drivers/staging/iio/dac/ad5624r_spi.c | 67 +++++++++++++++++----------------
> 1 files changed, 35 insertions(+), 32 deletions(-)
>
> diff --git a/drivers/staging/iio/dac/ad5624r_spi.c b/drivers/staging/iio/dac/ad5624r_spi.c
> index b7c1661..8c1b6b1 100644
> --- a/drivers/staging/iio/dac/ad5624r_spi.c
> +++ b/drivers/staging/iio/dac/ad5624r_spi.c
> @@ -57,9 +57,8 @@ static int ad5624r_spi_write(struct spi_device *spi,
> }
>
> static ssize_t ad5624r_write_dac(struct device *dev,
> - struct device_attribute *attr,
> - const char *buf,
> - size_t len)
> + struct device_attribute *attr,
> + const char *buf, size_t len)
> {
> long readin;
> int ret;
> @@ -72,13 +71,12 @@ static ssize_t ad5624r_write_dac(struct device *dev,
> return ret;
>
> ret = ad5624r_spi_write(st->us, AD5624R_CMD_WRITE_INPUT_N_UPDATE_N,
> - this_attr->address, readin, st->data_len);
> + this_attr->address, readin, st->data_len);
> return ret ? ret : len;
> }
>
> static ssize_t ad5624r_read_ldac_mode(struct device *dev,
> - struct device_attribute *attr,
> - char *buf)
> + struct device_attribute *attr, char *buf)
> {
> struct iio_dev *indio_dev = dev_get_drvdata(dev);
> struct ad5624r_state *st = indio_dev->dev_data;
> @@ -87,9 +85,8 @@ static ssize_t ad5624r_read_ldac_mode(struct device *dev,
> }
>
> static ssize_t ad5624r_write_ldac_mode(struct device *dev,
> - struct device_attribute *attr,
> - const char *buf,
> - size_t len)
> + struct device_attribute *attr,
> + const char *buf, size_t len)
> {
> long readin;
> int ret;
> @@ -100,15 +97,16 @@ static ssize_t ad5624r_write_ldac_mode(struct device *dev,
> if (ret)
> return ret;
>
> - ret = ad5624r_spi_write(st->us, AD5624R_CMD_LDAC_SETUP, 0, readin & 0xF, 16);
> + ret = ad5624r_spi_write(st->us, AD5624R_CMD_LDAC_SETUP, 0,
> + readin & 0xF, 16);
> st->ldac_mode = readin & 0xF;
>
> return ret ? ret : len;
> }
>
> static ssize_t ad5624r_read_dac_power_mode(struct device *dev,
> - struct device_attribute *attr,
> - char *buf)
> + struct device_attribute *attr,
> + char *buf)
> {
> struct iio_dev *indio_dev = dev_get_drvdata(dev);
> struct ad5624r_state *st = indio_dev->dev_data;
> @@ -118,9 +116,8 @@ static ssize_t ad5624r_read_dac_power_mode(struct device *dev,
> }
>
> static ssize_t ad5624r_write_dac_power_mode(struct device *dev,
> - struct device_attribute *attr,
> - const char *buf,
> - size_t len)
> + struct device_attribute *attr,
> + const char *buf, size_t len)
> {
> long readin;
> int ret;
> @@ -133,7 +130,8 @@ static ssize_t ad5624r_write_dac_power_mode(struct device *dev,
> return ret;
>
> ret = ad5624r_spi_write(st->us, AD5624R_CMD_POWERDOWN_DAC, 0,
> - ((readin & 0x3) << 4) | (1 << this_attr->address), 16);
> + ((readin & 0x3) << 4) | (1 << this_attr->
I would prefer to see the break after the |
> + address), 16);
>
> st->dac_power_mode[this_attr->address] = readin & 0x3;
>
> @@ -141,8 +139,8 @@ static ssize_t ad5624r_write_dac_power_mode(struct device *dev,
> }
>
> static ssize_t ad5624r_read_internal_ref_mode(struct device *dev,
> - struct device_attribute *attr,
> - char *buf)
> + struct device_attribute *attr,
> + char *buf)
> {
> struct iio_dev *indio_dev = dev_get_drvdata(dev);
> struct ad5624r_state *st = indio_dev->dev_data;
> @@ -151,9 +149,8 @@ static ssize_t ad5624r_read_internal_ref_mode(struct device *dev,
> }
>
> static ssize_t ad5624r_write_internal_ref_mode(struct device *dev,
> - struct device_attribute *attr,
> - const char *buf,
> - size_t len)
> + struct device_attribute *attr,
> + const char *buf, size_t len)
> {
> long readin;
> int ret;
> @@ -164,7 +161,8 @@ static ssize_t ad5624r_write_internal_ref_mode(struct device *dev,
> if (ret)
> return ret;
>
> - ret = ad5624r_spi_write(st->us, AD5624R_CMD_INTERNAL_REFER_SETUP, 0, !!readin, 16);
> + ret = ad5624r_spi_write(st->us, AD5624R_CMD_INTERNAL_REFER_SETUP, 0,
> + !!readin, 16);
>
> st->internal_ref = !!readin;
>
> @@ -177,17 +175,22 @@ static IIO_DEV_ATTR_OUT_RAW(2, ad5624r_write_dac, AD5624R_ADDR_DAC2);
> static IIO_DEV_ATTR_OUT_RAW(3, ad5624r_write_dac, AD5624R_ADDR_DAC3);
>
> static IIO_DEVICE_ATTR(ldac_mode, S_IRUGO | S_IWUSR, ad5624r_read_ldac_mode,
> - ad5624r_write_ldac_mode, 0);
> -static IIO_DEVICE_ATTR(internal_ref, S_IRUGO | S_IWUSR, ad5624r_read_internal_ref_mode,
> - ad5624r_write_internal_ref_mode, 0);
> + ad5624r_write_ldac_mode, 0);
> +static IIO_DEVICE_ATTR(internal_ref, S_IRUGO | S_IWUSR,
> + ad5624r_read_internal_ref_mode,
> + ad5624r_write_internal_ref_mode, 0);
>
> #define IIO_DEV_ATTR_DAC_POWER_MODE(_num, _show, _store, _addr) \
> IIO_DEVICE_ATTR(dac_power_mode_##_num, S_IRUGO | S_IWUSR, _show, _store, _addr)
>
> -static IIO_DEV_ATTR_DAC_POWER_MODE(0, ad5624r_read_dac_power_mode, ad5624r_write_dac_power_mode, 0);
> -static IIO_DEV_ATTR_DAC_POWER_MODE(1, ad5624r_read_dac_power_mode, ad5624r_write_dac_power_mode, 1);
> -static IIO_DEV_ATTR_DAC_POWER_MODE(2, ad5624r_read_dac_power_mode, ad5624r_write_dac_power_mode, 2);
> -static IIO_DEV_ATTR_DAC_POWER_MODE(3, ad5624r_read_dac_power_mode, ad5624r_write_dac_power_mode, 3);
> +static IIO_DEV_ATTR_DAC_POWER_MODE(0, ad5624r_read_dac_power_mode,
> + ad5624r_write_dac_power_mode, 0);
> +static IIO_DEV_ATTR_DAC_POWER_MODE(1, ad5624r_read_dac_power_mode,
> + ad5624r_write_dac_power_mode, 1);
> +static IIO_DEV_ATTR_DAC_POWER_MODE(2, ad5624r_read_dac_power_mode,
> + ad5624r_write_dac_power_mode, 2);
> +static IIO_DEV_ATTR_DAC_POWER_MODE(3, ad5624r_read_dac_power_mode,
> + ad5624r_write_dac_power_mode, 3);
>
> static struct attribute *ad5624r_attributes[] = {
> &iio_dev_attr_out0_raw.dev_attr.attr,
> @@ -272,9 +275,9 @@ static const struct spi_device_id ad5624r_id[] = {
>
> static struct spi_driver ad5624r_driver = {
> .driver = {
> - .name = "ad5624r",
> - .owner = THIS_MODULE,
> - },
> + .name = "ad5624r",
> + .owner = THIS_MODULE,
> + },
> .probe = ad5624r_probe,
> .remove = __devexit_p(ad5624r_remove),
> .id_table = ad5624r_id,
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 1/4] staging: iio: dac: Update drivers to use new attribute naming
@ 2010-11-19 14:16 michael.hennerich
2010-11-19 14:16 ` [PATCH 4/4] staging: iio: dac: Cleanup style - no functional changes michael.hennerich
0 siblings, 1 reply; 3+ messages in thread
From: michael.hennerich @ 2010-11-19 14:16 UTC (permalink / raw)
To: greg; +Cc: jic23, linux-iio, drivers, device-drivers-devel,
Michael Hennerich
From: Michael Hennerich <michael.hennerich@analog.com>
Remove depreciated macro from header
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
---
drivers/staging/iio/dac/ad5624r_spi.c | 16 ++++++++--------
drivers/staging/iio/dac/dac.h | 4 ----
2 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/iio/dac/ad5624r_spi.c b/drivers/staging/iio/dac/ad5624r_spi.c
index 705ff50..c0d7de9 100644
--- a/drivers/staging/iio/dac/ad5624r_spi.c
+++ b/drivers/staging/iio/dac/ad5624r_spi.c
@@ -180,10 +180,10 @@ static ssize_t ad5624r_write_internal_ref_mode(struct device *dev,
return ret ? ret : len;
}
-static IIO_DEV_ATTR_DAC(0, ad5624r_write_dac, AD5624R_ADDR_DAC0);
-static IIO_DEV_ATTR_DAC(1, ad5624r_write_dac, AD5624R_ADDR_DAC1);
-static IIO_DEV_ATTR_DAC(2, ad5624r_write_dac, AD5624R_ADDR_DAC2);
-static IIO_DEV_ATTR_DAC(3, ad5624r_write_dac, AD5624R_ADDR_DAC3);
+static IIO_DEV_ATTR_OUT_RAW(0, ad5624r_write_dac, AD5624R_ADDR_DAC0);
+static IIO_DEV_ATTR_OUT_RAW(1, ad5624r_write_dac, AD5624R_ADDR_DAC1);
+static IIO_DEV_ATTR_OUT_RAW(2, ad5624r_write_dac, AD5624R_ADDR_DAC2);
+static IIO_DEV_ATTR_OUT_RAW(3, ad5624r_write_dac, AD5624R_ADDR_DAC3);
static IIO_DEVICE_ATTR(ldac_mode, S_IRUGO | S_IWUSR, ad5624r_read_ldac_mode,
ad5624r_write_ldac_mode, 0);
@@ -199,10 +199,10 @@ static IIO_DEV_ATTR_DAC_POWER_MODE(2, ad5624r_read_dac_power_mode, ad5624r_write
static IIO_DEV_ATTR_DAC_POWER_MODE(3, ad5624r_read_dac_power_mode, ad5624r_write_dac_power_mode, 3);
static struct attribute *ad5624r_attributes[] = {
- &iio_dev_attr_dac_0.dev_attr.attr,
- &iio_dev_attr_dac_1.dev_attr.attr,
- &iio_dev_attr_dac_2.dev_attr.attr,
- &iio_dev_attr_dac_3.dev_attr.attr,
+ &iio_dev_attr_out0_raw.dev_attr.attr,
+ &iio_dev_attr_out1_raw.dev_attr.attr,
+ &iio_dev_attr_out2_raw.dev_attr.attr,
+ &iio_dev_attr_out3_raw.dev_attr.attr,
&iio_dev_attr_dac_power_mode_0.dev_attr.attr,
&iio_dev_attr_dac_power_mode_1.dev_attr.attr,
&iio_dev_attr_dac_power_mode_2.dev_attr.attr,
diff --git a/drivers/staging/iio/dac/dac.h b/drivers/staging/iio/dac/dac.h
index d9384c9..1d82f35 100644
--- a/drivers/staging/iio/dac/dac.h
+++ b/drivers/staging/iio/dac/dac.h
@@ -2,9 +2,5 @@
* dac.h - sysfs attributes associated with DACs
*/
-/* Deprecated */
-#define IIO_DEV_ATTR_DAC(_num, _store, _addr) \
- IIO_DEVICE_ATTR(dac_##_num, S_IWUSR, NULL, _store, _addr)
-
#define IIO_DEV_ATTR_OUT_RAW(_num, _store, _addr) \
IIO_DEVICE_ATTR(out##_num##_raw, S_IWUSR, NULL, _store, _addr)
--
1.6.0.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH 4/4] staging: iio: dac: Cleanup style - no functional changes
2010-11-19 14:16 [PATCH 1/4] staging: iio: dac: Update drivers to use new attribute naming michael.hennerich
@ 2010-11-19 14:16 ` michael.hennerich
0 siblings, 0 replies; 3+ messages in thread
From: michael.hennerich @ 2010-11-19 14:16 UTC (permalink / raw)
To: greg; +Cc: jic23, linux-iio, drivers, device-drivers-devel,
Michael Hennerich
From: Michael Hennerich <michael.hennerich@analog.com>
Stick to the 80 character line limit at least for code
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
---
drivers/staging/iio/dac/ad5624r_spi.c | 67 +++++++++++++++++----------------
1 files changed, 35 insertions(+), 32 deletions(-)
diff --git a/drivers/staging/iio/dac/ad5624r_spi.c b/drivers/staging/iio/dac/ad5624r_spi.c
index b7c1661..2b1c6dd 100644
--- a/drivers/staging/iio/dac/ad5624r_spi.c
+++ b/drivers/staging/iio/dac/ad5624r_spi.c
@@ -57,9 +57,8 @@ static int ad5624r_spi_write(struct spi_device *spi,
}
static ssize_t ad5624r_write_dac(struct device *dev,
- struct device_attribute *attr,
- const char *buf,
- size_t len)
+ struct device_attribute *attr,
+ const char *buf, size_t len)
{
long readin;
int ret;
@@ -72,13 +71,12 @@ static ssize_t ad5624r_write_dac(struct device *dev,
return ret;
ret = ad5624r_spi_write(st->us, AD5624R_CMD_WRITE_INPUT_N_UPDATE_N,
- this_attr->address, readin, st->data_len);
+ this_attr->address, readin, st->data_len);
return ret ? ret : len;
}
static ssize_t ad5624r_read_ldac_mode(struct device *dev,
- struct device_attribute *attr,
- char *buf)
+ struct device_attribute *attr, char *buf)
{
struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct ad5624r_state *st = indio_dev->dev_data;
@@ -87,9 +85,8 @@ static ssize_t ad5624r_read_ldac_mode(struct device *dev,
}
static ssize_t ad5624r_write_ldac_mode(struct device *dev,
- struct device_attribute *attr,
- const char *buf,
- size_t len)
+ struct device_attribute *attr,
+ const char *buf, size_t len)
{
long readin;
int ret;
@@ -100,15 +97,16 @@ static ssize_t ad5624r_write_ldac_mode(struct device *dev,
if (ret)
return ret;
- ret = ad5624r_spi_write(st->us, AD5624R_CMD_LDAC_SETUP, 0, readin & 0xF, 16);
+ ret = ad5624r_spi_write(st->us, AD5624R_CMD_LDAC_SETUP, 0,
+ readin & 0xF, 16);
st->ldac_mode = readin & 0xF;
return ret ? ret : len;
}
static ssize_t ad5624r_read_dac_power_mode(struct device *dev,
- struct device_attribute *attr,
- char *buf)
+ struct device_attribute *attr,
+ char *buf)
{
struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct ad5624r_state *st = indio_dev->dev_data;
@@ -118,9 +116,8 @@ static ssize_t ad5624r_read_dac_power_mode(struct device *dev,
}
static ssize_t ad5624r_write_dac_power_mode(struct device *dev,
- struct device_attribute *attr,
- const char *buf,
- size_t len)
+ struct device_attribute *attr,
+ const char *buf, size_t len)
{
long readin;
int ret;
@@ -133,7 +130,8 @@ static ssize_t ad5624r_write_dac_power_mode(struct device *dev,
return ret;
ret = ad5624r_spi_write(st->us, AD5624R_CMD_POWERDOWN_DAC, 0,
- ((readin & 0x3) << 4) | (1 << this_attr->address), 16);
+ ((readin & 0x3) << 4) |
+ (1 << this_attr->address), 16);
st->dac_power_mode[this_attr->address] = readin & 0x3;
@@ -141,8 +139,8 @@ static ssize_t ad5624r_write_dac_power_mode(struct device *dev,
}
static ssize_t ad5624r_read_internal_ref_mode(struct device *dev,
- struct device_attribute *attr,
- char *buf)
+ struct device_attribute *attr,
+ char *buf)
{
struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct ad5624r_state *st = indio_dev->dev_data;
@@ -151,9 +149,8 @@ static ssize_t ad5624r_read_internal_ref_mode(struct device *dev,
}
static ssize_t ad5624r_write_internal_ref_mode(struct device *dev,
- struct device_attribute *attr,
- const char *buf,
- size_t len)
+ struct device_attribute *attr,
+ const char *buf, size_t len)
{
long readin;
int ret;
@@ -164,7 +161,8 @@ static ssize_t ad5624r_write_internal_ref_mode(struct device *dev,
if (ret)
return ret;
- ret = ad5624r_spi_write(st->us, AD5624R_CMD_INTERNAL_REFER_SETUP, 0, !!readin, 16);
+ ret = ad5624r_spi_write(st->us, AD5624R_CMD_INTERNAL_REFER_SETUP, 0,
+ !!readin, 16);
st->internal_ref = !!readin;
@@ -177,17 +175,22 @@ static IIO_DEV_ATTR_OUT_RAW(2, ad5624r_write_dac, AD5624R_ADDR_DAC2);
static IIO_DEV_ATTR_OUT_RAW(3, ad5624r_write_dac, AD5624R_ADDR_DAC3);
static IIO_DEVICE_ATTR(ldac_mode, S_IRUGO | S_IWUSR, ad5624r_read_ldac_mode,
- ad5624r_write_ldac_mode, 0);
-static IIO_DEVICE_ATTR(internal_ref, S_IRUGO | S_IWUSR, ad5624r_read_internal_ref_mode,
- ad5624r_write_internal_ref_mode, 0);
+ ad5624r_write_ldac_mode, 0);
+static IIO_DEVICE_ATTR(internal_ref, S_IRUGO | S_IWUSR,
+ ad5624r_read_internal_ref_mode,
+ ad5624r_write_internal_ref_mode, 0);
#define IIO_DEV_ATTR_DAC_POWER_MODE(_num, _show, _store, _addr) \
IIO_DEVICE_ATTR(dac_power_mode_##_num, S_IRUGO | S_IWUSR, _show, _store, _addr)
-static IIO_DEV_ATTR_DAC_POWER_MODE(0, ad5624r_read_dac_power_mode, ad5624r_write_dac_power_mode, 0);
-static IIO_DEV_ATTR_DAC_POWER_MODE(1, ad5624r_read_dac_power_mode, ad5624r_write_dac_power_mode, 1);
-static IIO_DEV_ATTR_DAC_POWER_MODE(2, ad5624r_read_dac_power_mode, ad5624r_write_dac_power_mode, 2);
-static IIO_DEV_ATTR_DAC_POWER_MODE(3, ad5624r_read_dac_power_mode, ad5624r_write_dac_power_mode, 3);
+static IIO_DEV_ATTR_DAC_POWER_MODE(0, ad5624r_read_dac_power_mode,
+ ad5624r_write_dac_power_mode, 0);
+static IIO_DEV_ATTR_DAC_POWER_MODE(1, ad5624r_read_dac_power_mode,
+ ad5624r_write_dac_power_mode, 1);
+static IIO_DEV_ATTR_DAC_POWER_MODE(2, ad5624r_read_dac_power_mode,
+ ad5624r_write_dac_power_mode, 2);
+static IIO_DEV_ATTR_DAC_POWER_MODE(3, ad5624r_read_dac_power_mode,
+ ad5624r_write_dac_power_mode, 3);
static struct attribute *ad5624r_attributes[] = {
&iio_dev_attr_out0_raw.dev_attr.attr,
@@ -272,9 +275,9 @@ static const struct spi_device_id ad5624r_id[] = {
static struct spi_driver ad5624r_driver = {
.driver = {
- .name = "ad5624r",
- .owner = THIS_MODULE,
- },
+ .name = "ad5624r",
+ .owner = THIS_MODULE,
+ },
.probe = ad5624r_probe,
.remove = __devexit_p(ad5624r_remove),
.id_table = ad5624r_id,
--
1.6.0.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-11-19 14:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-11-19 12:47 [PATCH 4/4] staging: iio: dac: Cleanup style - no functional changes michael.hennerich
2010-11-19 14:14 ` Jonathan Cameron
-- strict thread matches above, loose matches on Subject: below --
2010-11-19 14:16 [PATCH 1/4] staging: iio: dac: Update drivers to use new attribute naming michael.hennerich
2010-11-19 14:16 ` [PATCH 4/4] staging: iio: dac: Cleanup style - no functional changes michael.hennerich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox