The I2C core framework provides a simplified probe framework from commit
b8a1a4cd5a98 ("i2c: Provide a temporary .probe_new() call-back type").
Convert the ADV748x to utilise this simplfied i2c driver registration.
Signed-off-by: Kieran Bingham <[email protected]>
---
drivers/media/i2c/adv748x/adv748x-core.c | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/drivers/media/i2c/adv748x/adv748x-core.c b/drivers/media/i2c/adv748x/adv748x-core.c
index 097e94279cf7..ae2b6eb93e09 100644
--- a/drivers/media/i2c/adv748x/adv748x-core.c
+++ b/drivers/media/i2c/adv748x/adv748x-core.c
@@ -677,8 +677,7 @@ static void adv748x_dt_cleanup(struct adv748x_state *state)
of_node_put(state->endpoints[i]);
}
-static int adv748x_probe(struct i2c_client *client,
- const struct i2c_device_id *id)
+static int adv748x_probe(struct i2c_client *client)
{
struct adv748x_state *state;
int ret;
@@ -806,13 +805,6 @@ static int adv748x_remove(struct i2c_client *client)
return 0;
}
-static const struct i2c_device_id adv748x_id[] = {
- { "adv7481", 0 },
- { "adv7482", 0 },
- { },
-};
-MODULE_DEVICE_TABLE(i2c, adv748x_id);
-
static const struct of_device_id adv748x_of_table[] = {
{ .compatible = "adi,adv7481", },
{ .compatible = "adi,adv7482", },
@@ -825,9 +817,8 @@ static struct i2c_driver adv748x_driver = {
.name = "adv748x",
.of_match_table = adv748x_of_table,
},
- .probe = adv748x_probe,
+ .probe_new = adv748x_probe,
.remove = adv748x_remove,
- .id_table = adv748x_id,
};
module_i2c_driver(adv748x_driver);
--
2.20.1
Hi Kieran,
Thanks for your patch.
On 2019-07-10 13:37:19 +0100, Kieran Bingham wrote:
> The I2C core framework provides a simplified probe framework from commit
> b8a1a4cd5a98 ("i2c: Provide a temporary .probe_new() call-back type").
>
> Convert the ADV748x to utilise this simplfied i2c driver registration.
>
> Signed-off-by: Kieran Bingham <[email protected]>
Looks good,
Reviewed-by: Niklas S?derlund <[email protected]>
> ---
> drivers/media/i2c/adv748x/adv748x-core.c | 13 ++-----------
> 1 file changed, 2 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/media/i2c/adv748x/adv748x-core.c b/drivers/media/i2c/adv748x/adv748x-core.c
> index 097e94279cf7..ae2b6eb93e09 100644
> --- a/drivers/media/i2c/adv748x/adv748x-core.c
> +++ b/drivers/media/i2c/adv748x/adv748x-core.c
> @@ -677,8 +677,7 @@ static void adv748x_dt_cleanup(struct adv748x_state *state)
> of_node_put(state->endpoints[i]);
> }
>
> -static int adv748x_probe(struct i2c_client *client,
> - const struct i2c_device_id *id)
> +static int adv748x_probe(struct i2c_client *client)
> {
> struct adv748x_state *state;
> int ret;
> @@ -806,13 +805,6 @@ static int adv748x_remove(struct i2c_client *client)
> return 0;
> }
>
> -static const struct i2c_device_id adv748x_id[] = {
> - { "adv7481", 0 },
> - { "adv7482", 0 },
> - { },
> -};
> -MODULE_DEVICE_TABLE(i2c, adv748x_id);
> -
> static const struct of_device_id adv748x_of_table[] = {
> { .compatible = "adi,adv7481", },
> { .compatible = "adi,adv7482", },
> @@ -825,9 +817,8 @@ static struct i2c_driver adv748x_driver = {
> .name = "adv748x",
> .of_match_table = adv748x_of_table,
> },
> - .probe = adv748x_probe,
> + .probe_new = adv748x_probe,
> .remove = adv748x_remove,
> - .id_table = adv748x_id,
> };
>
> module_i2c_driver(adv748x_driver);
> --
> 2.20.1
>
--
Regards,
Niklas S?derlund
On Wed, Jul 10, 2019 at 01:37:19PM +0100, Kieran Bingham wrote:
> The I2C core framework provides a simplified probe framework from commit
> b8a1a4cd5a98 ("i2c: Provide a temporary .probe_new() call-back type").
>
> Convert the ADV748x to utilise this simplfied i2c driver registration.
>
> Signed-off-by: Kieran Bingham <[email protected]>
Acked-by: Wolfram Sang <[email protected]>