[PATCH 0/2] usb: typec: ucsi: ccg: Adjustments for common code in two functions

[PATCH 0/2] usb: typec: ucsi: ccg: Adjustments for common code in two functions

[Markus Elfring]

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Wed, 25 Sep 2024 19:19:01 +0200

A few update suggestions were taken into account
from static source code analysis.

Markus Elfring (2):
  Use common code in ccg_write()
  Use common code in ccg_read()

 drivers/usb/typec/ucsi/ucsi_ccg.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

--
2.46.1

[PATCH 1/2] usb: typec: ucsi: ccg: Use common code in ccg_write()

[Markus Elfring]

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Wed, 25 Sep 2024 19:00:23 +0200

Add a label so that three statements can be better reused at the end of
this function implementation.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 drivers/usb/typec/ucsi/ucsi_ccg.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/usb/typec/ucsi/ucsi_ccg.c b/drivers/usb/typec/ucsi/ucsi_ccg.c
index b3ec799fc873..ed075a403d87 100644
--- a/drivers/usb/typec/ucsi/ucsi_ccg.c
+++ b/drivers/usb/typec/ucsi/ucsi_ccg.c
@@ -306,14 +306,14 @@ static int ccg_write(struct ucsi_ccg *uc, u16 rab, const u8 *data, u32 len)
 	status = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
 	if (status < 0) {
 		dev_err(uc->dev, "i2c_transfer failed %d\n", status);
-		pm_runtime_put_sync(uc->dev);
-		kfree(buf);
-		return status;
+		goto put_sync;
 	}

+	status = 0;
+put_sync:
 	pm_runtime_put_sync(uc->dev);
 	kfree(buf);
-	return 0;
+	return status;
 }

 static int ccg_op_region_update(struct ucsi_ccg *uc, u32 cci)
--
2.46.1

[PATCH 2/2] usb: typec: ucsi: ccg: Use common code in ccg_read()

[Markus Elfring]

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Wed, 25 Sep 2024 19:08:07 +0200

Add a label so that two statements can be better reused at the end of
this function implementation.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 drivers/usb/typec/ucsi/ucsi_ccg.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/typec/ucsi/ucsi_ccg.c b/drivers/usb/typec/ucsi/ucsi_ccg.c
index ed075a403d87..e3850c42583e 100644
--- a/drivers/usb/typec/ucsi/ucsi_ccg.c
+++ b/drivers/usb/typec/ucsi/ucsi_ccg.c
@@ -269,15 +269,16 @@ static int ccg_read(struct ucsi_ccg *uc, u16 rab, u8 *data, u32 len)
 		status = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
 		if (status < 0) {
 			dev_err(uc->dev, "i2c_transfer failed %d\n", status);
-			pm_runtime_put_sync(uc->dev);
-			return status;
+			goto put_sync;
 		}
 		rab += rlen;
 		rem_len -= rlen;
 	}

+	status = 0;
+put_sync:
 	pm_runtime_put_sync(uc->dev);
-	return 0;
+	return status;
 }

 static int ccg_write(struct ucsi_ccg *uc, u16 rab, const u8 *data, u32 len)
--
2.46.1

Re: [PATCH 0/2] usb: typec: ucsi: ccg: Adjustments for common code in two functions

[Dmitry Baryshkov]

On Wed, Sep 25, 2024 at 07:31:04PM GMT, Markus Elfring wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Wed, 25 Sep 2024 19:19:01 +0200
> 
> A few update suggestions were taken into account
> from static source code analysis.
> 
> Markus Elfring (2):
>   Use common code in ccg_write()
>   Use common code in ccg_read()
> 
>  drivers/usb/typec/ucsi/ucsi_ccg.c | 15 ++++++++-------
>  1 file changed, 8 insertions(+), 7 deletions(-)

For the series:

Acked-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>

-- 
With best wishes
Dmitry

Re: [PATCH 0/2] usb: typec: ucsi: ccg: Adjustments for common code in two functions

[Andy Shevchenko]

On Thu, Sep 26, 2024 at 12:26:24AM +0300, Dmitry Baryshkov wrote:
> On Wed, Sep 25, 2024 at 07:31:04PM GMT, Markus Elfring wrote:
> > From: Markus Elfring <elfring@users.sourceforge.net>
> > Date: Wed, 25 Sep 2024 19:19:01 +0200
> > 
> > A few update suggestions were taken into account
> > from static source code analysis.
> > 
> > Markus Elfring (2):
> >   Use common code in ccg_write()
> >   Use common code in ccg_read()
> > 
> >  drivers/usb/typec/ucsi/ucsi_ccg.c | 15 ++++++++-------
> >  1 file changed, 8 insertions(+), 7 deletions(-)
> 
> For the series:
> 
> Acked-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>

I believe there is no-one to take it, but in any case the thing is that kfree()
probably can be done using __free(). Then PM runtime handled differently.

-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH 0/2] usb: typec: ucsi: ccg: Adjustments for common code in two functions

[Dmitry Baryshkov]

On Thu, 26 Sept 2024 at 14:12, Andy Shevchenko
<andriy.shevchenko@linux.intel.com> wrote:
>
> On Thu, Sep 26, 2024 at 12:26:24AM +0300, Dmitry Baryshkov wrote:
> > On Wed, Sep 25, 2024 at 07:31:04PM GMT, Markus Elfring wrote:
> > > From: Markus Elfring <elfring@users.sourceforge.net>
> > > Date: Wed, 25 Sep 2024 19:19:01 +0200
> > >
> > > A few update suggestions were taken into account
> > > from static source code analysis.
> > >
> > > Markus Elfring (2):
> > >   Use common code in ccg_write()
> > >   Use common code in ccg_read()
> > >
> > >  drivers/usb/typec/ucsi/ucsi_ccg.c | 15 ++++++++-------
> > >  1 file changed, 8 insertions(+), 7 deletions(-)
> >
> > For the series:
> >
> > Acked-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
>
> I believe there is no-one to take it,

