[media] cx25821: remove bogus dependencies

This driver doesn't use DVB, RC, cx25840 or tveeprom.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/pci/cx25821/Kconfig b/drivers/media/pci/cx25821/Kconfig
index 4017c9420348de10ef78dae71939b52a9c1242e4..6439a847680c1c2860e9af9ebb9daee60c25991d 100644 (file)
--- a/drivers/media/pci/cx25821/Kconfig
+++ b/drivers/media/pci/cx25821/Kconfig
@@ -1,14 +1,9 @@
 config VIDEO_CX25821
        tristate "Conexant cx25821 support"
-       depends on DVB_CORE && VIDEO_DEV && PCI && I2C
+       depends on VIDEO_DEV && PCI && I2C
        select I2C_ALGOBIT
        select VIDEO_BTCX
-       select VIDEO_TVEEPROM
-       depends on RC_CORE
-       select VIDEOBUF_DVB
        select VIDEOBUF_DMA_SG
-       select VIDEO_CX25840
-       select VIDEO_CX2341X
        ---help---
          This is a video4linux driver for Conexant 25821 based
          TV cards.

diff --git a/drivers/media/pci/cx25821/Makefile b/drivers/media/pci/cx25821/Makefile
index caa32b7b51f8765283c403d20fa93d2f0d886b3c..b54a32e88bd060b1d3d6a9a516f0054ae0954de2 100644 (file)
--- a/drivers/media/pci/cx25821/Makefile
+++ b/drivers/media/pci/cx25821/Makefile
@@ -9,6 +9,3 @@ obj-$(CONFIG_VIDEO_CX25821_ALSA) += cx25821-alsa.o
 
 ccflags-y += -Idrivers/media/i2c
 ccflags-y += -Idrivers/media/common
-ccflags-y += -Idrivers/media/tuners
-ccflags-y += -Idrivers/media/dvb-core
-ccflags-y += -Idrivers/media/dvb-frontends

diff --git a/drivers/media/pci/cx25821/cx25821-cards.c b/drivers/media/pci/cx25821/cx25821-cards.c
index c09ec68460e46da223cd609556a028d87b8839ce..2b2f1f4f87acc1906bfc85fcc07add30f7b6f029 100644 (file)
--- a/drivers/media/pci/cx25821/cx25821-cards.c
+++ b/drivers/media/pci/cx25821/cx25821-cards.c
@@ -26,8 +26,6 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/pci.h>
-#include <linux/delay.h>
-#include <media/cx25840.h>
 
 #include "cx25821.h"
 
@@ -50,22 +48,3 @@ struct cx25821_board cx25821_boards[] = {
 };
 
 const unsigned int cx25821_bcount = ARRAY_SIZE(cx25821_boards);
-
-struct cx25821_subid cx25821_subids[] = {
-       {
-               .subvendor = 0x14f1,
-               .subdevice = 0x0920,
-               .card = CX25821_BOARD,
-       },
-};
-
-void cx25821_card_setup(struct cx25821_dev *dev)
-{
-       static u8 eeprom[256];
-
-       if (dev->i2c_bus[0].i2c_rc == 0) {
-               dev->i2c_bus[0].i2c_client.addr = 0xa0 >> 1;
-               tveeprom_read(&dev->i2c_bus[0].i2c_client, eeprom,
-                               sizeof(eeprom));
-       }
-}

diff --git a/drivers/media/pci/cx25821/cx25821-core.c b/drivers/media/pci/cx25821/cx25821-core.c
index 6205ade04a970b042b342f50db57450bca11ce75..82c2db0944e3f4d4a1692be984386dff7159bde9 100644 (file)
--- a/drivers/media/pci/cx25821/cx25821-core.c
+++ b/drivers/media/pci/cx25821/cx25821-core.c
@@ -953,8 +953,6 @@ static int cx25821_dev_setup(struct cx25821_dev *dev)
        CX25821_INFO("i2c register! bus->i2c_rc = %d\n",
                        dev->i2c_bus[0].i2c_rc);
 
-       cx25821_card_setup(dev);
-
        if (medusa_video_init(dev) < 0)
                CX25821_ERR("%s(): Failed to initialize medusa!\n", __func__);
 

diff --git a/drivers/media/pci/cx25821/cx25821-gpio.c b/drivers/media/pci/cx25821/cx25821-gpio.c
index 29e43b03c85e18eaee3a4daa02eebff9ba2c7749..95e8ddf629472afe938177a1be93bebf297d886a 100644 (file)
--- a/drivers/media/pci/cx25821/cx25821-gpio.c
+++ b/drivers/media/pci/cx25821/cx25821-gpio.c
@@ -20,6 +20,7 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <linux/module.h>
 #include "cx25821.h"
 
 /********************* GPIO stuffs *********************/

diff --git a/drivers/media/pci/cx25821/cx25821-i2c.c b/drivers/media/pci/cx25821/cx25821-i2c.c
index a8dc945bbe1797f015a25e505719a5c34b8fba5b..dca37c7dba73a3659131e543ec1b636d8d5d31ca 100644 (file)
--- a/drivers/media/pci/cx25821/cx25821-i2c.c
+++ b/drivers/media/pci/cx25821/cx25821-i2c.c
@@ -23,8 +23,9 @@
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
-#include "cx25821.h"
+#include <linux/module.h>
 #include <linux/i2c.h>
+#include "cx25821.h"
 
 static unsigned int i2c_debug;
 module_param(i2c_debug, int, 0644);

diff --git a/drivers/media/pci/cx25821/cx25821.h b/drivers/media/pci/cx25821/cx25821.h
index 033993f1fb08e217964742dcdfd14d065e1e121f..61c6cfc02d8cac8a898b2b497ef94149af55f703 100644 (file)
--- a/drivers/media/pci/cx25821/cx25821.h
+++ b/drivers/media/pci/cx25821/cx25821.h
@@ -33,9 +33,7 @@
 
 #include <media/v4l2-common.h>
 #include <media/v4l2-device.h>
-#include <media/tveeprom.h>
 #include <media/videobuf-dma-sg.h>
-#include <media/videobuf-dvb.h>
 
 #include "btcx-risc.h"
 #include "cx25821-reg.h"
@@ -178,12 +176,6 @@ struct cx25821_board {
        struct cx25821_input input[CX25821_NR_INPUT];
 };
 
-struct cx25821_subid {
-       u16 subvendor;
-       u16 subdevice;
-       u32 card;
-};
-
 struct cx25821_i2c {
        struct cx25821_dev *dev;
 
@@ -406,7 +398,6 @@ static inline struct cx25821_dev *get_cx25821(struct v4l2_device *v4l2_dev)
        v4l2_device_call_all(&dev->v4l2_dev, 0, o, f, ##args)
 
 extern struct cx25821_board cx25821_boards[];
-extern struct cx25821_subid cx25821_subids[];
 
 #define SRAM_CH00  0           /* Video A */
 #define SRAM_CH01  1           /* Video B */
@@ -487,8 +478,6 @@ extern const struct sram_channel cx25821_sram_channels[];
        pr_info("(%d): " fmt, dev->board, ##args)
 
 extern int cx25821_i2c_register(struct cx25821_i2c *bus);
-extern void cx25821_card_setup(struct cx25821_dev *dev);
-extern int cx25821_ir_init(struct cx25821_dev *dev);
 extern int cx25821_i2c_read(struct cx25821_i2c *bus, u16 reg_addr, int *value);
 extern int cx25821_i2c_write(struct cx25821_i2c *bus, u16 reg_addr, int value);
 extern int cx25821_i2c_unregister(struct cx25821_i2c *bus);