mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-03 07:38:10 +00:00
media: v4l2-subdev: Follow renaming of SPI "master" to "controller"
In commit 8caab75fd2
("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>
This commit is contained in:
parent
dd868ae646
commit
d920b3a672
2 changed files with 5 additions and 5 deletions
|
@ -34,7 +34,7 @@ void v4l2_spi_subdev_init(struct v4l2_subdev *sd, struct spi_device *spi,
|
||||||
EXPORT_SYMBOL_GPL(v4l2_spi_subdev_init);
|
EXPORT_SYMBOL_GPL(v4l2_spi_subdev_init);
|
||||||
|
|
||||||
struct v4l2_subdev *v4l2_spi_new_subdev(struct v4l2_device *v4l2_dev,
|
struct v4l2_subdev *v4l2_spi_new_subdev(struct v4l2_device *v4l2_dev,
|
||||||
struct spi_master *master,
|
struct spi_controller *ctlr,
|
||||||
struct spi_board_info *info)
|
struct spi_board_info *info)
|
||||||
{
|
{
|
||||||
struct v4l2_subdev *sd = NULL;
|
struct v4l2_subdev *sd = NULL;
|
||||||
|
@ -45,7 +45,7 @@ struct v4l2_subdev *v4l2_spi_new_subdev(struct v4l2_device *v4l2_dev,
|
||||||
if (info->modalias[0])
|
if (info->modalias[0])
|
||||||
request_module(info->modalias);
|
request_module(info->modalias);
|
||||||
|
|
||||||
spi = spi_new_device(master, info);
|
spi = spi_new_device(ctlr, info);
|
||||||
|
|
||||||
if (!spi || !spi->dev.driver)
|
if (!spi || !spi->dev.driver)
|
||||||
goto error;
|
goto error;
|
||||||
|
|
|
@ -278,13 +278,13 @@ static inline void v4l2_i2c_subdev_unregister(struct v4l2_subdev *sd)
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
* @v4l2_dev: pointer to &struct v4l2_device.
|
* @v4l2_dev: pointer to &struct v4l2_device.
|
||||||
* @master: pointer to struct spi_master.
|
* @ctlr: pointer to struct spi_controller.
|
||||||
* @info: pointer to struct spi_board_info.
|
* @info: pointer to struct spi_board_info.
|
||||||
*
|
*
|
||||||
* returns a &struct v4l2_subdev pointer.
|
* returns a &struct v4l2_subdev pointer.
|
||||||
*/
|
*/
|
||||||
struct v4l2_subdev *v4l2_spi_new_subdev(struct v4l2_device *v4l2_dev,
|
struct v4l2_subdev *v4l2_spi_new_subdev(struct v4l2_device *v4l2_dev,
|
||||||
struct spi_master *master, struct spi_board_info *info);
|
struct spi_controller *ctlr, struct spi_board_info *info);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* v4l2_spi_subdev_init - Initialize a v4l2_subdev with data from an
|
* v4l2_spi_subdev_init - Initialize a v4l2_subdev with data from an
|
||||||
|
@ -308,7 +308,7 @@ void v4l2_spi_subdev_unregister(struct v4l2_subdev *sd);
|
||||||
|
|
||||||
static inline struct v4l2_subdev *
|
static inline struct v4l2_subdev *
|
||||||
v4l2_spi_new_subdev(struct v4l2_device *v4l2_dev,
|
v4l2_spi_new_subdev(struct v4l2_device *v4l2_dev,
|
||||||
struct spi_master *master, struct spi_board_info *info)
|
struct spi_controller *ctlr, struct spi_board_info *info)
|
||||||
{
|
{
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue