aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/staging/iio/dac/ad5624r_spi.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/staging/iio/dac/ad5624r_spi.c b/drivers/staging/iio/dac/ad5624r_spi.c
index 0f97ce02fcd..a945b18ff84 100644
--- a/drivers/staging/iio/dac/ad5624r_spi.c
+++ b/drivers/staging/iio/dac/ad5624r_spi.c
@@ -77,7 +77,7 @@ static ssize_t ad5624r_write_dac(struct device *dev,
77 long readin; 77 long readin;
78 int ret; 78 int ret;
79 struct iio_dev *indio_dev = dev_get_drvdata(dev); 79 struct iio_dev *indio_dev = dev_get_drvdata(dev);
80 struct ad5624r_state *st = indio_dev->dev_data; 80 struct ad5624r_state *st = iio_dev_get_devdata(indio_dev);
81 struct iio_dev_attr *this_attr = to_iio_dev_attr(attr); 81 struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
82 82
83 ret = strict_strtol(buf, 10, &readin); 83 ret = strict_strtol(buf, 10, &readin);
@@ -94,7 +94,7 @@ static ssize_t ad5624r_read_powerdown_mode(struct device *dev,
94 struct device_attribute *attr, char *buf) 94 struct device_attribute *attr, char *buf)
95{ 95{
96 struct iio_dev *indio_dev = dev_get_drvdata(dev); 96 struct iio_dev *indio_dev = dev_get_drvdata(dev);
97 struct ad5624r_state *st = indio_dev->dev_data; 97 struct ad5624r_state *st = iio_dev_get_devdata(indio_dev);
98 98
99 char mode[][15] = {"", "1kohm_to_gnd", "100kohm_to_gnd", "three_state"}; 99 char mode[][15] = {"", "1kohm_to_gnd", "100kohm_to_gnd", "three_state"};
100 100
@@ -106,7 +106,7 @@ static ssize_t ad5624r_write_powerdown_mode(struct device *dev,
106 const char *buf, size_t len) 106 const char *buf, size_t len)
107{ 107{
108 struct iio_dev *indio_dev = dev_get_drvdata(dev); 108 struct iio_dev *indio_dev = dev_get_drvdata(dev);
109 struct ad5624r_state *st = indio_dev->dev_data; 109 struct ad5624r_state *st = iio_dev_get_devdata(indio_dev);
110 int ret; 110 int ret;
111 111
112 if (sysfs_streq(buf, "1kohm_to_gnd")) 112 if (sysfs_streq(buf, "1kohm_to_gnd"))
@@ -126,7 +126,7 @@ static ssize_t ad5624r_read_dac_powerdown(struct device *dev,
126 char *buf) 126 char *buf)
127{ 127{
128 struct iio_dev *indio_dev = dev_get_drvdata(dev); 128 struct iio_dev *indio_dev = dev_get_drvdata(dev);
129 struct ad5624r_state *st = indio_dev->dev_data; 129 struct ad5624r_state *st = iio_dev_get_devdata(indio_dev);
130 struct iio_dev_attr *this_attr = to_iio_dev_attr(attr); 130 struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
131 131
132 return sprintf(buf, "%d\n", 132 return sprintf(buf, "%d\n",
@@ -140,7 +140,7 @@ static ssize_t ad5624r_write_dac_powerdown(struct device *dev,
140 long readin; 140 long readin;
141 int ret; 141 int ret;
142 struct iio_dev *indio_dev = dev_get_drvdata(dev); 142 struct iio_dev *indio_dev = dev_get_drvdata(dev);
143 struct ad5624r_state *st = indio_dev->dev_data; 143 struct ad5624r_state *st = iio_dev_get_devdata(indio_dev);
144 struct iio_dev_attr *this_attr = to_iio_dev_attr(attr); 144 struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
145 145
146 ret = strict_strtol(buf, 10, &readin); 146 ret = strict_strtol(buf, 10, &readin);
@@ -165,8 +165,8 @@ static ssize_t ad5624r_show_scale(struct device *dev,
165 struct device_attribute *attr, 165 struct device_attribute *attr,
166 char *buf) 166 char *buf)
167{ 167{
168 struct iio_dev *dev_info = dev_get_drvdata(dev); 168 struct iio_dev *indio_dev = dev_get_drvdata(dev);
169 struct ad5624r_state *st = iio_dev_get_devdata(dev_info); 169 struct ad5624r_state *st = iio_dev_get_devdata(indio_dev);
170 /* Corresponds to Vref / 2^(bits) */ 170 /* Corresponds to Vref / 2^(bits) */
171 unsigned int scale_uv = (st->vref_mv * 1000) >> st->chip_info->bits; 171 unsigned int scale_uv = (st->vref_mv * 1000) >> st->chip_info->bits;
172 172
@@ -178,8 +178,8 @@ static ssize_t ad5624r_show_name(struct device *dev,
178 struct device_attribute *attr, 178 struct device_attribute *attr,
179 char *buf) 179 char *buf)
180{ 180{
181 struct iio_dev *dev_info = dev_get_drvdata(dev); 181 struct iio_dev *indio_dev = dev_get_drvdata(dev);
182 struct ad5624r_state *st = iio_dev_get_devdata(dev_info); 182 struct ad5624r_state *st = iio_dev_get_devdata(indio_dev);
183 183
184 return sprintf(buf, "%s\n", spi_get_device_id(st->us)->name); 184 return sprintf(buf, "%s\n", spi_get_device_id(st->us)->name);
185} 185}