Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux (3b2ee614) · Commits · 戴 / test

drivers/i2c/i2c-core-base.c

+0 −23

Original line number	Diff line number	Diff line
		@@ -896,29 +896,6 @@ struct i2c_client i2c_new_dummy_device(struct i2c_adapter adapter, u16 address
		}
		EXPORT_SYMBOL_GPL(i2c_new_dummy_device);

		/**
		* i2c_new_dummy - return a new i2c device bound to a dummy driver
		* @adapter: the adapter managing the device
		* @address: seven bit address to be used
		* Context: can sleep
		*
		* This deprecated function has the same functionality as @i2c_new_dummy_device,
		* it just returns NULL instead of an ERR_PTR in case of an error for
		* compatibility with current I2C API. It will be removed once all users are
		* converted.
		*
		* This returns the new i2c client, which should be saved for later use with
		* i2c_unregister_device(); or NULL to indicate an error.
		*/
		struct i2c_client i2c_new_dummy(struct i2c_adapter adapter, u16 address)
		{
		struct i2c_client *ret;

		ret = i2c_new_dummy_device(adapter, address);
		return IS_ERR(ret) ? NULL : ret;
		}
		EXPORT_SYMBOL_GPL(i2c_new_dummy);

		struct i2c_dummy_devres {
		struct i2c_client *client;
		};

+6 −6

Original line number	Diff line number	Diff line
		@@ -300,6 +300,7 @@ struct i2c_driver {
		* generic enough to hide second-sourcing and compatible revisions.
		* @adapter: manages the bus segment hosting this I2C device
		* @dev: Driver model device node for the slave.
		* @init_irq: IRQ that was set at initialization
		* @irq: indicates the IRQ generated by this device (if any)
		* @detected: member of an i2c_driver.clients list or i2c-core's
		* userspace_devices list
		@@ -466,12 +467,6 @@ i2c_new_probed_device(struct i2c_adapter *adap,
		/* Common custom probe functions */
		extern int i2c_probe_func_quick_read(struct i2c_adapter *adap, unsigned short addr);

		/* For devices that use several addresses, use i2c_new_dummy() to make
		* client handles for the extra addresses.
		*/
		extern struct i2c_client *
		i2c_new_dummy(struct i2c_adapter *adap, u16 address);

		extern struct i2c_client *
		i2c_new_dummy_device(struct i2c_adapter *adapter, u16 address);

		@@ -856,6 +851,11 @@ extern void i2c_del_driver(struct i2c_driver *driver);
		#define i2c_add_driver(driver) \
		i2c_register_driver(THIS_MODULE, driver)

		static inline bool i2c_client_has_driver(struct i2c_client *client)
		{
		return !IS_ERR_OR_NULL(client) && client->dev.driver;
		}

		/* call the i2c_client->command() of all attached clients with
		* the given arguments */
		extern void i2c_clients_command(struct i2c_adapter *adap,