I guessed so.

> but in any case the thing is that kfree()
> probably can be done using __free(). Then PM runtime handled differently.

That's a separate cleanup in my opinion.

-- 
With best wishes
Dmitry

Re: [PATCH 0/2] usb: typec: ucsi: ccg: Adjustments for common code in two functions

[Andy Shevchenko]

On Thu, Sep 26, 2024 at 02:20:19PM +0200, Dmitry Baryshkov wrote:
> On Thu, 26 Sept 2024 at 14:12, Andy Shevchenko
> <andriy.shevchenko@linux.intel.com> wrote:
> > On Thu, Sep 26, 2024 at 12:26:24AM +0300, Dmitry Baryshkov wrote:

...

> > but in any case the thing is that kfree()
> > probably can be done using __free(). Then PM runtime handled differently.
> 
> That's a separate cleanup in my opinion.

Yes and for that we do not need an intermediate change, right?

-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH 0/2] usb: typec: ucsi: ccg: Adjustments for common code in two functions

[Dmitry Baryshkov]

On Thu, 26 Sept 2024 at 14:27, Andy Shevchenko
<andriy.shevchenko@linux.intel.com> wrote:
>
> On Thu, Sep 26, 2024 at 02:20:19PM +0200, Dmitry Baryshkov wrote:
> > On Thu, 26 Sept 2024 at 14:12, Andy Shevchenko
> > <andriy.shevchenko@linux.intel.com> wrote:
> > > On Thu, Sep 26, 2024 at 12:26:24AM +0300, Dmitry Baryshkov wrote:
>
> ...
>
> > > but in any case the thing is that kfree()
> > > probably can be done using __free(). Then PM runtime handled differently.
> >
> > That's a separate cleanup in my opinion.
>
> Yes and for that we do not need an intermediate change, right?

I don't have a strong opinion here (and I don't feel a strong need to
move existing code into using cleanup.h just for the sake of it).

-- 
With best wishes
Dmitry

Re: [PATCH 1/2] usb: typec: ucsi: ccg: Use common code in ccg_write()

[Heikki Krogerus]

On Wed, Sep 25, 2024 at 07:32:32PM +0200, Markus Elfring wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Wed, 25 Sep 2024 19:00:23 +0200
> 
> Add a label so that three statements can be better reused at the end of
> this function implementation.
> 
> This issue was detected by using the Coccinelle software.
> 
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>

Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>

> ---
>  drivers/usb/typec/ucsi/ucsi_ccg.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/usb/typec/ucsi/ucsi_ccg.c b/drivers/usb/typec/ucsi/ucsi_ccg.c
> index b3ec799fc873..ed075a403d87 100644
> --- a/drivers/usb/typec/ucsi/ucsi_ccg.c
> +++ b/drivers/usb/typec/ucsi/ucsi_ccg.c
> @@ -306,14 +306,14 @@ static int ccg_write(struct ucsi_ccg *uc, u16 rab, const u8 *data, u32 len)
>  	status = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
>  	if (status < 0) {
>  		dev_err(uc->dev, "i2c_transfer failed %d\n", status);
> -		pm_runtime_put_sync(uc->dev);
> -		kfree(buf);
> -		return status;
> +		goto put_sync;
>  	}
> 
> +	status = 0;
> +put_sync:
>  	pm_runtime_put_sync(uc->dev);
>  	kfree(buf);
> -	return 0;
> +	return status;
>  }
> 
>  static int ccg_op_region_update(struct ucsi_ccg *uc, u32 cci)
> --
> 2.46.1

-- 
heikki

Re: [PATCH 2/2] usb: typec: ucsi: ccg: Use common code in ccg_read()

[Heikki Krogerus]

On Wed, Sep 25, 2024 at 07:33:47PM +0200, Markus Elfring wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Wed, 25 Sep 2024 19:08:07 +0200
> 
> Add a label so that two statements can be better reused at the end of
> this function implementation.
> 
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>

Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>

> ---
>  drivers/usb/typec/ucsi/ucsi_ccg.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/usb/typec/ucsi/ucsi_ccg.c b/drivers/usb/typec/ucsi/ucsi_ccg.c
> index ed075a403d87..e3850c42583e 100644
> --- a/drivers/usb/typec/ucsi/ucsi_ccg.c
> +++ b/drivers/usb/typec/ucsi/ucsi_ccg.c
> @@ -269,15 +269,16 @@ static int ccg_read(struct ucsi_ccg *uc, u16 rab, u8 *data, u32 len)
>  		status = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
>  		if (status < 0) {
>  			dev_err(uc->dev, "i2c_transfer failed %d\n", status);
> -			pm_runtime_put_sync(uc->dev);
> -			return status;
> +			goto put_sync;
>  		}
>  		rab += rlen;
>  		rem_len -= rlen;
>  	}
> 
> +	status = 0;
> +put_sync:
>  	pm_runtime_put_sync(uc->dev);
> -	return 0;
> +	return status;
>  }
> 
>  static int ccg_write(struct ucsi_ccg *uc, u16 rab, const u8 *data, u32 len)
> --
> 2.46.1

-- 
heikki