Skip to content

Commit

Permalink
i2c-algo-bit: Add i2c_bit_add_numbered_bus
Browse files Browse the repository at this point in the history
Add i2c_bit_add_numbered_bus(), which is equivalent to i2c_bit_add_bus
except that it calls i2c_add_numbered_adapter() at the end instead of
i2c_add_adapter().

Signed-off-by: Jean Delvare <khali@linux-fr.org>
  • Loading branch information
Jean Delvare authored and Jean Delvare committed May 1, 2007
1 parent c056460 commit 0f3b483
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 1 deletion.
25 changes: 24 additions & 1 deletion drivers/i2c/algos/i2c-algo-bit.c
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,7 @@ static const struct i2c_algorithm i2c_bit_algo = {
/*
* registering functions to load algorithms at runtime
*/
int i2c_bit_add_bus(struct i2c_adapter *adap)
static int i2c_bit_prepare_bus(struct i2c_adapter *adap)
{
struct i2c_algo_bit_data *bit_adap = adap->algo_data;

Expand All @@ -558,10 +558,33 @@ int i2c_bit_add_bus(struct i2c_adapter *adap)
adap->timeout = 100; /* default values, should */
adap->retries = 3; /* be replaced by defines */

return 0;
}

int i2c_bit_add_bus(struct i2c_adapter *adap)
{
int err;

err = i2c_bit_prepare_bus(adap);
if (err)
return err;

return i2c_add_adapter(adap);
}
EXPORT_SYMBOL(i2c_bit_add_bus);

int i2c_bit_add_numbered_bus(struct i2c_adapter *adap)
{
int err;

err = i2c_bit_prepare_bus(adap);
if (err)
return err;

return i2c_add_numbered_adapter(adap);
}
EXPORT_SYMBOL(i2c_bit_add_numbered_bus);

MODULE_AUTHOR("Simon G. Vogl <simon@tk.uni-linz.ac.at>");
MODULE_DESCRIPTION("I2C-Bus bit-banging algorithm");
MODULE_LICENSE("GPL");
Expand Down
1 change: 1 addition & 0 deletions include/linux/i2c-algo-bit.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,6 @@ struct i2c_algo_bit_data {
};

int i2c_bit_add_bus(struct i2c_adapter *);
int i2c_bit_add_numbered_bus(struct i2c_adapter *);

#endif /* _LINUX_I2C_ALGO_BIT_H */

0 comments on commit 0f3b483

Please sign in to comment.