| Message ID | a4087943-ee25-4e05-80c4-02a77196848b@web.de (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | usb: typec: ucsi: ccg: Adjustments for common code in two functions | expand |
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
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)