Skip to content

Commit

Permalink
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel…
Browse files Browse the repository at this point in the history
…/git/mchehab/linux-2.6

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
  V4L/DVB (10191a): Update MAINTAINERS entries on media drivers
  V4L/DVB (10190): cx88: Fix some Kbuild troubles
  V4L/DVB (10189): dm1105: Fix build with INPUT=m and DVB_DM1105=y
  V4L/DVB (10185): Use negated usb_endpoint_xfer_control, etc
  V4L/DVB (10182): tda8290: fix TDA8290 + TDA18271 initialization
  V4L/DVB (10181): v4l2-device: Fix some sparse warnings
  V4L/DVB (10180): drivers/media: Fix a number of sparse warnings
  V4L/DVB (10179): tda8290: Fix two sparse warnings
  V4L/DVB (10178): dvb_frontend: Fix some sparse warnings due to static symbols
  V4L/DVB (10177): Fix sparse warnings on em28xx
  V4L/DVB (10176b): pxa-camera: fix redefinition warnings and missing DMA definitions
  V4L/DVB (10176a): Switch remaining clear_user_page users over to clear_user_highpage
torvalds committed Jan 8, 2009
2 parents 713404d + 661263b commit 97c440b
Showing 28 changed files with 148 additions and 207 deletions.
65 changes: 42 additions & 23 deletions MAINTAINERS
Original file line number Diff line number Diff line change
@@ -1024,16 +1024,17 @@ S: Maintained
BTTV VIDEO4LINUX DRIVER
P: Mauro Carvalho Chehab
M: [email protected]
M: v4l-dvb-maintainer@linuxtv.org
L: [email protected].org
L: [email protected]
W: http://linuxtv.org
T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
S: Maintained

CAFE CMOS INTEGRATED CAMERA CONTROLLER DRIVER
P: Jonathan Corbet
M: [email protected]
L: [email protected]
L: [email protected]
T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
S: Maintained

CALGARY x86-64 IOMMU
@@ -1261,7 +1262,8 @@ P: Hans Verkuil, Andy Walls
M: [email protected], [email protected]
L: [email protected]
L: [email protected]
L: [email protected]
L: [email protected]
T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
W: http://linuxtv.org
S: Maintained

@@ -1487,10 +1489,10 @@ S: Maintained

DVB SUBSYSTEM AND DRIVERS
P: LinuxTV.org Project
M: v4l-dvb-maintainer@linuxtv.org
M: [email protected].org
L: [email protected] (subscription required)
W: http://linuxtv.org/
T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
S: Maintained

DZ DECSTATION DZ11 SERIAL DRIVER
@@ -1882,32 +1884,37 @@ S: Maintained
GSPCA FINEPIX SUBDRIVER
P: Frank Zago
M: [email protected]
L: [email protected]
L: [email protected]
T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
S: Maintained

GSPCA M5602 SUBDRIVER
P: Erik Andren
M: [email protected]
L: [email protected]
L: [email protected]
T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
S: Maintained

GSPCA PAC207 SONIXB SUBDRIVER
P: Hans de Goede
M: [email protected]
L: [email protected]
L: [email protected]
T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
S: Maintained

GSPCA T613 SUBDRIVER
P: Leandro Costantino
M: [email protected]
L: [email protected]
L: [email protected]
T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
S: Maintained

GSPCA USB WEBCAM DRIVER
P: Jean-Francois Moine
M: [email protected]
W: http://moinejf.free.fr
L: [email protected]
L: [email protected]
T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
S: Maintained

HARDWARE MONITORING
@@ -2437,7 +2444,8 @@ P: Hans Verkuil
M: [email protected]
L: [email protected]
L: [email protected]
L: [email protected]
L: [email protected]
T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
W: http://www.ivtvdriver.org
S: Maintained

@@ -3197,7 +3205,8 @@ S: Maintained
OMNIVISION OV7670 SENSOR DRIVER
P: Jonathan Corbet
M: [email protected]
L: [email protected]
L: [email protected]
T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
S: Maintained

