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: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Jean Delvare <khali@linux-fr.org>
This commit is contained in:
parent
e265cfa19c
commit
3be27d37c2
|
@ -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,
|
||||
};
|
||||
|
||||
|
|
|
@ -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,
|
||||
};
|
||||
|
||||
|
|
|
@ -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,
|
||||
};
|
||||
|
||||
|
|
|
@ -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,
|
||||
};
|
||||
|
||||
|
|
|
@ -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,
|
||||
};
|
||||
|
||||
|
|
|
@ -183,11 +183,6 @@ usbvision_i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msgs[], int num)
|
|||
return num;
|
||||
}
|
||||
|
||||
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 | I2C_FUNC_10BIT_ADDR;
|
||||
|
@ -199,7 +194,6 @@ static u32 functionality(struct i2c_adapter *adap)
|
|||
static struct i2c_algorithm usbvision_algo = {
|
||||
.master_xfer = usbvision_i2c_xfer,
|
||||
.smbus_xfer = NULL,
|
||||
.algo_control = algo_control,
|
||||
.functionality = functionality,
|
||||
};
|
||||
|
||||
|
|
|
@ -444,8 +444,6 @@ static int w9968cf_i2c_smbus_xfer(struct i2c_adapter*, u16 addr,
|
|||
static u32 w9968cf_i2c_func(struct i2c_adapter*);
|
||||
static int w9968cf_i2c_attach_inform(struct i2c_client*);
|
||||
static int w9968cf_i2c_detach_inform(struct i2c_client*);
|
||||
static int w9968cf_i2c_control(struct i2c_adapter*, unsigned int cmd,
|
||||
unsigned long arg);
|
||||
|
||||
/* Memory management */
|
||||
static void* rvmalloc(unsigned long size);
|
||||
|
@ -1543,21 +1541,12 @@ static int w9968cf_i2c_detach_inform(struct i2c_client* client)
|
|||
}
|
||||
|
||||
|
||||
static int
|
||||
w9968cf_i2c_control(struct i2c_adapter* adapter, unsigned int cmd,
|
||||
unsigned long arg)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static int w9968cf_i2c_init(struct w9968cf_device* cam)
|
||||
{
|
||||
int err = 0;
|
||||
|
||||
static struct i2c_algorithm algo = {
|
||||
.smbus_xfer = w9968cf_i2c_smbus_xfer,
|
||||
.algo_control = w9968cf_i2c_control,
|
||||
.functionality = w9968cf_i2c_func,
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue