* [PATCH V2 RESEND] media: v4l2-core: convert to new API with ERRPTR
@ 2020-02-10 16:56 Wolfram Sang
2020-02-14 9:18 ` Hans Verkuil
0 siblings, 1 reply; 3+ messages in thread
From: Wolfram Sang @ 2020-02-10 16:56 UTC (permalink / raw)
To: linux-media; +Cc: linux-i2c, Mauro Carvalho Chehab, Wolfram Sang
Use the new APIs instead of the deprecated ones.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
Resent from proper email address. Sorry for the confusion!
drivers/media/v4l2-core/v4l2-i2c.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/media/v4l2-core/v4l2-i2c.c b/drivers/media/v4l2-core/v4l2-i2c.c
index 5bf99e7c0c09..b4acca75644b 100644
--- a/drivers/media/v4l2-core/v4l2-i2c.c
+++ b/drivers/media/v4l2-core/v4l2-i2c.c
@@ -74,10 +74,10 @@ struct v4l2_subdev
/* Create the i2c client */
if (info->addr == 0 && probe_addrs)
- client = i2c_new_probed_device(adapter, info, probe_addrs,
- NULL);
+ client = i2c_new_scanned_device(adapter, info, probe_addrs,
+ NULL);
else
- client = i2c_new_device(adapter, info);
+ client = i2c_new_client_device(adapter, info);
/*
* Note: by loading the module first we are certain that c->driver
@@ -88,7 +88,7 @@ struct v4l2_subdev
* want to use the i2c device, so explicitly loading the module
* is the best alternative.
*/
- if (!client || !client->dev.driver)
+ if (!i2c_client_has_driver(client))
goto error;
/* Lock the module so we can safely get the v4l2_subdev pointer */
@@ -110,7 +110,7 @@ struct v4l2_subdev
* If we have a client but no subdev, then something went wrong and
* we must unregister the client.
*/
- if (client && !sd)
+ if (!IS_ERR(client) && !sd)
i2c_unregister_device(client);
return sd;
}
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH V2 RESEND] media: v4l2-core: convert to new API with ERRPTR
2020-02-10 16:56 [PATCH V2 RESEND] media: v4l2-core: convert to new API with ERRPTR Wolfram Sang
@ 2020-02-14 9:18 ` Hans Verkuil
0 siblings, 0 replies; 3+ messages in thread
From: Hans Verkuil @ 2020-02-14 9:18 UTC (permalink / raw)
To: Wolfram Sang, linux-media; +Cc: linux-i2c, Mauro Carvalho Chehab
On 2/10/20 5:56 PM, Wolfram Sang wrote:
> Use the new APIs instead of the deprecated ones.
>
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
I'm dropping this resend from patchwork since it is in the still pending
PR https://patchwork.linuxtv.org/patch/61113/.
That PR missed the cut for v5.6, so will be merged for v5.7.
Regards,
Hans
> ---
>
> Resent from proper email address. Sorry for the confusion!
>
> drivers/media/v4l2-core/v4l2-i2c.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/media/v4l2-core/v4l2-i2c.c b/drivers/media/v4l2-core/v4l2-i2c.c
> index 5bf99e7c0c09..b4acca75644b 100644
> --- a/drivers/media/v4l2-core/v4l2-i2c.c
> +++ b/drivers/media/v4l2-core/v4l2-i2c.c
> @@ -74,10 +74,10 @@ struct v4l2_subdev
>
> /* Create the i2c client */
> if (info->addr == 0 && probe_addrs)
> - client = i2c_new_probed_device(adapter, info, probe_addrs,
> - NULL);
> + client = i2c_new_scanned_device(adapter, info, probe_addrs,
> + NULL);
> else
> - client = i2c_new_device(adapter, info);
> + client = i2c_new_client_device(adapter, info);
>
> /*
> * Note: by loading the module first we are certain that c->driver
> @@ -88,7 +88,7 @@ struct v4l2_subdev
> * want to use the i2c device, so explicitly loading the module
> * is the best alternative.
> */
> - if (!client || !client->dev.driver)
> + if (!i2c_client_has_driver(client))
> goto error;
>
> /* Lock the module so we can safely get the v4l2_subdev pointer */
> @@ -110,7 +110,7 @@ struct v4l2_subdev
> * If we have a client but no subdev, then something went wrong and
> * we must unregister the client.
> */
> - if (client && !sd)
> + if (!IS_ERR(client) && !sd)
> i2c_unregister_device(client);
> return sd;
> }
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH V2 RESEND] media: v4l2-core: convert to new API with ERRPTR
@ 2020-02-10 16:55 Wolfram Sang
0 siblings, 0 replies; 3+ messages in thread
From: Wolfram Sang @ 2020-02-10 16:55 UTC (permalink / raw)
To: linux-media; +Cc: linux-i2c, Mauro Carvalho Chehab, Wolfram Sang
From: Wolfram Sang <wsa+renesas@sang-engineering.com>
Use the new APIs instead of the deprecated ones.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
drivers/media/v4l2-core/v4l2-i2c.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/media/v4l2-core/v4l2-i2c.c b/drivers/media/v4l2-core/v4l2-i2c.c
index 5bf99e7c0c09..b4acca75644b 100644
--- a/drivers/media/v4l2-core/v4l2-i2c.c
+++ b/drivers/media/v4l2-core/v4l2-i2c.c
@@ -74,10 +74,10 @@ struct v4l2_subdev
/* Create the i2c client */
if (info->addr == 0 && probe_addrs)
- client = i2c_new_probed_device(adapter, info, probe_addrs,
- NULL);
+ client = i2c_new_scanned_device(adapter, info, probe_addrs,
+ NULL);
else
- client = i2c_new_device(adapter, info);
+ client = i2c_new_client_device(adapter, info);
/*
* Note: by loading the module first we are certain that c->driver
@@ -88,7 +88,7 @@ struct v4l2_subdev
* want to use the i2c device, so explicitly loading the module
* is the best alternative.
*/
- if (!client || !client->dev.driver)
+ if (!i2c_client_has_driver(client))
goto error;
/* Lock the module so we can safely get the v4l2_subdev pointer */
@@ -110,7 +110,7 @@ struct v4l2_subdev
* If we have a client but no subdev, then something went wrong and
* we must unregister the client.
*/
- if (client && !sd)
+ if (!IS_ERR(client) && !sd)
i2c_unregister_device(client);
return sd;
}
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-02-14 9:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-10 16:56 [PATCH V2 RESEND] media: v4l2-core: convert to new API with ERRPTR Wolfram Sang
2020-02-14 9:18 ` Hans Verkuil
-- strict thread matches above, loose matches on Subject: below --
2020-02-10 16:55 Wolfram Sang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).