diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2023-02-26 23:26:52 +0100 |
|---|---|---|
| committer | Wolfram Sang <wsa@kernel.org> | 2023-03-09 21:59:11 +0100 |
| commit | 03c835f498b540087244a6757e87dfe7ef10999b (patch) | |
| tree | 98c51960e5158bcc79dda003abf48fa512412589 /drivers/i2c | |
| parent | media: i2c: ov2685: convert to i2c's .probe_new() (diff) | |
| download | linux-03c835f498b540087244a6757e87dfe7ef10999b.tar.xz linux-03c835f498b540087244a6757e87dfe7ef10999b.zip | |
i2c: Switch .probe() to not take an id parameter
Commit b8a1a4cd5a98 ("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: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/i2c-core-base.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c index cb5fa971d67e..63253e2b2c1f 100644 --- a/drivers/i2c/i2c-core-base.c +++ b/drivers/i2c/i2c-core-base.c @@ -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; |