Commit 769e2438 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab Committed by Linus Torvalds
Browse files

[PATCH] V4L: Some funcions now static and I2C hw code for IR 



- Some funcions are now declared as static
- Added a I2C code for InfraRed.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6f502b8a

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

+2 −2
Original line number Diff line number Diff line
@@ -714,7 +714,7 @@ static int cx25840_command(struct i2c_client *client, unsigned int cmd, 


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



struct i2c_driver i2c_driver_cx25840;

static struct i2c_driver i2c_driver_cx25840;



static int cx25840_detect_client(struct i2c_adapter *adapter, int address,

				 int kind)
@@ -807,7 +807,7 @@ static int cx25840_detach_client(struct i2c_client *client) 


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



struct i2c_driver i2c_driver_cx25840 = {

static struct i2c_driver i2c_driver_cx25840 = {

	.name = "cx25840",



	.id = I2C_DRIVERID_CX25840,

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

+1 −1
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ static int ir_probe(struct i2c_adapter *adap); 


static struct i2c_driver driver = {

	.name           = "ir remote kbd driver",

	.id             = I2C_DRIVERID_EXP3, /* FIXME */

	.id             = I2C_DRIVERID_I2C_IR,

	.flags          = I2C_DF_NOTIFY,

	.attach_adapter = ir_probe,

	.detach_client  = ir_detach,

drivers/media/video/saa7127.c

+3 −3
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ static const struct i2c_reg_value saa7127_init_config_60hz[] = { 
};



#define SAA7127_50HZ_DAC_CONTROL 0x02

struct i2c_reg_value saa7127_init_config_50hz[] = {

static struct i2c_reg_value saa7127_init_config_50hz[] = {

	{ SAA7127_REG_BURST_START, 			0x21 },

	/* BURST_END is also used as a chip ID in saa7127_detect_client */

	{ SAA7127_REG_BURST_END, 			0x1d },
@@ -696,7 +696,7 @@ static int saa7127_command(struct i2c_client *client, 


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



struct i2c_driver i2c_driver_saa7127;

static struct i2c_driver i2c_driver_saa7127;



/* ----------------------------------------------------------------------- */
@@ -818,7 +818,7 @@ static int saa7127_detach(struct i2c_client *client) 


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



struct i2c_driver i2c_driver_saa7127 = {

static struct i2c_driver i2c_driver_saa7127 = {

	.name = "saa7127",

	.id = I2C_DRIVERID_SAA7127,

	.flags = I2C_DF_NOTIFY,

include/linux/i2c-id.h

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ 
#define I2C_DRIVERID_SAA7127	72	/* saa7124 video encoder	*/

#define I2C_DRIVERID_SAA711X	73	/* saa711x video encoders	*/

#define I2C_DRIVERID_AKITAIOEXP	74	/* IO Expander on Sharp SL-C1000 */

#define I2C_DRIVERID_I2C_IR	75	/* I2C InfraRed on Video boards */



#define I2C_DRIVERID_EXP0	0xF0	/* experimental use id's	*/

#define I2C_DRIVERID_EXP1	0xF1

CRA Git | Maintained and supported by SUSTech CRA and CCSE