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

media: v4l2-subdev: 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
v4l2_spi_new_subdev().

Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/b6e3a53ce75dfb8a21a5958a381070944dfa0875.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
d920b3a6 dd868ae6

+5 -5
+2 -2
drivers/media/v4l2-core/v4l2-spi.c
··· 34 34 EXPORT_SYMBOL_GPL(v4l2_spi_subdev_init); 35 35 36 36 struct v4l2_subdev *v4l2_spi_new_subdev(struct v4l2_device *v4l2_dev, 37 - struct spi_master *master, 37 + struct spi_controller *ctlr, 38 38 struct spi_board_info *info) 39 39 { 40 40 struct v4l2_subdev *sd = NULL; ··· 45 45 if (info->modalias[0]) 46 46 request_module(info->modalias); 47 47 48 - spi = spi_new_device(master, info); 48 + spi = spi_new_device(ctlr, info); 49 49 50 50 if (!spi || !spi->dev.driver) 51 51 goto error;
+3 -3
include/media/v4l2-common.h
··· 278 278 * 279 279 * 280 280 * @v4l2_dev: pointer to &struct v4l2_device. 281 - * @master: pointer to struct spi_master. 281 + * @ctlr: pointer to struct spi_controller. 282 282 * @info: pointer to struct spi_board_info. 283 283 * 284 284 * returns a &struct v4l2_subdev pointer. 285 285 */ 286 286 struct v4l2_subdev *v4l2_spi_new_subdev(struct v4l2_device *v4l2_dev, 287 - struct spi_master *master, struct spi_board_info *info); 287 + struct spi_controller *ctlr, struct spi_board_info *info); 288 288 289 289 /** 290 290 * v4l2_spi_subdev_init - Initialize a v4l2_subdev with data from an ··· 308 308 309 309 static inline struct v4l2_subdev * 310 310 v4l2_spi_new_subdev(struct v4l2_device *v4l2_dev, 311 - struct spi_master *master, struct spi_board_info *info) 311 + struct spi_controller *ctlr, struct spi_board_info *info) 312 312 { 313 313 return NULL; 314 314 }