ONENAND FLASH DRIVER
@@ -3479,8 +3488,9 @@ PVRUSB2 VIDEO4LINUX DRIVER
P: Mike Isely
M: [email protected]
L: [email protected] (subscribers-only)
L: [email protected]
L: [email protected]
W: http://www.isely.net/pvrusb2/
T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
S: Maintained

PXA2xx/PXA3xx SUPPORT
@@ -3700,6 +3710,8 @@ S: Supported
SAA7146 VIDEO4LINUX-2 DRIVER
P: Michael Hunold
M: [email protected]
L: [email protected]
T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
W: http://www.mihu.de/linux/saa7146
S: Maintained

@@ -3963,7 +3975,8 @@ S: Maintained
SOC-CAMERA V4L2 SUBSYSTEM
P: Guennadi Liakhovetski
M: [email protected]
L: [email protected]
L: [email protected]
T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
S: Maintained

SOEKRIS NET48XX LED SUPPORT
@@ -4382,7 +4395,8 @@ USB ET61X[12]51 DRIVER
P: Luca Risolia
M: [email protected]
L: [email protected]
L: [email protected]
L: [email protected]
T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
W: http://www.linux-projects.org
S: Maintained

@@ -4531,7 +4545,8 @@ USB SN9C1xx DRIVER
P: Luca Risolia
M: [email protected]
L: [email protected]
L: [email protected]
L: [email protected]
T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
W: http://www.linux-projects.org
S: Maintained

@@ -4560,15 +4575,17 @@ USB VIDEO CLASS
P: Laurent Pinchart
M: [email protected]
L: [email protected] (subscribers-only)
L: [email protected]
L: [email protected]
T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
W: http://linux-uvc.berlios.de
S: Maintained

USB W996[87]CF DRIVER
P: Luca Risolia
M: [email protected]
L: [email protected]
L: [email protected]
L: [email protected]
T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
W: http://www.linux-projects.org
S: Maintained

@@ -4582,7 +4599,8 @@ USB ZC0301 DRIVER
P: Luca Risolia
M: [email protected]
L: [email protected]
L: [email protected]
L: [email protected]
T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
W: http://www.linux-projects.org
S: Maintained

@@ -4597,7 +4615,8 @@ USB ZR364XX DRIVER
P: Antoine Jacquet
M: [email protected]
L: [email protected]
L: [email protected]
L: [email protected]
T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
W: http://royale.zerezo.com/zr364xx/
S: Maintained

@@ -4666,10 +4685,10 @@ S: Maintained
VIDEO FOR LINUX (V4L)
P: Mauro Carvalho Chehab
M: [email protected]
M: v4l-dvb-maintainer@linuxtv.org
L: [email protected].org
L: [email protected]
W: http://linuxtv.org
T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
S: Maintained

VLAN (802.1Q)
6 changes: 3 additions & 3 deletions drivers/media/common/tuners/tda8290.c
Original file line number Diff line number Diff line change
@@ -150,7 +150,7 @@ static void set_audio(struct dvb_frontend *fe,
}
}

