@@ -134,18 +134,12 @@ AD7944_DEFINE_CHIP_INFO(ad7985, ad7944, 16, 0);
134
134
/* fully differential */
135
135
AD7944_DEFINE_CHIP_INFO (ad7986 , ad7986 , 18 , 1 );
136
136
137
- static void ad7944_unoptimize_msg (void * msg )
138
- {
139
- spi_unoptimize_message (msg );
140
- }
141
-
142
137
static int ad7944_3wire_cs_mode_init_msg (struct device * dev , struct ad7944_adc * adc ,
143
138
const struct iio_chan_spec * chan )
144
139
{
145
140
unsigned int t_conv_ns = adc -> always_turbo ? adc -> timing_spec -> turbo_conv_ns
146
141
: adc -> timing_spec -> conv_ns ;
147
142
struct spi_transfer * xfers = adc -> xfers ;
148
- int ret ;
149
143
150
144
/*
151
145
* NB: can get better performance from some SPI controllers if we use
@@ -175,11 +169,7 @@ static int ad7944_3wire_cs_mode_init_msg(struct device *dev, struct ad7944_adc *
175
169
176
170
spi_message_init_with_transfers (& adc -> msg , xfers , 3 );
177
171
178
- ret = spi_optimize_message (adc -> spi , & adc -> msg );
179
- if (ret )
180
- return ret ;
181
-
182
- return devm_add_action_or_reset (dev , ad7944_unoptimize_msg , & adc -> msg );
172
+ return devm_spi_optimize_message (dev , adc -> spi , & adc -> msg );
183
173
}
184
174
185
175
static int ad7944_4wire_mode_init_msg (struct device * dev , struct ad7944_adc * adc ,
@@ -188,7 +178,6 @@ static int ad7944_4wire_mode_init_msg(struct device *dev, struct ad7944_adc *adc
188
178
unsigned int t_conv_ns = adc -> always_turbo ? adc -> timing_spec -> turbo_conv_ns
189
179
: adc -> timing_spec -> conv_ns ;
190
180
struct spi_transfer * xfers = adc -> xfers ;
191
- int ret ;
192
181
193
182
/*
194
183
* NB: can get better performance from some SPI controllers if we use
@@ -209,19 +198,14 @@ static int ad7944_4wire_mode_init_msg(struct device *dev, struct ad7944_adc *adc
209
198
210
199
spi_message_init_with_transfers (& adc -> msg , xfers , 2 );
211
200
212
- ret = spi_optimize_message (adc -> spi , & adc -> msg );
213
- if (ret )
214
- return ret ;
215
-
216
- return devm_add_action_or_reset (dev , ad7944_unoptimize_msg , & adc -> msg );
201
+ return devm_spi_optimize_message (dev , adc -> spi , & adc -> msg );
217
202
}
218
203
219
204
static int ad7944_chain_mode_init_msg (struct device * dev , struct ad7944_adc * adc ,
220
205
const struct iio_chan_spec * chan ,
221
206
u32 n_chain_dev )
222
207
{
223
208
struct spi_transfer * xfers = adc -> xfers ;
224
- int ret ;
225
209
226
210
/*
227
211
* NB: SCLK has to be low before we toggle CS to avoid triggering the
@@ -249,11 +233,7 @@ static int ad7944_chain_mode_init_msg(struct device *dev, struct ad7944_adc *adc
249
233
250
234
spi_message_init_with_transfers (& adc -> msg , xfers , 2 );
251
235
252
- ret = spi_optimize_message (adc -> spi , & adc -> msg );
253
- if (ret )
254
- return ret ;
255
-
256
- return devm_add_action_or_reset (dev , ad7944_unoptimize_msg , & adc -> msg );
236
+ return devm_spi_optimize_message (dev , adc -> spi , & adc -> msg );
257
237
}
258
238
259
239
/**
0 commit comments