Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a3ebe87 authored by Trent Piepho's avatar Trent Piepho Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (6283): videobuf: Remove references to old Kconfig option name 



CONFIG_VIDEO_BUF_DVB became CONFIG_VIDEOBUF_DVB.

But in these cases, it makes more sense to use CONFIG_VIDEO_SAA7134_DVB
or CONFIG_VIDEO_CX88_DVB_MODULE depending on the driver.

The reference in cx23885.h should just be removed, as the code there needs to
be included if DVB is on or off.  I do not think you can even compile the
cx23885 driver without DVB.  It's clearly just leftover from when the file was
obvious copied from the cx88 driver (which is not mentioned in the copyright
BTW).

Signed-off-by: default avatarTrent Piepho <xyzzy@speakeasy.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 9320874a

drivers/media/video/cx23885/cx23885.h

+0 −2
Original line number Diff line number Diff line
@@ -28,9 +28,7 @@ 
#include <media/tuner.h>

#include <media/tveeprom.h>

#include <media/video-buf.h>

#if defined(CONFIG_VIDEO_BUF_DVB) || defined(CONFIG_VIDEO_BUF_DVB_MODULE)

#include <media/video-buf-dvb.h>

#endif



#include "btcx-risc.h"

#include "cx23885-reg.h"

drivers/media/video/cx88/cx88-i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ void cx88_call_i2c_clients(struct cx88_core *core, unsigned int cmd, void *arg) 
	if (0 != core->i2c_rc)

		return;



#if defined(CONFIG_VIDEO_BUF_DVB) || defined(CONFIG_VIDEO_BUF_DVB_MODULE)

#if defined(CONFIG_VIDEO_CX88_DVB) || defined(CONFIG_VIDEO_CX88_DVB_MODULE)

	if ( (core->dvbdev) && (core->dvbdev->dvb.frontend) ) {

		if (core->dvbdev->dvb.frontend->ops.i2c_gate_ctrl)

			core->dvbdev->dvb.frontend->ops.i2c_gate_ctrl(core->dvbdev->dvb.frontend, 1);

drivers/media/video/cx88/cx88.h

+3 −3
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
#include <media/videobuf-dma-sg.h>

#include <media/cx2341x.h>

#include <media/audiochip.h>

#if defined(CONFIG_VIDEO_BUF_DVB) || defined(CONFIG_VIDEO_BUF_DVB_MODULE)

#if defined(CONFIG_VIDEO_CX88_DVB) || defined(CONFIG_VIDEO_CX88_DVB_MODULE)

#include <media/videobuf-dvb.h>

#endif
@@ -311,7 +311,7 @@ struct cx88_core { 
	unsigned int               tuner_formats;



	/* config info -- dvb */

#if defined(CONFIG_VIDEO_BUF_DVB) || defined(CONFIG_VIDEO_BUF_DVB_MODULE)

#if defined(CONFIG_VIDEO_CX88_DVB) || defined(CONFIG_VIDEO_CX88_DVB_MODULE)

	int 			   (*prev_set_voltage)(struct dvb_frontend* fe, fe_sec_voltage_t voltage);

#endif
@@ -458,7 +458,7 @@ struct cx8802_dev { 
	int                        width;

	int                        height;



#if defined(CONFIG_VIDEO_BUF_DVB) || defined(CONFIG_VIDEO_BUF_DVB_MODULE)

#if defined(CONFIG_VIDEO_CX88_DVB) || defined(CONFIG_VIDEO_CX88_DVB_MODULE)

	/* for dvb only */

	struct videobuf_dvb        dvb;

drivers/media/video/saa7134/saa7134.h

+2 −2
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
#include <sound/driver.h>

#include <sound/core.h>

#include <sound/pcm.h>

#if defined(CONFIG_VIDEO_BUF_DVB) || defined(CONFIG_VIDEO_BUF_DVB_MODULE)

#if defined(CONFIG_VIDEO_SAA7134_DVB) || defined(CONFIG_VIDEO_SAA7134_DVB_MODULE)

#include <media/videobuf-dvb.h>

#endif
@@ -538,7 +538,7 @@ struct saa7134_dev { 
	struct work_struct         empress_workqueue;

	int                        empress_started;



#if defined(CONFIG_VIDEO_BUF_DVB) || defined(CONFIG_VIDEO_BUF_DVB_MODULE)

#if defined(CONFIG_VIDEO_SAA7134_DVB) || defined(CONFIG_VIDEO_SAA7134_DVB_MODULE)

	/* SAA7134_MPEG_DVB only */

	struct videobuf_dvb        dvb;

	int (*original_demod_sleep)(struct dvb_frontend* fe);