Commit 05ad3907 authored by Trent Piepho's avatar Trent Piepho Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (5166): Remove obsolete alias defines of CONFIG_* settings 



The out of tree v4l-dvb build system didn't always override the kernel's
configuration settings with v4l-dvb's settings correctly.  To work around
this, makefiles would define some new macro based on the setting of a
config variable.  e.g. the pwc Makefile would define CONFIG_PWC_DEBUG if
CONFIG_USB_PWC_DEBUG (which is defined via Kconfig) was set.
The v4l-dvb build system should now always override correctly, and this
is no longer necessary.  This patch gets ride of these extra defines and
just uses the CONFIG_* settings directly.

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

drivers/media/video/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -113,4 +113,3 @@ obj-$(CONFIG_USB_QUICKCAM_MESSENGER) += usbvideo/ 
obj-$(CONFIG_VIDEO_VIVI) += vivi.o



EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
 
extra-cflags-$(CONFIG_VIDEO_V4L1_COMPAT) += -DCONFIG_VIDEO_V4L1_COMPAT

drivers/media/video/cx88/Makefile

+0 −5
Original line number Diff line number Diff line
@@ -12,8 +12,3 @@ obj-$(CONFIG_VIDEO_CX88_VP3054) += cx88-vp3054-i2c.o 
EXTRA_CFLAGS += -Idrivers/media/video

EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core

EXTRA_CFLAGS += -Idrivers/media/dvb/frontends
 


extra-cflags-$(CONFIG_VIDEO_BUF_DVB) += -DHAVE_VIDEO_BUF_DVB=1

extra-cflags-$(CONFIG_VIDEO_CX88_VP3054)+= -DHAVE_VP3054_I2C=1



EXTRA_CFLAGS += $(extra-cflags-y) $(extra-cflags-m)

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

+5 −5
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 


#include "mt352.h"

#include "mt352_priv.h"

#ifdef HAVE_VP3054_I2C

#if defined(CONFIG_VIDEO_CX88_VP3054) || defined(CONFIG_VIDEO_CX88_VP3054_MODULE)

# include "cx88-vp3054-i2c.h"

#endif

#include "zl10353.h"
@@ -200,7 +200,7 @@ static struct mt352_config dvico_fusionhdtv_dual = { 
	.demod_init    = dvico_dual_demod_init,

};



#ifdef HAVE_VP3054_I2C

#if defined(CONFIG_VIDEO_CX88_VP3054) || defined(CONFIG_VIDEO_CX88_VP3054_MODULE)

static int dntv_live_dvbt_pro_demod_init(struct dvb_frontend* fe)

{

	static u8 clock_config []  = { 0x89, 0x38, 0x38 };
@@ -543,7 +543,7 @@ static int dvb_register(struct cx8802_dev *dev) 
		}

		break;

	case CX88_BOARD_DNTV_LIVE_DVB_T_PRO:

#ifdef HAVE_VP3054_I2C

#if defined(CONFIG_VIDEO_CX88_VP3054) || defined(CONFIG_VIDEO_CX88_VP3054_MODULE)

		dev->core->pll_addr = 0x61;

		dev->core->pll_desc = &dvb_pll_fmd1216me;

		dev->dvb.frontend = dvb_attach(mt352_attach, &dntv_live_dvbt_pro_config,
@@ -793,7 +793,7 @@ static int cx8802_dvb_probe(struct cx8802_driver *drv) 
	if (!(cx88_boards[core->board].mpeg & CX88_MPEG_DVB))

		goto fail_core;



#ifdef HAVE_VP3054_I2C

#if defined(CONFIG_VIDEO_CX88_VP3054) || defined(CONFIG_VIDEO_CX88_VP3054_MODULE)

	err = vp3054_i2c_probe(dev);

	if (0 != err)

		goto fail_core;
@@ -822,7 +822,7 @@ static int cx8802_dvb_remove(struct cx8802_driver *drv) 
	/* dvb */

	videobuf_dvb_unregister(&dev->dvb);



#ifdef HAVE_VP3054_I2C

#if defined(CONFIG_VIDEO_CX88_VP3054) || defined(CONFIG_VIDEO_CX88_VP3054_MODULE)

	vp3054_i2c_remove(dev);

#endif

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

+2 −0
Original line number Diff line number Diff line
@@ -145,6 +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 ( (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);
@@ -154,6 +155,7 @@ void cx88_call_i2c_clients(struct cx88_core *core, unsigned int cmd, void *arg) 
		if (core->dvbdev->dvb.frontend->ops.i2c_gate_ctrl)

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

	} else

#endif

		i2c_clients_command(&core->i2c_adap, cmd, arg);

}

drivers/media/video/cx88/cx88.h

+6 −0
Original line number Diff line number Diff line
@@ -31,7 +31,9 @@ 
#include <media/video-buf.h>

#include <media/cx2341x.h>

#include <media/audiochip.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 "cx88-reg.h"
@@ -313,9 +315,11 @@ struct cx88_core { 
	unsigned int               tuner_formats;



	/* config info -- dvb */

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

	struct dvb_pll_desc        *pll_desc;

	unsigned int               pll_addr;

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

#endif



	/* state info */

	struct task_struct         *kthread;
@@ -460,12 +464,14 @@ struct cx8802_dev { 
	int                        width;

	int                        height;



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

	/* for dvb only */

	struct videobuf_dvb        dvb;

	void*                      fe_handle;

	int                        (*fe_release)(void *handle);



	void			   *card_priv;

#endif

	/* for switching modulation types */

	unsigned char              ts_gen_cntrl;