tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

iio: adc: ad_sigma_delta: Follow renaming of SPI "master" to "controller"

In commit 8caab75fd2c2 ("spi: Generalize SPI "master" to "controller"")
some functions and struct members were renamed. To not break all drivers
compatibility macros were provided.

To be able to remove these compatibility macros push the renaming into
this driver.

Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: Nuno Sa <nuno.sa@analog.com>
Link: https://lore.kernel.org/r/de866d09c80c89816df62602ba4ba8ba30e9971f.1707324794.git.u.kleine-koenig@pengutronix.de
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Uwe Kleine-König and committed by
Mark Brown 2780e7b7 167b7844

+7 -7
+7 -7
drivers/iio/adc/ad_sigma_delta.c
··· 212 212 if (ret) 213 213 return ret; 214 214 215 - spi_bus_lock(sigma_delta->spi->master); 215 + spi_bus_lock(sigma_delta->spi->controller); 216 216 sigma_delta->bus_locked = true; 217 217 sigma_delta->keep_cs_asserted = true; 218 218 reinit_completion(&sigma_delta->completion); ··· 235 235 sigma_delta->keep_cs_asserted = false; 236 236 ad_sigma_delta_set_mode(sigma_delta, AD_SD_MODE_IDLE); 237 237 sigma_delta->bus_locked = false; 238 - spi_bus_unlock(sigma_delta->spi->master); 238 + spi_bus_unlock(sigma_delta->spi->controller); 239 239 240 240 return ret; 241 241 } ··· 287 287 288 288 ad_sigma_delta_set_channel(sigma_delta, chan->address); 289 289 290 - spi_bus_lock(sigma_delta->spi->master); 290 + spi_bus_lock(sigma_delta->spi->controller); 291 291 sigma_delta->bus_locked = true; 292 292 sigma_delta->keep_cs_asserted = true; 293 293 reinit_completion(&sigma_delta->completion); ··· 322 322 sigma_delta->keep_cs_asserted = false; 323 323 ad_sigma_delta_set_mode(sigma_delta, AD_SD_MODE_IDLE); 324 324 sigma_delta->bus_locked = false; 325 - spi_bus_unlock(sigma_delta->spi->master); 325 + spi_bus_unlock(sigma_delta->spi->controller); 326 326 iio_device_release_direct_mode(indio_dev); 327 327 328 328 if (ret) ··· 387 387 388 388 sigma_delta->samples_buf = samples_buf; 389 389 390 - spi_bus_lock(sigma_delta->spi->master); 390 + spi_bus_lock(sigma_delta->spi->controller); 391 391 sigma_delta->bus_locked = true; 392 392 sigma_delta->keep_cs_asserted = true; 393 393 ··· 401 401 return 0; 402 402 403 403 err_unlock: 404 - spi_bus_unlock(sigma_delta->spi->master); 404 + spi_bus_unlock(sigma_delta->spi->controller); 405 405 406 406 return ret; 407 407 } ··· 426 426 427 427 ad_sigma_delta_disable_all(sigma_delta); 428 428 sigma_delta->bus_locked = false; 429 - return spi_bus_unlock(sigma_delta->spi->master); 429 + return spi_bus_unlock(sigma_delta->spi->controller); 430 430 } 431 431 432 432 static irqreturn_t ad_sd_trigger_handler(int irq, void *p)