Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] I2C: inline i2c_adapter_id

We could inline i2c_adapter_id, as it is really, really short. Doing
so saves a few bytes both in i2c-core and in the drivers using this
function.

before after diff
drivers/hwmon/adm1026.ko 41344 41305 -39
drivers/hwmon/asb100.ko 27325 27246 -79
drivers/hwmon/gl518sm.ko 20824 20785 -39
drivers/hwmon/it87.ko 26419 26380 -39
drivers/hwmon/lm78.ko 21424 21385 -39
drivers/hwmon/lm85.ko 41034 40939 -95
drivers/hwmon/w83781d.ko 39561 39514 -47
drivers/hwmon/w83792d.ko 32979 32932 -47
drivers/i2c/i2c-core.ko 24708 24531 -177

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

authored by

Jean Delvare and committed by
Greg Kroah-Hartman
cdcb1921 e6cfb3ad

+6 -13
-9
drivers/i2c/i2c-core.c
··· 759 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 762 struct i2c_adapter* i2c_get_adapter(int id) 771 763 { 772 764 struct i2c_adapter *adapter; ··· 1188 1196 EXPORT_SYMBOL(i2c_master_recv); 1189 1197 EXPORT_SYMBOL(i2c_control); 1190 1198 EXPORT_SYMBOL(i2c_transfer); 1191 - EXPORT_SYMBOL(i2c_adapter_id); 1192 1199 EXPORT_SYMBOL(i2c_get_adapter); 1193 1200 EXPORT_SYMBOL(i2c_put_adapter); 1194 1201 EXPORT_SYMBOL(i2c_probe);
+6 -4
include/linux/i2c.h
··· 364 364 */ 365 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 367 extern struct i2c_adapter* i2c_get_adapter(int id); 372 368 extern void i2c_put_adapter(struct i2c_adapter *adap); 373 369 ··· 378 382 static inline int i2c_check_functionality(struct i2c_adapter *adap, u32 func) 379 383 { 380 384 return (func & i2c_get_functionality(adap)) == func; 385 + } 386 + 387 + /* Return id number for a specific adapter */ 388 + static inline int i2c_adapter_id(struct i2c_adapter *adap) 389 + { 390 + return adap->nr; 381 391 } 382 392 383 393 /*