From 877ba50b057f53b761c7acab6f4ae5376513b34f Mon Sep 17 00:00:00 2001 From: Antti Palosaari Date: Fri, 5 Feb 2016 08:04:48 +0200 Subject: [PATCH] [media] mn88473: move out of staging Move driver to drivers. Signed-off-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab --- MAINTAINERS | 4 +--- drivers/media/dvb-frontends/Kconfig | 8 +++++++ drivers/media/dvb-frontends/Makefile | 1 + .../mn88473 => media/dvb-frontends}/mn88473.c | 0 .../dvb-frontends}/mn88473_priv.h | 0 drivers/staging/media/Kconfig | 2 -- drivers/staging/media/Makefile | 1 - drivers/staging/media/mn88473/Kconfig | 7 ------- drivers/staging/media/mn88473/Makefile | 5 ----- drivers/staging/media/mn88473/TODO | 21 ------------------- 10 files changed, 10 insertions(+), 39 deletions(-) rename drivers/{staging/media/mn88473 => media/dvb-frontends}/mn88473.c (100%) rename drivers/{staging/media/mn88473 => media/dvb-frontends}/mn88473_priv.h (100%) delete mode 100644 drivers/staging/media/mn88473/Kconfig delete mode 100644 drivers/staging/media/mn88473/Makefile delete mode 100644 drivers/staging/media/mn88473/TODO diff --git a/MAINTAINERS b/MAINTAINERS index f07592658119..f9c1a0f66366 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7221,10 +7221,8 @@ L: linux-media@vger.kernel.org W: https://linuxtv.org W: http://palosaari.fi/linux/ Q: http://patchwork.linuxtv.org/project/linux-media/list/ -T: git git://linuxtv.org/anttip/media_tree.git S: Maintained -F: drivers/staging/media/mn88473/ -F: drivers/media/dvb-frontends/mn88473.h +F: drivers/media/dvb-frontends/mn88473* MODULE SUPPORT M: Rusty Russell diff --git a/drivers/media/dvb-frontends/Kconfig b/drivers/media/dvb-frontends/Kconfig index 310e4b8beae8..a82f77c49bd5 100644 --- a/drivers/media/dvb-frontends/Kconfig +++ b/drivers/media/dvb-frontends/Kconfig @@ -73,6 +73,14 @@ config DVB_SI2165 Say Y when you want to support this frontend. +config DVB_MN88473 + tristate "Panasonic MN88473" + depends on DVB_CORE && I2C + select REGMAP_I2C + default m if !MEDIA_SUBDRV_AUTOSELECT + help + Say Y when you want to support this frontend. + comment "DVB-S (satellite) frontends" depends on DVB_CORE diff --git a/drivers/media/dvb-frontends/Makefile b/drivers/media/dvb-frontends/Makefile index 37ef17b5b995..eb7191f4219d 100644 --- a/drivers/media/dvb-frontends/Makefile +++ b/drivers/media/dvb-frontends/Makefile @@ -95,6 +95,7 @@ obj-$(CONFIG_DVB_STV0900) += stv0900.o obj-$(CONFIG_DVB_STV090x) += stv090x.o obj-$(CONFIG_DVB_STV6110x) += stv6110x.o obj-$(CONFIG_DVB_M88DS3103) += m88ds3103.o +obj-$(CONFIG_DVB_MN88473) += mn88473.o obj-$(CONFIG_DVB_ISL6423) += isl6423.o obj-$(CONFIG_DVB_EC100) += ec100.o obj-$(CONFIG_DVB_HD29L2) += hd29l2.o diff --git a/drivers/staging/media/mn88473/mn88473.c b/drivers/media/dvb-frontends/mn88473.c similarity index 100% rename from drivers/staging/media/mn88473/mn88473.c rename to drivers/media/dvb-frontends/mn88473.c diff --git a/drivers/staging/media/mn88473/mn88473_priv.h b/drivers/media/dvb-frontends/mn88473_priv.h similarity index 100% rename from drivers/staging/media/mn88473/mn88473_priv.h rename to drivers/media/dvb-frontends/mn88473_priv.h diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig index be271084ad91..0078b6a92f0b 100644 --- a/drivers/staging/media/Kconfig +++ b/drivers/staging/media/Kconfig @@ -27,8 +27,6 @@ source "drivers/staging/media/davinci_vpfe/Kconfig" source "drivers/staging/media/mn88472/Kconfig" -source "drivers/staging/media/mn88473/Kconfig" - source "drivers/staging/media/mx2/Kconfig" source "drivers/staging/media/mx3/Kconfig" diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile index 4861163371ef..91495882a36c 100644 --- a/drivers/staging/media/Makefile +++ b/drivers/staging/media/Makefile @@ -7,5 +7,4 @@ obj-$(CONFIG_VIDEO_MX3) += mx3/ obj-$(CONFIG_VIDEO_OMAP1) += omap1/ obj-$(CONFIG_VIDEO_OMAP4) += omap4iss/ obj-$(CONFIG_DVB_MN88472) += mn88472/ -obj-$(CONFIG_DVB_MN88473) += mn88473/ obj-$(CONFIG_VIDEO_TIMBERDALE) += timb/ diff --git a/drivers/staging/media/mn88473/Kconfig b/drivers/staging/media/mn88473/Kconfig deleted file mode 100644 index 6c9ebf51c2c7..000000000000 --- a/drivers/staging/media/mn88473/Kconfig +++ /dev/null @@ -1,7 +0,0 @@ -config DVB_MN88473 - tristate "Panasonic MN88473" - depends on DVB_CORE && I2C - select REGMAP_I2C - default m if !MEDIA_SUBDRV_AUTOSELECT - help - Say Y when you want to support this frontend. diff --git a/drivers/staging/media/mn88473/Makefile b/drivers/staging/media/mn88473/Makefile deleted file mode 100644 index fac55410ce55..000000000000 --- a/drivers/staging/media/mn88473/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -obj-$(CONFIG_DVB_MN88473) += mn88473.o - -ccflags-y += -Idrivers/media/dvb-core/ -ccflags-y += -Idrivers/media/dvb-frontends/ -ccflags-y += -Idrivers/media/tuners/ diff --git a/drivers/staging/media/mn88473/TODO b/drivers/staging/media/mn88473/TODO deleted file mode 100644 index b90a14be3beb..000000000000 --- a/drivers/staging/media/mn88473/TODO +++ /dev/null @@ -1,21 +0,0 @@ -Driver general quality is not good enough for mainline. Also, other -device drivers (USB-bridge, tuner) needed for Astrometa receiver in -question could need some changes. However, if that driver is mainlined -due to some other device than Astrometa, unrelated TODOs could be -skipped. In that case rtl28xxu driver needs module parameter to prevent -driver loading. - -Required TODOs: -* missing lock flags -* I2C errors -* tuner sensitivity - -*Do not* send any patch fixing checkpatch.pl issues. Currently it passes -checkpatch.pl tests. I don't want waste my time to review this kind of -trivial stuff. *Do not* add missing register I/O error checks. Those are -missing for the reason it is much easier to compare I2C data sniffs when -there is less lines. Those error checks are about the last thing to be added. - -Patches should be submitted to: -linux-media@vger.kernel.org and Antti Palosaari - -- 2.20.1