diff options
Diffstat (limited to 'drivers/media/spi')
| -rw-r--r-- | drivers/media/spi/Kconfig | 26 | ||||
| -rw-r--r-- | drivers/media/spi/Makefile | 7 | ||||
| -rw-r--r-- | drivers/media/spi/cxd2880-spi.c | 4 | ||||
| -rw-r--r-- | drivers/media/spi/gs1662.c | 4 |
4 files changed, 16 insertions, 25 deletions
diff --git a/drivers/media/spi/Kconfig b/drivers/media/spi/Kconfig index 857ef4ace6e9..4656afae5bb4 100644 --- a/drivers/media/spi/Kconfig +++ b/drivers/media/spi/Kconfig @@ -1,25 +1,9 @@ # SPDX-License-Identifier: GPL-2.0-only -if VIDEO_V4L2 +if VIDEO_DEV && SPI comment "SPI I2C drivers auto-selected by 'Autoselect ancillary drivers'" depends on MEDIA_HIDE_ANCILLARY_SUBDRV && SPI -menu "SPI helper chips" - visible if !MEDIA_HIDE_ANCILLARY_SUBDRV - -config VIDEO_GS1662 - tristate "Gennum Serializers video" - depends on SPI && VIDEO_V4L2 - select MEDIA_CONTROLLER - select VIDEO_V4L2_SUBDEV_API - help - Enable the GS1662 driver which serializes video streams. - -endmenu - -endif - -if SPI menu "Media SPI Adapters" config CXD2880_SPI_DRV @@ -29,6 +13,14 @@ config CXD2880_SPI_DRV help Choose if you would like to have SPI interface support for Sony CXD2880. +config VIDEO_GS1662 + tristate "Gennum Serializers video" + depends on SPI && VIDEO_DEV + select MEDIA_CONTROLLER + select VIDEO_V4L2_SUBDEV_API + help + Enable the GS1662 driver which serializes video streams. + endmenu endif diff --git a/drivers/media/spi/Makefile b/drivers/media/spi/Makefile index 9f45787d680d..6ac7adc64124 100644 --- a/drivers/media/spi/Makefile +++ b/drivers/media/spi/Makefile @@ -1,5 +1,8 @@ # SPDX-License-Identifier: GPL-2.0-only -obj-$(CONFIG_VIDEO_GS1662) += gs1662.o -obj-$(CONFIG_CXD2880_SPI_DRV) += cxd2880-spi.o ccflags-y += -I $(srctree)/drivers/media/dvb-frontends/cxd2880 + +# Please keep it alphabetically sorted by Kconfig name +# (e. g. LC_ALL=C sort Makefile) +obj-$(CONFIG_CXD2880_SPI_DRV) += cxd2880-spi.o +obj-$(CONFIG_VIDEO_GS1662) += gs1662.o diff --git a/drivers/media/spi/cxd2880-spi.c b/drivers/media/spi/cxd2880-spi.c index 6f2a66bc87fb..6be4e5528879 100644 --- a/drivers/media/spi/cxd2880-spi.c +++ b/drivers/media/spi/cxd2880-spi.c @@ -625,7 +625,7 @@ fail_regulator: return ret; } -static int +static void cxd2880_spi_remove(struct spi_device *spi) { struct cxd2880_dvb_spi *dvb_spi = spi_get_drvdata(spi); @@ -643,8 +643,6 @@ cxd2880_spi_remove(struct spi_device *spi) kfree(dvb_spi); pr_info("cxd2880_spi remove ok.\n"); - - return 0; } static const struct spi_device_id cxd2880_spi_id[] = { diff --git a/drivers/media/spi/gs1662.c b/drivers/media/spi/gs1662.c index f86ef1ca1288..75c21a93e6d0 100644 --- a/drivers/media/spi/gs1662.c +++ b/drivers/media/spi/gs1662.c @@ -458,13 +458,11 @@ static int gs_probe(struct spi_device *spi) return ret; } -static int gs_remove(struct spi_device *spi) +static void gs_remove(struct spi_device *spi) { struct v4l2_subdev *sd = spi_get_drvdata(spi); v4l2_device_unregister_subdev(sd); - - return 0; } static struct spi_driver gs_driver = { |