Commit 03c835f4 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Wolfram Sang
Browse files

i2c: Switch .probe() to not take an id parameter 



Commit b8a1a4cd ("i2c: Provide a temporary .probe_new() call-back
type") introduced a new probe callback to convert i2c init routines to
not take an i2c_device_id parameter. Now that all in-tree drivers are
converted to the temporary .probe_new() callback, .probe() can be
modified to match the desired prototype.

Now that .probe() and .probe_new() have the same semantic, they can be
defined as members of an anonymous union to save some memory and
simplify the core code a bit.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent 7eafbd40

drivers/i2c/i2c-core-base.c

+2 −9
Original line number Diff line number Diff line
@@ -561,15 +561,8 @@ static int i2c_device_probe(struct device *dev) 
		goto err_detach_pm_domain;

	}



	/*

	 * When there are no more users of probe(),

	 * rename probe_new to probe.

	 */

	if (driver->probe_new)

		status = driver->probe_new(client);

	else if (driver->probe)

		status = driver->probe(client,

				       i2c_match_id(driver->id_table, client));

	if (driver->probe)

		status = driver->probe(client);

	else

		status = -EINVAL;

include/linux/i2c.h

+11 −7
Original line number Diff line number Diff line
@@ -236,8 +236,8 @@ enum i2c_driver_flags { 
/**

 * struct i2c_driver - represent an I2C device driver

 * @class: What kind of i2c device we instantiate (for detect)

 * @probe: Callback for device binding - soon to be deprecated

 * @probe_new: New callback for device binding

 * @probe: Callback for device binding

 * @probe_new: Transitional callback for device binding - do not use

 * @remove: Callback for device unbinding

 * @shutdown: Callback for device shutdown

 * @alert: Alert callback, for example for the SMBus alert protocol
@@ -272,14 +272,18 @@ enum i2c_driver_flags { 
struct i2c_driver {

	unsigned int class;



	union {

	/* Standard driver model interfaces */

	int (*probe)(struct i2c_client *client, const struct i2c_device_id *id);

	void (*remove)(struct i2c_client *client);



	/* New driver model interface to aid the seamless removal of the

	 * current probe()'s, more commonly unused than used second parameter.

		int (*probe)(struct i2c_client *client);

		/*

		 * Legacy callback that was part of a conversion of .probe().

		 * Today it has the same semantic as .probe(). Don't use for new

		 * code.

		 */

		int (*probe_new)(struct i2c_client *client);

	};

	void (*remove)(struct i2c_client *client);





	/* driver model interfaces that don't relate to enumeration  */

	void (*shutdown)(struct i2c_client *client);