media: sp8870: move it to staging

This driver is used only by av7110, which is preparing for
its retirement. So, move this ancillary driver to stay together
with av7110.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/dvb-frontends/Kconfig b/drivers/media/dvb-frontends/Kconfig
index 3468b07b62fe51432750797c3ca97c25a458966b..2c1ed98d43c55678290fcf80ef3f10fd57b50a17 100644 (file)
--- a/drivers/media/dvb-frontends/Kconfig
+++ b/drivers/media/dvb-frontends/Kconfig
@@ -323,18 +323,6 @@ config DVB_TDA10071
 comment "DVB-T (terrestrial) frontends"
        depends on DVB_CORE
 
-config DVB_SP8870
-       tristate "Spase sp8870 based"
-       depends on DVB_CORE && I2C
-       default m if !MEDIA_SUBDRV_AUTOSELECT
-       help
-         A DVB-T tuner module. Say Y when you want to support this frontend.
-
-         This driver needs external firmware. Please use the command
-         "<kerneldir>/scripts/get_dvb_firmware sp8870" to
-         download/extract it, and then copy it to /usr/lib/hotplug/firmware
-         or /lib/firmware (depending on configuration of firmware hotplug).
-
 config DVB_SP887X
        tristate "Spase sp887x based"
        depends on DVB_CORE && I2C

diff --git a/drivers/media/dvb-frontends/Makefile b/drivers/media/dvb-frontends/Makefile
index b9f47d68e14ec135f0fd2639a7a9923d529f3cc3..d32e4c0be5769f61877e72514f10936d2f100008 100644 (file)
--- a/drivers/media/dvb-frontends/Makefile
+++ b/drivers/media/dvb-frontends/Makefile
@@ -20,7 +20,6 @@ obj-$(CONFIG_DVB_PLL) += dvb-pll.o
 obj-$(CONFIG_DVB_STV0299) += stv0299.o
 obj-$(CONFIG_DVB_STB0899) += stb0899.o
 obj-$(CONFIG_DVB_STB6100) += stb6100.o
-obj-$(CONFIG_DVB_SP8870) += sp8870.o
 obj-$(CONFIG_DVB_CX22700) += cx22700.o
 obj-$(CONFIG_DVB_S5H1432) += s5h1432.o
 obj-$(CONFIG_DVB_CX24110) += cx24110.o

diff --git a/drivers/staging/media/av7110/Kconfig b/drivers/staging/media/av7110/Kconfig
index e19d24bf2eb47dc4ebb54f71dc0d58a4eb42c251..9faf9d2d40010b8e42d21ca98e7834aa5e988a6d 100644 (file)
--- a/drivers/staging/media/av7110/Kconfig
+++ b/drivers/staging/media/av7110/Kconfig
@@ -72,3 +72,23 @@ config DVB_BUDGET_PATCH
 
          To compile this driver as a module, choose M here: the
          module will be called budget-patch.
+
+if DVB_AV7110
+
+# Frontend driver that it is used only by AV7110 driver
+# While technically independent, it doesn't make sense to keep
+# it if we drop support for AV7110, as no other driver will use it.
+
+config DVB_SP8870
+       tristate "Spase sp8870 based"
+       depends on DVB_CORE && I2C
+       default m if !MEDIA_SUBDRV_AUTOSELECT
+       help
+         A DVB-T tuner module. Say Y when you want to support this frontend.
+
+         This driver needs external firmware. Please use the command
+         "<kerneldir>/scripts/get_dvb_firmware sp8870" to
+         download/extract it, and then copy it to /usr/lib/hotplug/firmware
+         or /lib/firmware (depending on configuration of firmware hotplug).
+
+endif

diff --git a/drivers/staging/media/av7110/Makefile b/drivers/staging/media/av7110/Makefile
index dcabecf1abdeba54fb2e80dd7cb644cbc83d227a..307b267598ea67f5c17408031c21fe3c13370638 100644 (file)
--- a/drivers/staging/media/av7110/Makefile
+++ b/drivers/staging/media/av7110/Makefile
@@ -14,6 +14,8 @@ obj-$(CONFIG_DVB_BUDGET_PATCH) += budget-patch.o
 
 obj-$(CONFIG_DVB_AV7110) += dvb-ttpci.o
 
+obj-$(CONFIG_DVB_SP8870) += sp8870.o
+
 ccflags-y += -I $(srctree)/drivers/media/dvb-frontends
 ccflags-y += -I $(srctree)/drivers/media/tuners
 ccflags-y += -I $(srctree)/drivers/media/pci/ttpci

diff --git a/drivers/media/dvb-frontends/sp8870.c b/drivers/staging/media/av7110/sp8870.c
similarity index 100%
rename from drivers/media/dvb-frontends/sp8870.c
rename to drivers/staging/media/av7110/sp8870.c

diff --git a/drivers/media/dvb-frontends/sp8870.h b/drivers/staging/media/av7110/sp8870.h
similarity index 100%
rename from drivers/media/dvb-frontends/sp8870.h
rename to drivers/staging/media/av7110/sp8870.h