diff options
author | David Brownell <david-b@pacbell.net> | 2007-10-13 17:56:32 -0400 |
---|---|---|
committer | Jean Delvare <khali@hyperion.delvare> | 2007-10-13 17:56:32 -0400 |
commit | 3be27d37c257fa5f99363f9c8e06e405cbad712e (patch) | |
tree | 261b7945e9b7bf6819ad72f50bfe3d33a3a388bf /drivers/media/video/pvrusb2 | |
parent | e265cfa19c1220938de5f0291ed8d549a523de3c (diff) |
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>
Diffstat (limited to 'drivers/media/video/pvrusb2')
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c b/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c index 898c9d2e4cdf..c817c864e6a0 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c +++ b/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | |||
@@ -520,12 +520,6 @@ static int pvr2_i2c_xfer(struct i2c_adapter *i2c_adap, | |||
520 | return ret; | 520 | return ret; |
521 | } | 521 | } |
522 | 522 | ||
523 | static int pvr2_i2c_control(struct i2c_adapter *adapter, | ||
524 | unsigned int cmd, unsigned long arg) | ||
525 | { | ||
526 | return 0; | ||
527 | } | ||
528 | |||
529 | static u32 pvr2_i2c_functionality(struct i2c_adapter *adap) | 523 | static u32 pvr2_i2c_functionality(struct i2c_adapter *adap) |
530 | { | 524 | { |
531 | return I2C_FUNC_SMBUS_EMUL | I2C_FUNC_I2C; | 525 | return I2C_FUNC_SMBUS_EMUL | I2C_FUNC_I2C; |
@@ -942,7 +936,6 @@ static int pvr2_i2c_detach_inform(struct i2c_client *client) | |||
942 | 936 | ||
943 | static struct i2c_algorithm pvr2_i2c_algo_template = { | 937 | static struct i2c_algorithm pvr2_i2c_algo_template = { |
944 | .master_xfer = pvr2_i2c_xfer, | 938 | .master_xfer = pvr2_i2c_xfer, |
945 | .algo_control = pvr2_i2c_control, | ||
946 | .functionality = pvr2_i2c_functionality, | 939 | .functionality = pvr2_i2c_functionality, |
947 | }; | 940 | }; |
948 | 941 | ||