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

Commit 3be27d37 authored by David Brownell's avatar David Brownell Committed by Jean Delvare
Browse files

i2c: Remove NOP i2c_algorithm.algo_control() methods 



This removes NOP implementations of i2c_algorithm.algo_control.

With this change, there are no implementations of this hook in
the kernel.org tree ... that hook seems about ripe to remove.

Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
parent e265cfa1

drivers/i2c/busses/i2c-iop3xx.c

+0 −8
Original line number Diff line number Diff line
@@ -389,13 +389,6 @@ iop3xx_i2c_master_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, 
	return im;   

}



static int 

iop3xx_i2c_algo_control(struct i2c_adapter *adapter, unsigned int cmd,

			unsigned long arg)

{

	return 0;

}



static u32 

iop3xx_i2c_func(struct i2c_adapter *adap)

{
@@ -404,7 +397,6 @@ iop3xx_i2c_func(struct i2c_adapter *adap) 


static const struct i2c_algorithm iop3xx_i2c_algo = {

	.master_xfer	= iop3xx_i2c_master_xfer,

	.algo_control	= iop3xx_i2c_algo_control,

	.functionality	= iop3xx_i2c_func,

};

drivers/media/video/bt8xx/bttv-i2c.c

+0 −7
Original line number Diff line number Diff line
@@ -124,12 +124,6 @@ static struct i2c_adapter bttv_i2c_adap_sw_template = { 
/* ----------------------------------------------------------------------- */

/* I2C functions - hardware i2c                                            */



static int algo_control(struct i2c_adapter *adapter,

			unsigned int cmd, unsigned long arg)

{

	return 0;

}



static u32 functionality(struct i2c_adapter *adap)

{

	return I2C_FUNC_SMBUS_EMUL;
@@ -278,7 +272,6 @@ static int bttv_i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, int 


static struct i2c_algorithm bttv_algo = {

	.master_xfer   = bttv_i2c_xfer,

	.algo_control  = algo_control,

	.functionality = functionality,

};

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

+0 −10
Original line number Diff line number Diff line
@@ -382,15 +382,6 @@ static int em28xx_i2c_eeprom(struct em28xx *dev, unsigned char *eedata, int len) 


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



/*

 * algo_control()

 */

static int algo_control(struct i2c_adapter *adapter,

			unsigned int cmd, unsigned long arg)

{

	return 0;

}



/*

 * functionality()

 */
@@ -475,7 +466,6 @@ static int attach_inform(struct i2c_client *client) 


static struct i2c_algorithm em28xx_algo = {

	.master_xfer   = em28xx_i2c_xfer,

	.algo_control  = algo_control,

	.functionality = functionality,

};

drivers/media/video/pvrusb2/pvrusb2-i2c-core.c

+0 −7
Original line number Diff line number Diff line
@@ -520,12 +520,6 @@ static int pvr2_i2c_xfer(struct i2c_adapter *i2c_adap, 
	return ret;

}



static int pvr2_i2c_control(struct i2c_adapter *adapter,

			    unsigned int cmd, unsigned long arg)

{

	return 0;

}



static u32 pvr2_i2c_functionality(struct i2c_adapter *adap)

{

	return I2C_FUNC_SMBUS_EMUL | I2C_FUNC_I2C;
@@ -942,7 +936,6 @@ static int pvr2_i2c_detach_inform(struct i2c_client *client) 


static struct i2c_algorithm pvr2_i2c_algo_template = {

	.master_xfer   = pvr2_i2c_xfer,

	.algo_control  = pvr2_i2c_control,

	.functionality = pvr2_i2c_functionality,

};

drivers/media/video/saa7134/saa7134-i2c.c

+0 −7
Original line number Diff line number Diff line
@@ -314,12 +314,6 @@ static int saa7134_i2c_xfer(struct i2c_adapter *i2c_adap, 


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



static int algo_control(struct i2c_adapter *adapter,

			unsigned int cmd, unsigned long arg)

{

	return 0;

}



static u32 functionality(struct i2c_adapter *adap)

{

	return I2C_FUNC_SMBUS_EMUL;
@@ -387,7 +381,6 @@ static int attach_inform(struct i2c_client *client) 


static struct i2c_algorithm saa7134_algo = {

	.master_xfer   = saa7134_i2c_xfer,

	.algo_control  = algo_control,

	.functionality = functionality,

};