From: Uwe Kleine-König <[email protected]>
.probe_new() doesn't get the i2c_device_id * parameter, so determine
that explicitly in the probe function.
Signed-off-by: Uwe Kleine-König <[email protected]>
---
drivers/i2c/muxes/i2c-mux-pca954x.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/i2c/muxes/i2c-mux-pca954x.c b/drivers/i2c/muxes/i2c-mux-pca954x.c
index a5f458b635df..3639e6d7304c 100644
--- a/drivers/i2c/muxes/i2c-mux-pca954x.c
+++ b/drivers/i2c/muxes/i2c-mux-pca954x.c
@@ -411,9 +411,9 @@ static int pca954x_init(struct i2c_client *client, struct pca954x *data)
/*
* I2C init/probing/exit functions
*/
-static int pca954x_probe(struct i2c_client *client,
- const struct i2c_device_id *id)
+static int pca954x_probe(struct i2c_client *client)
{
+ const struct i2c_device_id *id = i2c_client_get_device_id(client);
struct i2c_adapter *adap = client->adapter;
struct device *dev = &client->dev;
struct gpio_desc *gpio;
@@ -554,7 +554,7 @@ static struct i2c_driver pca954x_driver = {
.pm = &pca954x_pm,
.of_match_table = pca954x_of_match,
},
- .probe = pca954x_probe,
+ .probe_new = pca954x_probe,
.remove = pca954x_remove,
.id_table = pca954x_id,
};
--
2.38.1
2022-11-18 at 23:36, Uwe Kleine-König wrote:
> From: Uwe Kleine-König <[email protected]>
>
> .probe_new() doesn't get the i2c_device_id * parameter, so determine
> that explicitly in the probe function.
>
> Signed-off-by: Uwe Kleine-König <[email protected]>
Acked-by: Peter Rosin <[email protected]>
> ---
> drivers/i2c/muxes/i2c-mux-pca954x.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/i2c/muxes/i2c-mux-pca954x.c b/drivers/i2c/muxes/i2c-mux-pca954x.c
> index a5f458b635df..3639e6d7304c 100644
> --- a/drivers/i2c/muxes/i2c-mux-pca954x.c
> +++ b/drivers/i2c/muxes/i2c-mux-pca954x.c
> @@ -411,9 +411,9 @@ static int pca954x_init(struct i2c_client *client, struct pca954x *data)
> /*
> * I2C init/probing/exit functions
> */
> -static int pca954x_probe(struct i2c_client *client,
> - const struct i2c_device_id *id)
> +static int pca954x_probe(struct i2c_client *client)
> {
> + const struct i2c_device_id *id = i2c_client_get_device_id(client);
> struct i2c_adapter *adap = client->adapter;
> struct device *dev = &client->dev;
> struct gpio_desc *gpio;
> @@ -554,7 +554,7 @@ static struct i2c_driver pca954x_driver = {
> .pm = &pca954x_pm,
> .of_match_table = pca954x_of_match,
> },
> - .probe = pca954x_probe,
> + .probe_new = pca954x_probe,
> .remove = pca954x_remove,
> .id_table = pca954x_id,
> };
On Fri, Nov 18, 2022 at 11:36:22PM +0100, Uwe Kleine-König wrote:
> From: Uwe Kleine-König <[email protected]>
>
> .probe_new() doesn't get the i2c_device_id * parameter, so determine
> that explicitly in the probe function.
>
> Signed-off-by: Uwe Kleine-König <[email protected]>
> Acked-by: Peter Rosin <[email protected]>
Your patch is better than the old one :) Applied to for-next, thanks!