staging: iio: dac: Update drivers to use new attribute naming
Subsystems (4)
[email protected]
maintainerPATCH 1/3 staging: iio: dac: Update drivers to use new attribute naming
From: Michael Hennerich <[email protected]>
Remove depreciated macro from header
--- drivers/staging/iio/dac/ad5624r_spi.c | 16 ++++++++-------- drivers/staging/iio/dac/dac.h | 4 ---- 2 files changed, 8 insertions(+), 12 deletions(-)
drivers/staging/iio/dac/ad5624r_spi.c +8 -8
@@ -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,
drivers/staging/iio/dac/dac.h +0 -4
@@ -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)
Signature · 1 line
1.6.0.2
[email protected]
maintainerPATCH 2/3 staging: iio: dac: Use spi_write() and handle return value
From: Michael Hennerich <[email protected]>
--- drivers/staging/iio/dac/ad5624r_spi.c | 23 +++++++---------------- 1 files changed, 7 insertions(+), 16 deletions(-)
drivers/staging/iio/dac/ad5624r_spi.c +7 -16
@@ -35,10 +35,9 @@ struct ad5624r_state {int internal_ref; }; -static int ad5624r_spi_write (struct spi_device *spi,u8 cmd,u8 addr,u16 val,u8 len) +static int ad5624r_spi_write (struct spi_device *spi, +u8 cmd,u8 addr,u16 val,u8 len) { -struct spi_transfer t; -struct spi_message m;u32 data;u8 msg[3 ];
@@ -54,15 +53,7 @@ static int ad5624r_spi_write(struct spi_device *spi, u8 cmd, u8 addr, u16 val, u msg[1 ] = data >>8 ; msg[2 ] = data; -spi_message_init (&m); -memset (&t,0 , (sizeof t)); - t.tx_buf = &msg[0 ]; - t.len =3 ; - -spi_message_add_tail (&t, &m); -spi_sync (spi, &m); - -return len; +return spi_write (spi, msg,3 ); } static ssize_t ad5624r_write_dac(struct device *dev,
@@ -80,7 +71,7 @@ static ssize_t ad5624r_write_dac(struct device *dev,if (ret)return ret; -ad5624r_spi_write (st->us,AD5624R_CMD_WRITE_INPUT_N_UPDATE_N , + ret =ad5624r_spi_write (st->us,AD5624R_CMD_WRITE_INPUT_N_UPDATE_N , this_attr->address, readin, st->data_len);return ret ? ret : len; }
@@ -109,7 +100,7 @@ static ssize_t ad5624r_write_ldac_mode(struct device *dev,if (ret)return 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;
@@ -141,7 +132,7 @@ static ssize_t ad5624r_write_dac_power_mode(struct device *dev,if (ret)return ret; -ad5624r_spi_write (st->us,AD5624R_CMD_POWERDOWN_DAC ,0 , + ret =ad5624r_spi_write (st->us,AD5624R_CMD_POWERDOWN_DAC ,0 , ((readin &0x3 ) <<4 ) | (1 << this_attr->address),16 ); st->dac_power_mode[this_attr->address] = readin &0x3 ;
@@ -173,7 +164,7 @@ static ssize_t ad5624r_write_internal_ref_mode(struct device *dev,if (ret)return 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;
Signature · 1 line
1.6.0.2
Re: [PATCH 2/3] staging: iio: dac: Use spi_write() and handle return value
Quoted 4 lines · On 11/19/10 12:34, [email protected] wrote:
From: Michael Hennerich <[email protected]>
Signed-off-by Michael Hennerich <[email protected]>
Quoted 74 lines
--- drivers/staging/iio/dac/ad5624r_spi.c | 23 +++++++---------------- 1 files changed, 7 insertions(+), 16 deletions(-)drivers/staging/iio/dac/ad5624r_spi.c +7
-16@@ -35,10 +35,9 @@ struct ad5624r_state {int internal_ref; }; -static int ad5624r_spi_write (struct spi_device *spi,u8 cmd,u8 addr,u16 val,u8 len) +static int ad5624r_spi_write (struct spi_device *spi, +u8 cmd,u8 addr,u16 val,u8 len) { -struct spi_transfer t; -struct spi_message m;u32 data;u8 msg[3 ];@@ -54,15 +53,7 @@ static int ad5624r_spi_write(struct spi_device *spi, u8 cmd, u8 addr, u16 val, u msg[1 ] = data >>8 ; msg[2 ] = data; -spi_message_init (&m); -memset (&t,0 , (sizeof t)); - t.tx_buf = &msg[0 ]; - t.len =3 ; - -spi_message_add_tail (&t, &m); -spi_sync (spi, &m); - -return len; +return spi_write (spi, msg,3 ); } static ssize_t ad5624r_write_dac(struct device *dev,@@ -80,7 +71,7 @@ static ssize_t ad5624r_write_dac(struct device *dev,if (ret)return ret; -ad5624r_spi_write (st->us,AD5624R_CMD_WRITE_INPUT_N_UPDATE_N , + ret =ad5624r_spi_write (st->us,AD5624R_CMD_WRITE_INPUT_N_UPDATE_N , this_attr->address, readin, st->data_len);return ret ? ret : len; }@@ -109,7 +100,7 @@ static ssize_t ad5624r_write_ldac_mode(struct device *dev,if (ret)return 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;@@ -141,7 +132,7 @@ static ssize_t ad5624r_write_dac_power_mode(struct device *dev,if (ret)return ret; -ad5624r_spi_write (st->us,AD5624R_CMD_POWERDOWN_DAC ,0 , + ret =ad5624r_spi_write (st->us,AD5624R_CMD_POWERDOWN_DAC ,0 , ((readin &0x3 ) <<4 ) | (1 << this_attr->address),16 ); st->dac_power_mode[this_attr->address] = readin &0x3 ;@@ -173,7 +164,7 @@ static ssize_t ad5624r_write_internal_ref_mode(struct device *dev,if (ret)return 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;
[email protected]
maintainerPATCH 3/3 staging: iio: dac: Use spi_device_id
In reply to [email protected]From: Michael Hennerich <[email protected]>
--- drivers/staging/iio/dac/ad5624r_spi.c | 25 +++++++++---------------- 1 files changed, 9 insertions(+), 16 deletions(-)
drivers/staging/iio/dac/ad5624r_spi.c +9 -16
@@ -209,13 +209,8 @@ static const struct attribute_group ad5624r_attribute_group = {static int __devinit ad5624r_probe (struct spi_device *spi) { -struct ad5624r_state *st;int ret =0 ; -char *chip_name = spi->dev.platform_data; - -if (!chip_name) -return -ENODEV ; st =kzalloc (sizeof (*st),GFP_KERNEL );if (st ==NULL ) {
@@ -224,17 +219,7 @@ static int __devinit ad5624r_probe(struct spi_device *spi) }spi_set_drvdata (spi, st); -if (strcmp (chip_name,"ad5624r" ) ==0 ) - st->data_len =12 ; -else if (strcmp (chip_name,"ad5644r" ) ==0 ) - st->data_len =14 ; -else if (strcmp (chip_name,"ad5664r" ) ==0 ) - st->data_len =16 ; -else { -dev_err (&spi->dev,"not supported chip type\n" ); - ret = -EINVAL ; - goto error_ret; - } + st->data_len =spi_get_device_id (spi)->driver_data; st->us = spi; st->indio_dev =iio_allocate_device ();
@@ -278,6 +263,13 @@ static int __devexit ad5624r_remove(struct spi_device *spi)return 0 ; } +static const struct spi_device_id ad5624r_id[] = { + {"ad5624r" ,12 }, + {"ad5644r" ,14 }, + {"ad5664r" ,16 }, + {} +}; +static struct spi_driver ad5624r_driver = { .driver = { .name ="ad5624r" ,
@@ -285,6 +277,7 @@ static struct spi_driver ad5624r_driver = { }, .probe = ad5624r_probe, .remove = __devexit_p(ad5624r_remove), + .id_table = ad5624r_id, };static __init int ad5624r_spi_init (void )
Signature · 1 line
1.6.0.2
Re: [PATCH 3/3] staging: iio: dac: Use spi_device_id
Quoted 3 lines · On 11/19/10 12:34, [email protected] wrote:
From: Michael Hennerich <[email protected]>
Nice clean up.
Quoted 1 line
Signed-off-by Michael Hennerich <[email protected]>
Quoted 63 lines
--- drivers/staging/iio/dac/ad5624r_spi.c | 25 +++++++++---------------- 1 files changed, 9 insertions(+), 16 deletions(-)drivers/staging/iio/dac/ad5624r_spi.c +9
-16@@ -209,13 +209,8 @@ static const struct attribute_group ad5624r_attribute_group = {static int __devinit ad5624r_probe (struct spi_device *spi) { -struct ad5624r_state *st;int ret =0 ; -char *chip_name = spi->dev.platform_data; - -if (!chip_name) -return -ENODEV ; st =kzalloc (sizeof (*st),GFP_KERNEL );if (st ==NULL ) {@@ -224,17 +219,7 @@ static int __devinit ad5624r_probe(struct spi_device *spi) }spi_set_drvdata (spi, st); -if (strcmp (chip_name,"ad5624r" ) ==0 ) - st->data_len =12 ; -else if (strcmp (chip_name,"ad5644r" ) ==0 ) - st->data_len =14 ; -else if (strcmp (chip_name,"ad5664r" ) ==0 ) - st->data_len =16 ; -else { -dev_err (&spi->dev,"not supported chip type\n" ); - ret = -EINVAL ; - goto error_ret; - } + st->data_len =spi_get_device_id (spi)->driver_data; st->us = spi; st->indio_dev =iio_allocate_device ();@@ -278,6 +263,13 @@ static int __devexit ad5624r_remove(struct spi_device *spi)return 0 ; } +static const struct spi_device_id ad5624r_id[] = { + {"ad5624r" ,12 }, + {"ad5644r" ,14 }, + {"ad5664r" ,16 }, + {} +}; +static struct spi_driver ad5624r_driver = { .driver = { .name ="ad5624r" ,@@ -285,6 +277,7 @@ static struct spi_driver ad5624r_driver = { }, .probe = ad5624r_probe, .remove = __devexit_p(ad5624r_remove), + .id_table = ad5624r_id, };static __init int ad5624r_spi_init (void )
Quoted 3 lines · On 11/19/10 12:34, [email protected] wrote:
From: Michael Hennerich <[email protected]>
Remove depreciated macro from header
Might be slightly preferable to do this as two patches, one to move to the new naming and a second to deprecate the header. Doesn't really matter though as there is only the one user in tree.
Quoted 2 lines
Signed-off-by Michael Hennerich <[email protected]>
Quoted 53 lines
--- drivers/staging/iio/dac/ad5624r_spi.c | 16 ++++++++-------- drivers/staging/iio/dac/dac.h | 4 ---- 2 files changed, 8 insertions(+), 12 deletions(-)drivers/staging/iio/dac/ad5624r_spi.c +8
-8@@ -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,drivers/staging/iio/dac/dac.h +0
-4@@ -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)