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

Commit d21838dd authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

V4L/DVB (3123b): syncs V4L subsystem tree with kernel 



- This patch makes kernel in sync with v4l subsystem tree.
- some lines reordered to be sync.
- some reduntant codes removed.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@brturbo.com.br>
parent b060c25f

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

+1 −2
Original line number Diff line number Diff line
@@ -34,8 +34,7 @@ 
#include "cx88.h"



MODULE_DESCRIPTION("driver for cx2388x/cx23416 based mpeg encoder cards");

MODULE_AUTHOR("Jelle Foks <jelle@foks.8m.com>");

MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]");

MODULE_AUTHOR("Jelle Foks <jelle@foks.8m.com>, Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]");

MODULE_LICENSE("GPL");



static unsigned int mpegbufs = 32;

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

+1 −2
Original line number Diff line number Diff line
@@ -29,9 +29,8 @@ 
#include <linux/module.h>

#include <linux/moduleparam.h>



#include <media/ir-common.h>



#include "cx88.h"

#include <media/ir-common.h>



/* ---------------------------------------------------------------------- */

drivers/media/video/em28xx/em28xx-core.c

+3 −3
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 


/* #define ENABLE_DEBUG_ISOC_FRAMES */



static unsigned int core_debug;

static unsigned int core_debug = 0;

module_param(core_debug,int,0644);

MODULE_PARM_DESC(core_debug,"enable debug messages [core]");
@@ -41,7 +41,7 @@ MODULE_PARM_DESC(core_debug,"enable debug messages [core]"); 
		printk(KERN_INFO "%s %s :"fmt, \

			 dev->name, __FUNCTION__ , ##arg); } while (0)



static unsigned int reg_debug;

static unsigned int reg_debug = 0;

module_param(reg_debug,int,0644);

MODULE_PARM_DESC(reg_debug,"enable debug messages [URB reg]");
@@ -50,7 +50,7 @@ MODULE_PARM_DESC(reg_debug,"enable debug messages [URB reg]"); 
		printk(KERN_INFO "%s %s :"fmt, \

			 dev->name, __FUNCTION__ , ##arg); } while (0)



static unsigned int isoc_debug;

static unsigned int isoc_debug = 0;

module_param(isoc_debug,int,0644);

MODULE_PARM_DESC(isoc_debug,"enable debug messages [isoc transfers]");

drivers/media/video/ir-kbd-gpio.c

+3 −5
Original line number Diff line number Diff line
@@ -26,9 +26,8 @@ 
#include <linux/input.h>

#include <linux/pci.h>



#include <media/ir-common.h>



#include "bttv.h"

#include <media/ir-common.h>



/* ---------------------------------------------------------------------- */
@@ -672,6 +671,8 @@ static int ir_probe(struct device *dev) 
	snprintf(ir->phys, sizeof(ir->phys), "pci-%s/ir0",

		 pci_name(sub->core->pci));



	ir->input = input_dev;

	ir->sub = sub;

	ir_input_init(input_dev, &ir->ir, ir_type, ir_codes);

	input_dev->name = ir->name;

	input_dev->phys = ir->phys;
@@ -686,9 +687,6 @@ static int ir_probe(struct device *dev) 
	}

	input_dev->cdev.dev = &sub->core->pci->dev;



	ir->input = input_dev;

	ir->sub = sub;



	if (ir->polling) {

		INIT_WORK(&ir->work, ir_work, ir);

		init_timer(&ir->timer);

drivers/media/video/ir-kbd-i2c.c

+10 −6
Original line number Diff line number Diff line
@@ -304,18 +304,20 @@ static int ir_attach(struct i2c_adapter *adap, int addr, 
	ir = kzalloc(sizeof(struct IR_i2c),GFP_KERNEL);

	input_dev = input_allocate_device();

	if (!ir || !input_dev) {

		kfree(ir);

		input_free_device(input_dev);

		kfree(ir);

		return -ENOMEM;

	}

	memset(ir,0,sizeof(*ir));



	ir->c = client_template;

	ir->input = input_dev;



	i2c_set_clientdata(&ir->c, ir);

	ir->c.adapter = adap;

	ir->c.addr    = addr;



	i2c_set_clientdata(&ir->c, ir);



	switch(addr) {

	case 0x64:

		name        = "Pixelview";
@@ -378,13 +380,15 @@ static int ir_attach(struct i2c_adapter *adap, int addr, 
		 ir->c.dev.bus_id);



	/* init + register input device */

	ir_input_init(input_dev, &ir->ir, ir_type, ir_codes);

	ir_input_init(input_dev,&ir->ir,ir_type,ir->ir_codes);

	input_dev->id.bustype = BUS_I2C;

	input_dev->name       = ir->c.name;

	input_dev->phys       = ir->phys;



	/* register event device */

	input_register_device(ir->input);

	printk(DEVNAME ": %s detected at %s [%s]\n",

	       ir->input->name,ir->input->phys,adap->name);



	/* start polling via eventd */

	INIT_WORK(&ir->work, ir_work, ir);