diff options
-rw-r--r-- | drivers/i2c/i2c-core.c | 9 | ||||
-rw-r--r-- | include/linux/i2c.h | 10 |
2 files changed, 6 insertions, 13 deletions
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index b0bceb2fb8b1..20f92e355f56 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c | |||
@@ -759,14 +759,6 @@ int i2c_probe(struct i2c_adapter *adapter, | |||
759 | return 0; | 759 | return 0; |
760 | } | 760 | } |
761 | 761 | ||
762 | /* | ||
763 | * return id number for a specific adapter | ||
764 | */ | ||
765 | int i2c_adapter_id(struct i2c_adapter *adap) | ||
766 | { | ||
767 | return adap->nr; | ||
768 | } | ||
769 | |||
770 | struct i2c_adapter* i2c_get_adapter(int id) | 762 | struct i2c_adapter* i2c_get_adapter(int id) |
771 | { | 763 | { |
772 | struct i2c_adapter *adapter; | 764 | struct i2c_adapter *adapter; |
@@ -1196,7 +1188,6 @@ EXPORT_SYMBOL(i2c_master_send); | |||
1196 | EXPORT_SYMBOL(i2c_master_recv); | 1188 | EXPORT_SYMBOL(i2c_master_recv); |
1197 | EXPORT_SYMBOL(i2c_control); | 1189 | EXPORT_SYMBOL(i2c_control); |
1198 | EXPORT_SYMBOL(i2c_transfer); | 1190 | EXPORT_SYMBOL(i2c_transfer); |
1199 | EXPORT_SYMBOL(i2c_adapter_id); | ||
1200 | EXPORT_SYMBOL(i2c_get_adapter); | 1191 | EXPORT_SYMBOL(i2c_get_adapter); |
1201 | EXPORT_SYMBOL(i2c_put_adapter); | 1192 | EXPORT_SYMBOL(i2c_put_adapter); |
1202 | EXPORT_SYMBOL(i2c_probe); | 1193 | EXPORT_SYMBOL(i2c_probe); |
diff --git a/include/linux/i2c.h b/include/linux/i2c.h index da4faa016b17..ad1c0fb164bc 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h | |||
@@ -364,10 +364,6 @@ extern int i2c_probe(struct i2c_adapter *adapter, | |||
364 | */ | 364 | */ |
365 | extern int i2c_control(struct i2c_client *,unsigned int, unsigned long); | 365 | extern int i2c_control(struct i2c_client *,unsigned int, unsigned long); |
366 | 366 | ||
367 | /* This call returns a unique low identifier for each registered adapter, | ||
368 | * or -1 if the adapter was not registered. | ||
369 | */ | ||
370 | extern int i2c_adapter_id(struct i2c_adapter *adap); | ||
371 | extern struct i2c_adapter* i2c_get_adapter(int id); | 367 | extern struct i2c_adapter* i2c_get_adapter(int id); |
372 | extern void i2c_put_adapter(struct i2c_adapter *adap); | 368 | extern void i2c_put_adapter(struct i2c_adapter *adap); |
373 | 369 | ||
@@ -384,6 +380,12 @@ static inline int i2c_check_functionality(struct i2c_adapter *adap, u32 func) | |||
384 | return (func & i2c_get_functionality(adap)) == func; | 380 | return (func & i2c_get_functionality(adap)) == func; |
385 | } | 381 | } |
386 | 382 | ||
383 | /* Return id number for a specific adapter */ | ||
384 | static inline int i2c_adapter_id(struct i2c_adapter *adap) | ||
385 | { | ||
386 | return adap->nr; | ||
387 | } | ||
388 | |||
387 | /* | 389 | /* |
388 | * I2C Message - used for pure i2c transaction, also from /dev interface | 390 | * I2C Message - used for pure i2c transaction, also from /dev interface |
389 | */ | 391 | */ |