struct {
static struct {
unsigned char seq[2];
} fm_mode[] = {
{ { 0x01, 0x81} }, /* Put device into expert mode */
@@ -207,7 +207,6 @@ static void tda8290_set_params(struct dvb_frontend *fe,
msleep(1);

if (params->mode == V4L2_TUNER_RADIO) {
int i;
unsigned char deemphasis[] = { 0x13, 1 };

/* FIXME: allow using a different deemphasis */
@@ -767,7 +766,8 @@ struct dvb_frontend *tda829x_attach(struct dvb_frontend *fe,
fe->ops.analog_ops.info.name = name;

if (priv->ver & TDA8290) {
tda8290_init_tuner(fe);
if (priv->ver & (TDA8275 | TDA8275A))
tda8290_init_tuner(fe);
tda8290_init_if(fe);
} else if (priv->ver & TDA8295)
tda8295_init_if(fe);
1 change: 1 addition & 0 deletions drivers/media/dvb/dm1105/Kconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
config DVB_DM1105
tristate "SDMC DM1105 based PCI cards"
depends on DVB_CORE && PCI && I2C
depends on INPUT
select DVB_PLL if !DVB_FE_CUSTOMISE
select DVB_STV0299 if !DVB_FE_CUSTOMISE
select DVB_STV0288 if !DVB_FE_CUSTOMISE
26 changes: 15 additions & 11 deletions drivers/media/dvb/dvb-core/dvb_frontend.c
Original file line number Diff line number Diff line change
@@ -824,7 +824,7 @@ static int dvb_frontend_check_parameters(struct dvb_frontend *fe,
return 0;
}

struct dtv_cmds_h dtv_cmds[] = {
static struct dtv_cmds_h dtv_cmds[] = {
[DTV_TUNE] = {
.name = "DTV_TUNE",
.cmd = DTV_TUNE,
@@ -962,7 +962,7 @@ struct dtv_cmds_h dtv_cmds[] = {
},
};

void dtv_property_dump(struct dtv_property *tvp)
static void dtv_property_dump(struct dtv_property *tvp)
{
int i;

@@ -993,7 +993,7 @@ void dtv_property_dump(struct dtv_property *tvp)
dprintk("%s() tvp.u.data = 0x%08x\n", __func__, tvp->u.data);
}

int is_legacy_delivery_system(fe_delivery_system_t s)
static int is_legacy_delivery_system(fe_delivery_system_t s)
{
if((s == SYS_UNDEFINED) || (s == SYS_DVBC_ANNEX_AC) ||
(s == SYS_DVBC_ANNEX_B) || (s == SYS_DVBT) || (s == SYS_DVBS) ||
@@ -1007,7 +1007,8 @@ int is_legacy_delivery_system(fe_delivery_system_t s)
* drivers can use a single set_frontend tuning function, regardless of whether
* it's being used for the legacy or new API, reducing code and complexity.
*/
void dtv_property_cache_sync(struct dvb_frontend *fe, struct dvb_frontend_parameters *p)
static void dtv_property_cache_sync(struct dvb_frontend *fe,
struct dvb_frontend_parameters *p)
{
struct dtv_frontend_properties *c = &fe->dtv_property_cache;

@@ -1059,7 +1060,7 @@ void dtv_property_cache_sync(struct dvb_frontend *fe, struct dvb_frontend_parame
/* Ensure the cached values are set correctly in the frontend
* legacy tuning structures, for the advanced tuning API.
*/
void dtv_property_legacy_params_sync(struct dvb_frontend *fe)
static void dtv_property_legacy_params_sync(struct dvb_frontend *fe)
{
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
struct dvb_frontend_private *fepriv = fe->frontend_priv;
@@ -1114,7 +1115,7 @@ void dtv_property_legacy_params_sync(struct dvb_frontend *fe)
/* Ensure the cached values are set correctly in the frontend
* legacy tuning structures, for the legacy tuning API.
*/
void dtv_property_adv_params_sync(struct dvb_frontend *fe)
static void dtv_property_adv_params_sync(struct dvb_frontend *fe)
{
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
struct dvb_frontend_private *fepriv = fe->frontend_priv;
@@ -1149,7 +1150,7 @@ void dtv_property_adv_params_sync(struct dvb_frontend *fe)
}
}

void dtv_property_cache_submit(struct dvb_frontend *fe)
static void dtv_property_cache_submit(struct dvb_frontend *fe)
{
struct dtv_frontend_properties *c = &fe->dtv_property_cache;

@@ -1180,8 +1181,9 @@ static int dvb_frontend_ioctl_legacy(struct inode *inode, struct file *file,
static int dvb_frontend_ioctl_properties(struct inode *inode, struct file *file,
unsigned int cmd, void *parg);

int dtv_property_process_get(struct dvb_frontend *fe, struct dtv_property *tvp,
struct inode *inode, struct file *file)
static int dtv_property_process_get(struct dvb_frontend *fe,
struct dtv_property *tvp,
struct inode *inode, struct file *file)
{
int r = 0;

@@ -1253,8 +1255,10 @@ int dtv_property_process_get(struct dvb_frontend *fe, struct dtv_property *tvp,
return r;
}

int dtv_property_process_set(struct dvb_frontend *fe, struct dtv_property *tvp,
struct inode *inode, struct file *file)
static int dtv_property_process_set(struct dvb_frontend *fe,
struct dtv_property *tvp,
struct inode *inode,
struct file *file)
{
int r = 0;
struct dvb_frontend_private *fepriv = fe->frontend_priv;
2 changes: 1 addition & 1 deletion drivers/media/dvb/dvb-usb/anysee.c
Original file line number Diff line number Diff line change
@@ -41,7 +41,7 @@
static int dvb_usb_anysee_debug;
module_param_named(debug, dvb_usb_anysee_debug, int, 0644);
MODULE_PARM_DESC(debug, "set debugging level" DVB_USB_DEBUG_STATUS);
int dvb_usb_anysee_delsys;
static int dvb_usb_anysee_delsys;
module_param_named(delsys, dvb_usb_anysee_delsys, int, 0644);
MODULE_PARM_DESC(delsys, "select delivery mode (0=DVB-C, 1=DVB-T)");
DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
2 changes: 1 addition & 1 deletion drivers/media/dvb/frontends/cx24116.c
Original file line number Diff line number Diff line change
@@ -369,7 +369,7 @@ static int cx24116_set_inversion(struct cx24116_state *state,
* Not all S2 mmodulation schemes are support and not all rates with
* a scheme are support. Especially, no auto detect when in S2 mode.
*/
struct cx24116_modfec {
static struct cx24116_modfec {
fe_delivery_system_t delivery_system;
fe_modulation_t modulation;
fe_code_rate_t fec;
4 changes: 2 additions & 2 deletions drivers/media/dvb/frontends/stb0899_algo.c
Original file line number Diff line number Diff line change
@@ -54,7 +54,7 @@ static u32 stb0899_calc_srate(u32 master_clk, u8 *sfr)
* stb0899_get_srate
* Get the current symbol rate
*/
u32 stb0899_get_srate(struct stb0899_state *state)
static u32 stb0899_get_srate(struct stb0899_state *state)
{
struct stb0899_internal *internal = &state->internal;
u8 sfr[3];
@@ -763,7 +763,7 @@ static void stb0899_dvbs2_config_csm_auto(struct stb0899_state *state)
stb0899_write_s2reg(state, STB0899_S2DEMOD, STB0899_BASE_CSM_CNTRL1, STB0899_OFF0_CSM_CNTRL1, reg);
}

long Log2Int(int number)
static long Log2Int(int number)
{
int i;

6 changes: 3 additions & 3 deletions drivers/media/dvb/frontends/stb0899_drv.c
Original file line number Diff line number Diff line change
@@ -134,7 +134,7 @@ static const struct stb0899_tab stb0899_dvbs2rf_tab[] = {
};

/* DVB-S2 Es/N0 quant in dB/100 vs read value * 100*/
struct stb0899_tab stb0899_quant_tab[] = {
static struct stb0899_tab stb0899_quant_tab[] = {
{ 0, 0 },
{ 0, 100 },
{ 600, 200 },
@@ -177,7 +177,7 @@ struct stb0899_tab stb0899_quant_tab[] = {
};

/* DVB-S2 Es/N0 estimate in dB/100 vs read value */
struct stb0899_tab stb0899_est_tab[] = {
static struct stb0899_tab stb0899_est_tab[] = {
{ 0, 0 },
{ 0, 1 },
{ 301, 2 },
@@ -217,7 +217,7 @@ struct stb0899_tab stb0899_est_tab[] = {
{ 5721, 526017 },
};

int _stb0899_read_reg(struct stb0899_state *state, unsigned int reg)
static int _stb0899_read_reg(struct stb0899_state *state, unsigned int reg)
{
int ret;

Loading

0 comments on commit 97c440b

Please sign in to comment.