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

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

V4L/DVB (3307): Some cleanups at I2C modules 



- i2c names shorten
- removed obsoleted flags on newer modules
- small cleanups

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

drivers/media/video/bttv-i2c.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -107,7 +107,7 @@ static struct i2c_algo_bit_data bttv_i2c_algo_bit_template = { 
static struct i2c_adapter bttv_i2c_adap_sw_template = {

static struct i2c_adapter bttv_i2c_adap_sw_template = {

	.owner             = THIS_MODULE,

	.owner             = THIS_MODULE,

	.class             = I2C_CLASS_TV_ANALOG,

	.class             = I2C_CLASS_TV_ANALOG,

	.name              = "bt848",

	.name              = "bttv",

	.id                = I2C_HW_B_BT848,

	.id                = I2C_HW_B_BT848,

	.client_register   = attach_inform,

	.client_register   = attach_inform,

};

};

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

+0 −2
Original line number Original line Diff line number Diff line
@@ -939,9 +939,7 @@ static struct i2c_driver i2c_driver_cx25840 = { 
	.driver = {

	.driver = {

		.name = "cx25840",

		.name = "cx25840",

	},

	},



	.id = I2C_DRIVERID_CX25840,

	.id = I2C_DRIVERID_CX25840,



	.attach_adapter = cx25840_attach_adapter,

	.attach_adapter = cx25840_attach_adapter,

	.detach_client = cx25840_detach_client,

	.detach_client = cx25840_detach_client,

	.command = cx25840_command,

	.command = cx25840_command,

drivers/media/video/cx25840/cx25840.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ 
#ifndef _CX25840_H_

#ifndef _CX25840_H_

#define _CX25840_H_

#define _CX25840_H_







#include <linux/videodev2.h>

#include <linux/videodev2.h>

#include <linux/i2c.h>

#include <linux/i2c.h>

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

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




static struct i2c_driver driver = {

static struct i2c_driver driver = {

	.driver = {

	.driver = {

		.name   = "ir remote kbd driver",

		.name   = "ir-kbd-i2c",

	},

	},

	.id             = I2C_DRIVERID_INFRARED,

	.id             = I2C_DRIVERID_INFRARED,

	.attach_adapter = ir_probe,

	.attach_adapter = ir_probe,

drivers/media/video/msp3400-driver.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -106,10 +106,8 @@ MODULE_PARM_DESC(dolby, "Activates Dolby processsing"); 




/* Addresses to scan */

/* Addresses to scan */

static unsigned short normal_i2c[] = { 0x80 >> 1, 0x88 >> 1, I2C_CLIENT_END };

static unsigned short normal_i2c[] = { 0x80 >> 1, 0x88 >> 1, I2C_CLIENT_END };



I2C_CLIENT_INSMOD;

I2C_CLIENT_INSMOD;







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

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

/* functions for talking to the MSP3400C Sound processor                   */

/* functions for talking to the MSP3400C Sound processor                   */
@@ -975,7 +973,6 @@ static int msp_attach(struct i2c_adapter *adapter, int address, int kind) 
	client->addr = address;

	client->addr = address;

	client->adapter = adapter;

	client->adapter = adapter;

	client->driver = &i2c_driver;

	client->driver = &i2c_driver;

	client->flags = I2C_CLIENT_ALLOW_USE;

	snprintf(client->name, sizeof(client->name) - 1, "msp3400");

	snprintf(client->name, sizeof(client->name) - 1, "msp3400");





	if (msp_reset(client) == -1) {

	if (msp_reset(client) == -1) {
@@ -1119,7 +1116,6 @@ static struct i2c_driver i2c_driver = { 
		.suspend = msp_suspend,

		.suspend = msp_suspend,

		.resume  = msp_resume,

		.resume  = msp_resume,

	},

	},

	.owner          = THIS_MODULE,

};

};





static int __init msp3400_init_module(void)

static int __init msp3400_init_module(void)