* [PATCH] media: sp8870: move it to staging
@ 2021-05-31 20:37 Mauro Carvalho Chehab
2021-06-01 4:50 ` Greg Kroah-Hartman
0 siblings, 1 reply; 3+ messages in thread
From: Mauro Carvalho Chehab @ 2021-05-31 20:37 UTC (permalink / raw)
Cc: linuxarm, mauro.chehab, Mauro Carvalho Chehab, Alaa Emad,
Brad Love, Greg Kroah-Hartman, Hans Verkuil,
Mauro Carvalho Chehab, Maxim Plotnikov, Sean Young, linux-kernel,
linux-media, linux-staging
This driver is used only ba 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>
---
drivers/media/dvb-frontends/Kconfig | 12 -----------
drivers/media/dvb-frontends/Makefile | 1 -
drivers/staging/media/av7110/Kconfig | 20 +++++++++++++++++++
drivers/staging/media/av7110/Makefile | 2 ++
.../media/av7110}/sp8870.c | 0
.../media/av7110}/sp8870.h | 0
6 files changed, 22 insertions(+), 13 deletions(-)
rename drivers/{media/dvb-frontends => staging/media/av7110}/sp8870.c (100%)
rename drivers/{media/dvb-frontends => staging/media/av7110}/sp8870.h (100%)
diff --git a/drivers/media/dvb-frontends/Kconfig b/drivers/media/dvb-frontends/Kconfig
index 3468b07b62fe..2c1ed98d43c5 100644
--- 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 b9f47d68e14e..d32e4c0be576 100644
--- 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 e19d24bf2eb4..f2d706acc131 100644
--- 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 drivers that are used only by AV7110 driver
+# While those are technically independent, it doesn't make sense to keep
+# them if we drop support for AV7110
+
+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 dcabecf1abde..307b267598ea 100644
--- 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
--
2.31.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] media: sp8870: move it to staging
2021-05-31 20:37 [PATCH] media: sp8870: move it to staging Mauro Carvalho Chehab
@ 2021-06-01 4:50 ` Greg Kroah-Hartman
2021-06-01 8:28 ` Mauro Carvalho Chehab
0 siblings, 1 reply; 3+ messages in thread
From: Greg Kroah-Hartman @ 2021-06-01 4:50 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: linuxarm, mauro.chehab, Alaa Emad, Brad Love, Hans Verkuil,
Mauro Carvalho Chehab, Maxim Plotnikov, Sean Young, linux-kernel,
linux-media, linux-staging
On Mon, May 31, 2021 at 10:37:54PM +0200, Mauro Carvalho Chehab wrote:
> This driver is used only ba 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>
> ---
> drivers/media/dvb-frontends/Kconfig | 12 -----------
> drivers/media/dvb-frontends/Makefile | 1 -
> drivers/staging/media/av7110/Kconfig | 20 +++++++++++++++++++
> drivers/staging/media/av7110/Makefile | 2 ++
> .../media/av7110}/sp8870.c | 0
> .../media/av7110}/sp8870.h | 0
> 6 files changed, 22 insertions(+), 13 deletions(-)
> rename drivers/{media/dvb-frontends => staging/media/av7110}/sp8870.c (100%)
> rename drivers/{media/dvb-frontends => staging/media/av7110}/sp8870.h (100%)
Don't you need a TODO file for these moves that says what is wrong with
the driver and when it will be removed and to not send cleanups for it?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] media: sp8870: move it to staging
2021-06-01 4:50 ` Greg Kroah-Hartman
@ 2021-06-01 8:28 ` Mauro Carvalho Chehab
0 siblings, 0 replies; 3+ messages in thread
From: Mauro Carvalho Chehab @ 2021-06-01 8:28 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: linuxarm, mauro.chehab, Alaa Emad, Brad Love, Hans Verkuil,
Mauro Carvalho Chehab, Maxim Plotnikov, Sean Young, linux-kernel,
linux-media, linux-staging
Em Tue, 1 Jun 2021 06:50:54 +0200
Greg Kroah-Hartman <gregkh@linuxfoundation.org> escreveu:
> On Mon, May 31, 2021 at 10:37:54PM +0200, Mauro Carvalho Chehab wrote:
> > This driver is used only ba 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>
> > ---
> > drivers/media/dvb-frontends/Kconfig | 12 -----------
> > drivers/media/dvb-frontends/Makefile | 1 -
> > drivers/staging/media/av7110/Kconfig | 20 +++++++++++++++++++
> > drivers/staging/media/av7110/Makefile | 2 ++
> > .../media/av7110}/sp8870.c | 0
> > .../media/av7110}/sp8870.h | 0
> > 6 files changed, 22 insertions(+), 13 deletions(-)
> > rename drivers/{media/dvb-frontends => staging/media/av7110}/sp8870.c (100%)
> > rename drivers/{media/dvb-frontends => staging/media/av7110}/sp8870.h (100%)
>
> Don't you need a TODO file for these moves that says what is wrong with
> the driver and when it will be removed and to not send cleanups for it?
Yes, but it was added on the previous patch that moved the master driver
(av7110):
https://lore.kernel.org/linux-media/4e7136434c68eabcdb66d25f44946ab794f4af0b.1622476959.git.mchehab+huawei@kernel.org/T/#u
The TODO is just saying:
This driver is too old and relies on a different API.
Drop it from Kernel on a couple of versions.
(there was a typo there, I'll fix at the next version)
Thanks,
Mauro
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-06-01 8:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-31 20:37 [PATCH] media: sp8870: move it to staging Mauro Carvalho Chehab
2021-06-01 4:50 ` Greg Kroah-Hartman
2021-06-01 8:28 ` Mauro Carvalho Chehab
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).