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

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
...@@ -113,4 +113,3 @@ obj-$(CONFIG_USB_QUICKCAM_MESSENGER) += usbvideo/ ...@@ -113,4 +113,3 @@ obj-$(CONFIG_USB_QUICKCAM_MESSENGER) += usbvideo/
obj-$(CONFIG_VIDEO_VIVI) += vivi.o obj-$(CONFIG_VIDEO_VIVI) += vivi.o
EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
extra-cflags-$(CONFIG_VIDEO_V4L1_COMPAT) += -DCONFIG_VIDEO_V4L1_COMPAT
...@@ -12,8 +12,3 @@ obj-$(CONFIG_VIDEO_CX88_VP3054) += cx88-vp3054-i2c.o ...@@ -12,8 +12,3 @@ obj-$(CONFIG_VIDEO_CX88_VP3054) += cx88-vp3054-i2c.o
EXTRA_CFLAGS += -Idrivers/media/video EXTRA_CFLAGS += -Idrivers/media/video
EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
EXTRA_CFLAGS += -Idrivers/media/dvb/frontends 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)
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include "mt352.h" #include "mt352.h"
#include "mt352_priv.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" # include "cx88-vp3054-i2c.h"
#endif #endif
#include "zl10353.h" #include "zl10353.h"
...@@ -200,7 +200,7 @@ static struct mt352_config dvico_fusionhdtv_dual = { ...@@ -200,7 +200,7 @@ static struct mt352_config dvico_fusionhdtv_dual = {
.demod_init = dvico_dual_demod_init, .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 int dntv_live_dvbt_pro_demod_init(struct dvb_frontend* fe)
{ {
static u8 clock_config [] = { 0x89, 0x38, 0x38 }; static u8 clock_config [] = { 0x89, 0x38, 0x38 };
...@@ -543,7 +543,7 @@ static int dvb_register(struct cx8802_dev *dev) ...@@ -543,7 +543,7 @@ static int dvb_register(struct cx8802_dev *dev)
} }
break; break;
case CX88_BOARD_DNTV_LIVE_DVB_T_PRO: 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_addr = 0x61;
dev->core->pll_desc = &dvb_pll_fmd1216me; dev->core->pll_desc = &dvb_pll_fmd1216me;
dev->dvb.frontend = dvb_attach(mt352_attach, &dntv_live_dvbt_pro_config, 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) ...@@ -793,7 +793,7 @@ static int cx8802_dvb_probe(struct cx8802_driver *drv)
if (!(cx88_boards[core->board].mpeg & CX88_MPEG_DVB)) if (!(cx88_boards[core->board].mpeg & CX88_MPEG_DVB))
goto fail_core; goto fail_core;
#ifdef HAVE_VP3054_I2C #if defined(CONFIG_VIDEO_CX88_VP3054) || defined(CONFIG_VIDEO_CX88_VP3054_MODULE)
err = vp3054_i2c_probe(dev); err = vp3054_i2c_probe(dev);
if (0 != err) if (0 != err)
goto fail_core; goto fail_core;
...@@ -822,7 +822,7 @@ static int cx8802_dvb_remove(struct cx8802_driver *drv) ...@@ -822,7 +822,7 @@ static int cx8802_dvb_remove(struct cx8802_driver *drv)
/* dvb */ /* dvb */
videobuf_dvb_unregister(&dev->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); vp3054_i2c_remove(dev);
#endif #endif
......
...@@ -145,6 +145,7 @@ void cx88_call_i2c_clients(struct cx88_core *core, unsigned int cmd, void *arg) ...@@ -145,6 +145,7 @@ void cx88_call_i2c_clients(struct cx88_core *core, unsigned int cmd, void *arg)
if (0 != core->i2c_rc) if (0 != core->i2c_rc)
return; return;
#if defined(CONFIG_VIDEO_BUF_DVB) || defined(CONFIG_VIDEO_BUF_DVB_MODULE)
if ( (core->dvbdev) && (core->dvbdev->dvb.frontend) ) { if ( (core->dvbdev) && (core->dvbdev->dvb.frontend) ) {
if (core->dvbdev->dvb.frontend->ops.i2c_gate_ctrl) if (core->dvbdev->dvb.frontend->ops.i2c_gate_ctrl)
core->dvbdev->dvb.frontend->ops.i2c_gate_ctrl(core->dvbdev->dvb.frontend, 1); 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) ...@@ -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) if (core->dvbdev->dvb.frontend->ops.i2c_gate_ctrl)
core->dvbdev->dvb.frontend->ops.i2c_gate_ctrl(core->dvbdev->dvb.frontend, 0); core->dvbdev->dvb.frontend->ops.i2c_gate_ctrl(core->dvbdev->dvb.frontend, 0);
} else } else
#endif
i2c_clients_command(&core->i2c_adap, cmd, arg); i2c_clients_command(&core->i2c_adap, cmd, arg);
} }
......
...@@ -31,7 +31,9 @@ ...@@ -31,7 +31,9 @@
#include <media/video-buf.h> #include <media/video-buf.h>
#include <media/cx2341x.h> #include <media/cx2341x.h>
#include <media/audiochip.h> #include <media/audiochip.h>
#if defined(CONFIG_VIDEO_BUF_DVB) || defined(CONFIG_VIDEO_BUF_DVB_MODULE)
#include <media/video-buf-dvb.h> #include <media/video-buf-dvb.h>
#endif
#include "btcx-risc.h" #include "btcx-risc.h"
#include "cx88-reg.h" #include "cx88-reg.h"
...@@ -313,9 +315,11 @@ struct cx88_core { ...@@ -313,9 +315,11 @@ struct cx88_core {
unsigned int tuner_formats; unsigned int tuner_formats;
/* config info -- dvb */ /* config info -- dvb */
#if defined(CONFIG_VIDEO_BUF_DVB) || defined(CONFIG_VIDEO_BUF_DVB_MODULE)
struct dvb_pll_desc *pll_desc; struct dvb_pll_desc *pll_desc;
unsigned int pll_addr; unsigned int pll_addr;
int (*prev_set_voltage)(struct dvb_frontend* fe, fe_sec_voltage_t voltage); int (*prev_set_voltage)(struct dvb_frontend* fe, fe_sec_voltage_t voltage);
#endif
/* state info */ /* state info */
struct task_struct *kthread; struct task_struct *kthread;
...@@ -460,12 +464,14 @@ struct cx8802_dev { ...@@ -460,12 +464,14 @@ struct cx8802_dev {
int width; int width;
int height; int height;
#if defined(CONFIG_VIDEO_BUF_DVB) || defined(CONFIG_VIDEO_BUF_DVB_MODULE)
/* for dvb only */ /* for dvb only */
struct videobuf_dvb dvb; struct videobuf_dvb dvb;
void* fe_handle; void* fe_handle;
int (*fe_release)(void *handle); int (*fe_release)(void *handle);
void *card_priv; void *card_priv;
#endif
/* for switching modulation types */ /* for switching modulation types */
unsigned char ts_gen_cntrl; unsigned char ts_gen_cntrl;
......
...@@ -2,11 +2,3 @@ pwc-objs := pwc-if.o pwc-misc.o pwc-ctrl.o pwc-v4l.o pwc-uncompress.o ...@@ -2,11 +2,3 @@ pwc-objs := pwc-if.o pwc-misc.o pwc-ctrl.o pwc-v4l.o pwc-uncompress.o
pwc-objs += pwc-dec1.o pwc-dec23.o pwc-kiara.o pwc-timon.o pwc-objs += pwc-dec1.o pwc-dec23.o pwc-kiara.o pwc-timon.o
obj-$(CONFIG_USB_PWC) += pwc.o obj-$(CONFIG_USB_PWC) += pwc.o
ifeq ($(CONFIG_USB_PWC_DEBUG),y)
EXTRA_CFLAGS += -DCONFIG_PWC_DEBUG=1
else
EXTRA_CFLAGS += -DCONFIG_PWC_DEBUG=0
endif
...@@ -128,7 +128,7 @@ static int default_size = PSZ_QCIF; ...@@ -128,7 +128,7 @@ static int default_size = PSZ_QCIF;
static int default_fps = 10; static int default_fps = 10;
static int default_fbufs = 3; /* Default number of frame buffers */ static int default_fbufs = 3; /* Default number of frame buffers */
int pwc_mbufs = 2; /* Default number of mmap() buffers */ int pwc_mbufs = 2; /* Default number of mmap() buffers */
#if CONFIG_PWC_DEBUG #ifdef CONFIG_USB_PWC_DEBUG
int pwc_trace = PWC_DEBUG_LEVEL; int pwc_trace = PWC_DEBUG_LEVEL;
#endif #endif
static int power_save = 0; static int power_save = 0;
...@@ -1051,7 +1051,7 @@ static void pwc_remove_sysfs_files(struct video_device *vdev) ...@@ -1051,7 +1051,7 @@ static void pwc_remove_sysfs_files(struct video_device *vdev)
video_device_remove_file(vdev, &class_device_attr_button); video_device_remove_file(vdev, &class_device_attr_button);
} }
#if CONFIG_PWC_DEBUG #ifdef CONFIG_USB_PWC_DEBUG
static const char *pwc_sensor_type_to_string(unsigned int sensor_type) static const char *pwc_sensor_type_to_string(unsigned int sensor_type)
{ {
switch(sensor_type) { switch(sensor_type) {
...@@ -1835,7 +1835,7 @@ module_param(size, charp, 0444); ...@@ -1835,7 +1835,7 @@ module_param(size, charp, 0444);
module_param(fps, int, 0444); module_param(fps, int, 0444);
module_param(fbufs, int, 0444); module_param(fbufs, int, 0444);
module_param(mbufs, int, 0444); module_param(mbufs, int, 0444);
#if CONFIG_PWC_DEBUG #ifdef CONFIG_USB_PWC_DEBUG
module_param_named(trace, pwc_trace, int, 0644); module_param_named(trace, pwc_trace, int, 0644);
#endif #endif
module_param(power_save, int, 0444); module_param(power_save, int, 0444);
...@@ -1908,7 +1908,7 @@ static int __init usb_pwc_init(void) ...@@ -1908,7 +1908,7 @@ static int __init usb_pwc_init(void)
default_fbufs = fbufs; default_fbufs = fbufs;
PWC_DEBUG_MODULE("Number of frame buffers set to %d.\n", default_fbufs); PWC_DEBUG_MODULE("Number of frame buffers set to %d.\n", default_fbufs);
} }
#if CONFIG_PWC_DEBUG #ifdef CONFIG_USB_PWC_DEBUG
if (pwc_trace >= 0) { if (pwc_trace >= 0) {
PWC_DEBUG_MODULE("Trace options: 0x%04x\n", pwc_trace); PWC_DEBUG_MODULE("Trace options: 0x%04x\n", pwc_trace);
} }
......
...@@ -350,7 +350,7 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file, ...@@ -350,7 +350,7 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file,
if (pdev == NULL) if (pdev == NULL)
return -EFAULT; return -EFAULT;
#if CONFIG_PWC_DEBUG #ifdef CONFIG_USB_PWC_DEBUG
if (PWC_DEBUG_LEVEL_IOCTL & pwc_trace) if (PWC_DEBUG_LEVEL_IOCTL & pwc_trace)
v4l_printk_ioctl(cmd); v4l_printk_ioctl(cmd);
#endif #endif
......
...@@ -39,11 +39,6 @@ ...@@ -39,11 +39,6 @@
#include "pwc-uncompress.h" #include "pwc-uncompress.h"
#include <media/pwc-ioctl.h> #include <media/pwc-ioctl.h>
/* Turn some debugging options on/off */
#ifndef CONFIG_PWC_DEBUG
#define CONFIG_PWC_DEBUG 1
#endif
/* Version block */ /* Version block */
#define PWC_MAJOR 10 #define PWC_MAJOR 10
#define PWC_MINOR 0 #define PWC_MINOR 0
...@@ -76,7 +71,7 @@ ...@@ -76,7 +71,7 @@
#define PWC_DEBUG_TRACE(fmt, args...) PWC_DEBUG(TRACE, fmt, ##args) #define PWC_DEBUG_TRACE(fmt, args...) PWC_DEBUG(TRACE, fmt, ##args)
#if CONFIG_PWC_DEBUG #ifdef CONFIG_USB_PWC_DEBUG
#define PWC_DEBUG_LEVEL (PWC_DEBUG_LEVEL_MODULE) #define PWC_DEBUG_LEVEL (PWC_DEBUG_LEVEL_MODULE)
...@@ -270,7 +265,7 @@ extern "C" { ...@@ -270,7 +265,7 @@ extern "C" {
#endif #endif
/* Global variables */ /* Global variables */
#if CONFIG_PWC_DEBUG #ifdef CONFIG_USB_PWC_DEBUG
extern int pwc_trace; extern int pwc_trace;
#endif #endif
extern int pwc_mbufs; extern int pwc_mbufs;
......
...@@ -14,7 +14,3 @@ obj-$(CONFIG_VIDEO_SAA7134_DVB) += saa7134-dvb.o ...@@ -14,7 +14,3 @@ obj-$(CONFIG_VIDEO_SAA7134_DVB) += saa7134-dvb.o
EXTRA_CFLAGS += -Idrivers/media/video EXTRA_CFLAGS += -Idrivers/media/video
EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
EXTRA_CFLAGS += -Idrivers/media/dvb/frontends EXTRA_CFLAGS += -Idrivers/media/dvb/frontends
extra-cflags-$(CONFIG_VIDEO_BUF_DVB) += -DHAVE_VIDEO_BUF_DVB=1
EXTRA_CFLAGS += $(extra-cflags-y) $(extra-cflags-m)
...@@ -41,7 +41,9 @@ ...@@ -41,7 +41,9 @@
#include <sound/driver.h> #include <sound/driver.h>
#include <sound/core.h> #include <sound/core.h>
#include <sound/pcm.h> #include <sound/pcm.h>
#if defined(CONFIG_VIDEO_BUF_DVB) || defined(CONFIG_VIDEO_BUF_DVB_MODULE)
#include <media/video-buf-dvb.h> #include <media/video-buf-dvb.h>
#endif
#ifndef TRUE #ifndef TRUE
# define TRUE (1==1) # define TRUE (1==1)
...@@ -532,9 +534,11 @@ struct saa7134_dev { ...@@ -532,9 +534,11 @@ struct saa7134_dev {
struct work_struct empress_workqueue; struct work_struct empress_workqueue;
int empress_started; int empress_started;
#if defined(CONFIG_VIDEO_BUF_DVB) || defined(CONFIG_VIDEO_BUF_DVB_MODULE)
/* SAA7134_MPEG_DVB only */ /* SAA7134_MPEG_DVB only */
struct videobuf_dvb dvb; struct videobuf_dvb dvb;
int (*original_demod_sleep)(struct dvb_frontend* fe); int (*original_demod_sleep)(struct dvb_frontend* fe);
#endif
}; };
/* ----------------------------------------------------------- */ /* ----------------------------------------------------------- */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment