Skip to content

Commit be0534b

Browse files
dlechnunojsa
authored andcommitted
iio: adc: ad7944: use devm_spi_optimize_message()
Use new devm_spi_optimize_message() helper to simplify repeated code in the ad7944 driver. Signed-off-by: David Lechner <dlechner@baylibre.com> Link: https://patch.msgid.link/20240624-devm_spi_optimize_message-v3-2-912138c27b66@baylibre.com Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
1 parent b55e545 commit be0534b

File tree

1 file changed

+3
-23
lines changed

1 file changed

+3
-23
lines changed

drivers/iio/adc/ad7944.c

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -134,18 +134,12 @@ AD7944_DEFINE_CHIP_INFO(ad7985, ad7944, 16, 0);
134134
/* fully differential */
135135
AD7944_DEFINE_CHIP_INFO(ad7986, ad7986, 18, 1);
136136

137-
static void ad7944_unoptimize_msg(void *msg)
138-
{
139-
spi_unoptimize_message(msg);
140-
}
141-
142137
static int ad7944_3wire_cs_mode_init_msg(struct device *dev, struct ad7944_adc *adc,
143138
const struct iio_chan_spec *chan)
144139
{
145140
unsigned int t_conv_ns = adc->always_turbo ? adc->timing_spec->turbo_conv_ns
146141
: adc->timing_spec->conv_ns;
147142
struct spi_transfer *xfers = adc->xfers;
148-
int ret;
149143

150144
/*
151145
* 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 *
175169

176170
spi_message_init_with_transfers(&adc->msg, xfers, 3);
177171

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);
183173
}
184174

185175
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
188178
unsigned int t_conv_ns = adc->always_turbo ? adc->timing_spec->turbo_conv_ns
189179
: adc->timing_spec->conv_ns;
190180
struct spi_transfer *xfers = adc->xfers;
191-
int ret;
192181

193182
/*
194183
* 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
209198

210199
spi_message_init_with_transfers(&adc->msg, xfers, 2);
211200

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);
217202
}
218203

219204
static int ad7944_chain_mode_init_msg(struct device *dev, struct ad7944_adc *adc,
220205
const struct iio_chan_spec *chan,
221206
u32 n_chain_dev)
222207
{
223208
struct spi_transfer *xfers = adc->xfers;
224-
int ret;
225209

226210
/*
227211
* 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
249233

250234
spi_message_init_with_transfers(&adc->msg, xfers, 2);
251235

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);
257237
}
258238

259239
/**

0 commit comments

Comments
 (0)