V4L/DVB: saa7134-input can't be a module right now

PATCH In review Mauro Carvalho Chehab 1 participant 2 messages Oct 7, 2010 1 message not in the archive

Subsystems (2)

Share & tools

A message that is not in the archive (sent off-list or not yet received): ecc736735ecf922d7f31d34417f7c42f8ec9eb67.1286416568.git.mchehab@redhat.com

Mauro Carvalho Chehab

author

2010-10-07 01:57 UTC #1 lore raw

PATCH 2/3 V4L/DVB: saa7134-input can't be a module right now

There are some symbols at saa7134-input that are used on saa7134 and vice-versa. Due to that, module install fails.

So, partially revert commit 9f495cf7d691c99bf7bdcec9f35fcfdad2cf9ae9.

Signed-off-by Mauro Carvalho Chehab <[email protected]>

drivers/media/video/saa7134/Kconfig +2 -5

index 892b0b1..3fe71be 100644
@@ -25,15 +25,12 @@ config VIDEO_SAA7134_ALSA
 	  module will be called saa7134-alsa.
 
 config VIDEO_SAA7134_RC
-	tristate "Philips SAA7134 Remote Controller support"
+	bool "Philips SAA7134 Remote Controller support"
 	depends on VIDEO_IR
 	depends on VIDEO_SAA7134
 	default y
 	---help---
-	  Enables Remote Controller support for saa7134.
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called saa7134-rc.
+	  Enables Remote Controller support on saa7134 driver.
 
 config VIDEO_SAA7134_DVB
 	tristate "DVB/ATSC Support for saa7134 based TV cards"

drivers/media/video/saa7134/Makefile +4 -7

index 5624468..2a2047b 100644
@@ -1,9 +1,8 @@
 
-saa7134-objs :=	saa7134-cards.o saa7134-core.o saa7134-i2c.o	\
-		saa7134-ts.o saa7134-tvaudio.o saa7134-vbi.o    \
-		saa7134-video.o
-
-saa7134-rc-objs := saa7134-input.o
+saa7134-y :=	saa7134-cards.o saa7134-core.o saa7134-i2c.o
+saa7134-y +=	saa7134-ts.o saa7134-tvaudio.o saa7134-vbi.o
+saa7134-y +=	saa7134-video.o
+saa7134-$(CONFIG_VIDEO_SAA7134_RC) += saa7134-rc.o
 
 obj-$(CONFIG_VIDEO_SAA7134) +=  saa6752hs.o saa7134.o saa7134-empress.o

@@ -11,8 +10,6 @@ obj-$(CONFIG_VIDEO_SAA7134_ALSA) += saa7134-alsa.o
 
 obj-$(CONFIG_VIDEO_SAA7134_DVB) += saa7134-dvb.o
 
-obj-$(CONFIG_VIDEO_SAA7134_RC) += saa7134-rc.o
-
 EXTRA_CFLAGS += -Idrivers/media/video
 EXTRA_CFLAGS += -Idrivers/media/common/tuners
 EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core

drivers/media/video/saa7134/saa7134-input.c +1 -4

index a6ac462..3a0ea56 100644
@@ -28,7 +28,7 @@
 #include "saa7134-reg.h"
 #include "saa7134.h"
 
-#define MODULE_NAME "saa7134-rc"
+#define MODULE_NAME "saa7134"
 
 static unsigned int disable_ir;
 module_param(disable_ir, int, 0444);

@@ -1211,6 +1211,3 @@ static int saa7134_nec_irq(struct saa7134_dev *dev)
 
 	return 1;
 }
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Mauro Carvalho Chehab <[email protected]>");

drivers/media/video/saa7134/saa7134.h +1 -1

index 99f122b..d3b6a19 100644
@@ -810,7 +810,7 @@ void saa7134_irq_oss_done(struct saa7134_dev *dev, unsigned long status);
 /* ----------------------------------------------------------- */
 /* saa7134-input.c                                             */
 
-#if defined(CONFIG_VIDEO_SAA7134_RC) || (defined(CONFIG_VIDEO_SAA7134_RC_MODULE) && defined(MODULE))
+#if defined(CONFIG_VIDEO_SAA7134_RC)
 int  saa7134_input_init1(struct saa7134_dev *dev);
 void saa7134_input_fini(struct saa7134_dev *dev);
 void saa7134_input_irq(struct saa7134_dev *dev);

Signature · 1 line

1.7.1

Mauro Carvalho Chehab

author

2010-10-07 01:58 UTC #2 lore raw

PATCH 3/3 V4L/DVB: tm6000: Fix warnings due to a small array size

In reply to a message not in the archive

drivers/staging/tm6000/tm6000-stds.c:101: warning: excess elements in array initializer drivers/staging/tm6000/tm6000-stds.c:101: warning: (near initialization for ‘tv_stds[0].common’) drivers/staging/tm6000/tm6000-stds.c:160: warning: excess elements in array initializer drivers/staging/tm6000/tm6000-stds.c:160: warning: (near initialization for ‘tv_stds[1].common’) drivers/staging/tm6000/tm6000-stds.c:219: warning: excess elements in array initializer drivers/staging/tm6000/tm6000-stds.c:219: warning: (near initialization for ‘tv_stds[2].common’) drivers/staging/tm6000/tm6000-stds.c:336: warning: excess elements in array initializer drivers/staging/tm6000/tm6000-stds.c:336: warning: (near initialization for ‘tv_stds[4].common’)

Signed-off-by Mauro Carvalho Chehab <[email protected]>

drivers/staging/tm6000/tm6000-stds.c +1 -1

index f6aa753..fe22f42 100644
@@ -32,7 +32,7 @@ struct tm6000_std_tv_settings {
 	v4l2_std_id id;
 	struct tm6000_reg_settings sif[12];
 	struct tm6000_reg_settings nosif[12];
-	struct tm6000_reg_settings common[25];
+	struct tm6000_reg_settings common[26];
 };
 
 struct tm6000_std_settings {

Signature · 1 line

1.7.1