| Message ID | 20200326210958.13051-2-wsa+renesas@sang-engineering.com |
|---|---|
| State | Awaiting Upstream |
| Headers | show |
| Series | char: convert to use new I2C API | expand |
On Thu, Mar 26, 2020 at 10:09:58PM +0100, Wolfram Sang wrote: > Move away from the deprecated API. > > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Can we have this now so I can remove the old API in the next merge window? > --- > drivers/char/ipmi/ipmi_ssif.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/char/ipmi/ipmi_ssif.c b/drivers/char/ipmi/ipmi_ssif.c > index 8ac390c2b514..2791b799e33d 100644 > --- a/drivers/char/ipmi/ipmi_ssif.c > +++ b/drivers/char/ipmi/ipmi_ssif.c > @@ -1945,8 +1945,8 @@ static int ssif_adapter_handler(struct device *adev, void *opaque) > if (adev->type != &i2c_adapter_type) > return 0; > > - addr_info->added_client = i2c_new_device(to_i2c_adapter(adev), > - &addr_info->binfo); > + addr_info->added_client = i2c_new_client_device(to_i2c_adapter(adev), > + &addr_info->binfo); > > if (!addr_info->adapter_name) > return 1; /* Only try the first I2C adapter by default. */ > -- > 2.20.1 >
On Thu, Mar 26, 2020 at 10:09:58PM +0100, Wolfram Sang wrote: > Move away from the deprecated API. > > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Ok by me. Acked-by: Corey Minyard <cminyard@mvista.com> Do you want me to take this, or is this part of something else? I can submit it if you like. -corey > --- > drivers/char/ipmi/ipmi_ssif.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/char/ipmi/ipmi_ssif.c b/drivers/char/ipmi/ipmi_ssif.c > index 8ac390c2b514..2791b799e33d 100644 > --- a/drivers/char/ipmi/ipmi_ssif.c > +++ b/drivers/char/ipmi/ipmi_ssif.c > @@ -1945,8 +1945,8 @@ static int ssif_adapter_handler(struct device *adev, void *opaque) > if (adev->type != &i2c_adapter_type) > return 0; > > - addr_info->added_client = i2c_new_device(to_i2c_adapter(adev), > - &addr_info->binfo); > + addr_info->added_client = i2c_new_client_device(to_i2c_adapter(adev), > + &addr_info->binfo); > > if (!addr_info->adapter_name) > return 1; /* Only try the first I2C adapter by default. */ > -- > 2.20.1 >
On Tue, May 12, 2020 at 01:25:17PM -0500, Corey Minyard wrote: > On Thu, Mar 26, 2020 at 10:09:58PM +0100, Wolfram Sang wrote: > > Move away from the deprecated API. > > > > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> > > Ok by me. > > Acked-by: Corey Minyard <cminyard@mvista.com> > > Do you want me to take this, or is this part of something else? I can > submit it if you like. I'd prefer if you take it. But I can take it if it is easier for you. Thanks!
On Thu, Mar 26, 2020 at 10:09:58PM +0100, Wolfram Sang wrote: > Move away from the deprecated API. Well, I should have looked a little closer first... comment inline > > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> > --- > drivers/char/ipmi/ipmi_ssif.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/char/ipmi/ipmi_ssif.c b/drivers/char/ipmi/ipmi_ssif.c > index 8ac390c2b514..2791b799e33d 100644 > --- a/drivers/char/ipmi/ipmi_ssif.c > +++ b/drivers/char/ipmi/ipmi_ssif.c > @@ -1945,8 +1945,8 @@ static int ssif_adapter_handler(struct device *adev, void *opaque) > if (adev->type != &i2c_adapter_type) > return 0; > > - addr_info->added_client = i2c_new_device(to_i2c_adapter(adev), > - &addr_info->binfo); > + addr_info->added_client = i2c_new_client_device(to_i2c_adapter(adev), > + &addr_info->binfo); i2c_new_client_device returns an ERR_PTR, not NULL on error. So this needs some more work. I'll send something out soon. -corey > > if (!addr_info->adapter_name) > return 1; /* Only try the first I2C adapter by default. */ > -- > 2.20.1 >
> > - addr_info->added_client = i2c_new_device(to_i2c_adapter(adev), > > - &addr_info->binfo); > > + addr_info->added_client = i2c_new_client_device(to_i2c_adapter(adev), > > + &addr_info->binfo); > > i2c_new_client_device returns an ERR_PTR, not NULL on error. So this Yes, this is the main motivation for the new API. > needs some more work. I'll send something out soon. Why does it need that work? 'added_client' is only used with i2c_unregister_device() which has been fixed to handle ERR_PTR as well. Or am I missing something?
On Wed, May 13, 2020 at 09:10:04AM +0200, Wolfram Sang wrote: > > > > - addr_info->added_client = i2c_new_device(to_i2c_adapter(adev), > > > - &addr_info->binfo); > > > + addr_info->added_client = i2c_new_client_device(to_i2c_adapter(adev), > > > + &addr_info->binfo); > > > > i2c_new_client_device returns an ERR_PTR, not NULL on error. So this > > Yes, this is the main motivation for the new API. > > > needs some more work. I'll send something out soon. > > Why does it need that work? 'added_client' is only used with > i2c_unregister_device() which has been fixed to handle ERR_PTR as well. > Or am I missing something? > No, I didn't look to see if i2c_unregister_device could handle that. -corey
diff --git a/drivers/char/ipmi/ipmi_ssif.c b/drivers/char/ipmi/ipmi_ssif.c index 8ac390c2b514..2791b799e33d 100644 --- a/drivers/char/ipmi/ipmi_ssif.c +++ b/drivers/char/ipmi/ipmi_ssif.c @@ -1945,8 +1945,8 @@ static int ssif_adapter_handler(struct device *adev, void *opaque) if (adev->type != &i2c_adapter_type) return 0; - addr_info->added_client = i2c_new_device(to_i2c_adapter(adev), - &addr_info->binfo); + addr_info->added_client = i2c_new_client_device(to_i2c_adapter(adev), + &addr_info->binfo); if (!addr_info->adapter_name) return 1; /* Only try the first I2C adapter by default. */
Move away from the deprecated API. Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> --- drivers/char/ipmi/ipmi_ssif.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)