Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c698d639 authored by Paul Gortmaker's avatar Paul Gortmaker Committed by Wolfram Sang
Browse files

i2c: create builtin_i2c_driver to avoid registration boilerplate 



In commit f309d444 ("platform_device:
better support builtin boilerplate avoidance") we introduced the
builtin_driver macro.

Here we use that support and extend it to I2C driver registration,
so where a driver is clearly non-modular and builtin-only, we can
register it in a similar fashion.  And existing code that is clearly
non-modular can be updated with the simple mapping of

     module_i2c_driver(...)  ---> builtin_i2c_driver(...)

We've essentially cloned the former to make the latter, and taken
out the remove/module_exit parts since those never get used in a
non-modular build of the code.

A similar thing was done in commit b4eb6cdb
("PCI: Add builtin_pci_driver() to avoid registration boilerplate").

Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent c5528153

include/linux/i2c.h

+12 −1
Original line number Original line Diff line number Diff line
@@ -655,7 +655,7 @@ static inline int i2c_adapter_id(struct i2c_adapter *adap) 
}

}





/**

/**

 * module_i2c_driver() - Helper macro for registering a I2C driver

 * module_i2c_driver() - Helper macro for registering a modular I2C driver

 * @__i2c_driver: i2c_driver struct

 * @__i2c_driver: i2c_driver struct

 *

 *

 * Helper macro for I2C drivers which do not do anything special in module

 * Helper macro for I2C drivers which do not do anything special in module
@@ -666,6 +666,17 @@ static inline int i2c_adapter_id(struct i2c_adapter *adap) 
	module_driver(__i2c_driver, i2c_add_driver, \

	module_driver(__i2c_driver, i2c_add_driver, \

			i2c_del_driver)

			i2c_del_driver)





/**

 * builtin_i2c_driver() - Helper macro for registering a builtin I2C driver

 * @__i2c_driver: i2c_driver struct

 *

 * Helper macro for I2C drivers which do not do anything special in their

 * init. This eliminates a lot of boilerplate. Each driver may only

 * use this macro once, and calling it replaces device_initcall().

 */

#define builtin_i2c_driver(__i2c_driver) \

	builtin_driver(__i2c_driver, i2c_add_driver)



#endif /* I2C */

#endif /* I2C */





#if IS_ENABLED(CONFIG_OF)

#if IS_ENABLED(CONFIG_OF)