From: Andy Shevchenko <andriy.shevchenko@linux.intel.com> To: Luis Oliveira <Luis.Oliveira@synopsys.com>, wsa@the-dreams.de, robh+dt@kernel.org, mark.rutland@arm.com, jarkko.nikula@linux.intel.com, mika.westerberg@linux.intel.com, linux-i2c@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ramiro.Oliveira@synopsys.com, Joao.Pinto@synopsys.com, CARLOS.PALMINHA@synopsys.com Subject: Re: [PATCH v5 7/7] i2c: designware: style changes in existing code Date: Wed, 28 Dec 2016 17:50:23 +0200 [thread overview] Message-ID: <1482940223.9552.167.camel@linux.intel.com> (raw) In-Reply-To: <4ff96e7320ebaef28c0ccb47c29bd9a2fe16027c.1482934380.git.lolivei@synopsys.com> On Wed, 2016-12-28 at 14:43 +0000, Luis Oliveira wrote: > Replaced all the return variables 'r' in the existing > code by 'ret' to make the code easier to read (and > more standard). I'm not sure it makes sense as a separate change. > > Signed-off-by: Luis Oliveira <lolivei@synopsys.com> > --- > Changes V4->V5: (Andy Shevchenko) > - Replaced all the old code using "r" as return to "ret". For > consistency > purposes. > > drivers/i2c/busses/i2c-designware-master.c | 30 ++++++++++++++---- > ----------- > drivers/i2c/busses/i2c-designware-platdrv.c | 16 +++++++-------- > 2 files changed, 23 insertions(+), 23 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-designware-master.c > b/drivers/i2c/busses/i2c-designware-master.c > index b55a7f4c5149..0d5aca6edb48 100644 > --- a/drivers/i2c/busses/i2c-designware-master.c > +++ b/drivers/i2c/busses/i2c-designware-master.c > @@ -644,18 +644,18 @@ EXPORT_SYMBOL_GPL(i2c_dw_read_comp_param); > int i2c_dw_probe(struct dw_i2c_dev *dev) > { > struct i2c_adapter *adap = &dev->adapter; > - int r; > + int ret; > u32 reg; > > init_completion(&dev->cmd_complete); > > - r = i2c_dw_init(dev); > - if (r) > - return r; > + ret = i2c_dw_init(dev); > + if (ret) > + return ret; > > - r = i2c_dw_acquire_lock(dev); > - if (r) > - return r; > + ret = i2c_dw_acquire_lock(dev); > + if (ret) > + return ret; > > /* > * Test if dynamic TAR update is enabled in this controller > by writing > @@ -681,13 +681,13 @@ int i2c_dw_probe(struct dw_i2c_dev *dev) > i2c_set_adapdata(adap, dev); > > i2c_dw_disable_int(dev); > - r = devm_request_irq(dev->dev, dev->irq, i2c_dw_isr, > + ret = devm_request_irq(dev->dev, dev->irq, i2c_dw_isr, > IRQF_SHARED | IRQF_COND_SUSPEND, > dev_name(dev->dev), dev); > - if (r) { > + if (ret) { > dev_err(dev->dev, "failure requesting irq %i: %d\n", > - dev->irq, r); > - return r; > + dev->irq, ret); > + return ret; > } > > /* > @@ -697,12 +697,12 @@ int i2c_dw_probe(struct dw_i2c_dev *dev) > * registered I2C slaves that do I2C transfers in their > probe. > */ > pm_runtime_get_noresume(dev->dev); > - r = i2c_add_numbered_adapter(adap); > - if (r) > - dev_err(dev->dev, "failure adding adapter: %d\n", r); > + ret = i2c_add_numbered_adapter(adap); > + if (ret) > + dev_err(dev->dev, "failure adding adapter: %d\n", > ret); > pm_runtime_put_noidle(dev->dev); > > - return r; > + return ret; > } > EXPORT_SYMBOL_GPL(i2c_dw_probe); > > diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c > b/drivers/i2c/busses/i2c-designware-platdrv.c > index ef75031f8a62..785f4380c9a9 100644 > --- a/drivers/i2c/busses/i2c-designware-platdrv.c > +++ b/drivers/i2c/busses/i2c-designware-platdrv.c > @@ -234,7 +234,7 @@ static int dw_i2c_plat_probe(struct > platform_device *pdev) > struct fwnode_handle *child; > u32 acpi_speed, ht = 0; > struct resource *mem; > - int irq, r; > + int irq, ret; > u32 reg; > > irq = platform_get_irq(pdev, 0); > @@ -293,9 +293,9 @@ static int dw_i2c_plat_probe(struct > platform_device *pdev) > return -EINVAL; > } > > - r = i2c_dw_eval_lock_support(dev); > - if (r) > - return r; > + ret = i2c_dw_eval_lock_support(dev); > + if (ret) > + return ret; > > if (ACPI_HANDLE(&pdev->dev) == NULL) { > device_for_each_child_node(&pdev->dev, child) { > @@ -336,14 +336,14 @@ static int dw_i2c_plat_probe(struct > platform_device *pdev) > } > > if (dev->mode == DW_IC_SLAVE) > - r = i2c_dw_probe_slave(dev); > + ret = i2c_dw_probe_slave(dev); > else > - r = i2c_dw_probe(dev); > + ret = i2c_dw_probe(dev); > > - if (r && !dev->pm_runtime_disabled) > + if (ret && !dev->pm_runtime_disabled) > pm_runtime_disable(&pdev->dev); > > - return r; > + return ret; > } > > static int dw_i2c_plat_remove(struct platform_device *pdev) -- Andy Shevchenko <andriy.shevchenko@linux.intel.com> Intel Finland Oy
WARNING: multiple messages have this Message-ID (diff)
From: Andy Shevchenko <andriy.shevchenko-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> To: Luis Oliveira <Luis.Oliveira-HKixBCOQz3hWk0Htik3J/w@public.gmane.org>, wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org, robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, mark.rutland-5wv7dgnIgG8@public.gmane.org, jarkko.nikula-VuQAYsv1563Yd54FQh9/CA@public.gmane.org, mika.westerberg-VuQAYsv1563Yd54FQh9/CA@public.gmane.org, linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Ramiro.Oliveira-HKixBCOQz3hWk0Htik3J/w@public.gmane.org, Joao.Pinto-HKixBCOQz3hWk0Htik3J/w@public.gmane.org, CARLOS.PALMINHA-HKixBCOQz3hWk0Htik3J/w@public.gmane.org Subject: Re: [PATCH v5 7/7] i2c: designware: style changes in existing code Date: Wed, 28 Dec 2016 17:50:23 +0200 [thread overview] Message-ID: <1482940223.9552.167.camel@linux.intel.com> (raw) In-Reply-To: <4ff96e7320ebaef28c0ccb47c29bd9a2fe16027c.1482934380.git.lolivei-HKixBCOQz3hWk0Htik3J/w@public.gmane.org> On Wed, 2016-12-28 at 14:43 +0000, Luis Oliveira wrote: > Replaced all the return variables 'r' in the existing > code by 'ret' to make the code easier to read (and > more standard). I'm not sure it makes sense as a separate change. > > Signed-off-by: Luis Oliveira <lolivei-HKixBCOQz3hWk0Htik3J/w@public.gmane.org> > --- > Changes V4->V5: (Andy Shevchenko) > - Replaced all the old code using "r" as return to "ret". For > consistency > purposes. > > drivers/i2c/busses/i2c-designware-master.c | 30 ++++++++++++++---- > ----------- > drivers/i2c/busses/i2c-designware-platdrv.c | 16 +++++++-------- > 2 files changed, 23 insertions(+), 23 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-designware-master.c > b/drivers/i2c/busses/i2c-designware-master.c > index b55a7f4c5149..0d5aca6edb48 100644 > --- a/drivers/i2c/busses/i2c-designware-master.c > +++ b/drivers/i2c/busses/i2c-designware-master.c > @@ -644,18 +644,18 @@ EXPORT_SYMBOL_GPL(i2c_dw_read_comp_param); > int i2c_dw_probe(struct dw_i2c_dev *dev) > { > struct i2c_adapter *adap = &dev->adapter; > - int r; > + int ret; > u32 reg; > > init_completion(&dev->cmd_complete); > > - r = i2c_dw_init(dev); > - if (r) > - return r; > + ret = i2c_dw_init(dev); > + if (ret) > + return ret; > > - r = i2c_dw_acquire_lock(dev); > - if (r) > - return r; > + ret = i2c_dw_acquire_lock(dev); > + if (ret) > + return ret; > > /* > * Test if dynamic TAR update is enabled in this controller > by writing > @@ -681,13 +681,13 @@ int i2c_dw_probe(struct dw_i2c_dev *dev) > i2c_set_adapdata(adap, dev); > > i2c_dw_disable_int(dev); > - r = devm_request_irq(dev->dev, dev->irq, i2c_dw_isr, > + ret = devm_request_irq(dev->dev, dev->irq, i2c_dw_isr, > IRQF_SHARED | IRQF_COND_SUSPEND, > dev_name(dev->dev), dev); > - if (r) { > + if (ret) { > dev_err(dev->dev, "failure requesting irq %i: %d\n", > - dev->irq, r); > - return r; > + dev->irq, ret); > + return ret; > } > > /* > @@ -697,12 +697,12 @@ int i2c_dw_probe(struct dw_i2c_dev *dev) > * registered I2C slaves that do I2C transfers in their > probe. > */ > pm_runtime_get_noresume(dev->dev); > - r = i2c_add_numbered_adapter(adap); > - if (r) > - dev_err(dev->dev, "failure adding adapter: %d\n", r); > + ret = i2c_add_numbered_adapter(adap); > + if (ret) > + dev_err(dev->dev, "failure adding adapter: %d\n", > ret); > pm_runtime_put_noidle(dev->dev); > > - return r; > + return ret; > } > EXPORT_SYMBOL_GPL(i2c_dw_probe); > > diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c > b/drivers/i2c/busses/i2c-designware-platdrv.c > index ef75031f8a62..785f4380c9a9 100644 > --- a/drivers/i2c/busses/i2c-designware-platdrv.c > +++ b/drivers/i2c/busses/i2c-designware-platdrv.c > @@ -234,7 +234,7 @@ static int dw_i2c_plat_probe(struct > platform_device *pdev) > struct fwnode_handle *child; > u32 acpi_speed, ht = 0; > struct resource *mem; > - int irq, r; > + int irq, ret; > u32 reg; > > irq = platform_get_irq(pdev, 0); > @@ -293,9 +293,9 @@ static int dw_i2c_plat_probe(struct > platform_device *pdev) > return -EINVAL; > } > > - r = i2c_dw_eval_lock_support(dev); > - if (r) > - return r; > + ret = i2c_dw_eval_lock_support(dev); > + if (ret) > + return ret; > > if (ACPI_HANDLE(&pdev->dev) == NULL) { > device_for_each_child_node(&pdev->dev, child) { > @@ -336,14 +336,14 @@ static int dw_i2c_plat_probe(struct > platform_device *pdev) > } > > if (dev->mode == DW_IC_SLAVE) > - r = i2c_dw_probe_slave(dev); > + ret = i2c_dw_probe_slave(dev); > else > - r = i2c_dw_probe(dev); > + ret = i2c_dw_probe(dev); > > - if (r && !dev->pm_runtime_disabled) > + if (ret && !dev->pm_runtime_disabled) > pm_runtime_disable(&pdev->dev); > > - return r; > + return ret; > } > > static int dw_i2c_plat_remove(struct platform_device *pdev) -- Andy Shevchenko <andriy.shevchenko-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> Intel Finland Oy -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2016-12-28 15:53 UTC|newest] Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-12-28 14:43 [PATCH v5 0/7] i2c: designware: add I2C SLAVE support Luis Oliveira 2016-12-28 14:43 ` [PATCH v5 1/7] i2c: designware: Cleaning and comment style fixes Luis Oliveira 2016-12-28 14:43 ` [PATCH v5 2/7] i2c: designware: refactoring of the i2c-designware Luis Oliveira 2016-12-28 15:12 ` Andy Shevchenko 2016-12-28 15:30 ` Luis Oliveira 2016-12-28 15:30 ` Luis Oliveira 2016-12-28 14:43 ` [PATCH v5 3/7] i2c: designware: MASTER mode as separated driver Luis Oliveira 2016-12-28 14:43 ` [PATCH v5 4/7] i2c: designware: introducing I2C_SLAVE definitions Luis Oliveira 2016-12-28 15:17 ` Andy Shevchenko 2016-12-28 14:43 ` [PATCH v5 5/7] i2c: designware: add SLAVE mode functions Luis Oliveira 2016-12-28 15:36 ` Andy Shevchenko 2016-12-28 16:00 ` Luis Oliveira 2016-12-28 16:00 ` Luis Oliveira 2016-12-31 23:45 ` kbuild test robot 2016-12-31 23:45 ` kbuild test robot 2016-12-28 14:43 ` [PATCH v5 6/7] i2c: designware: enable SLAVE in platform module Luis Oliveira 2016-12-28 15:44 ` Andy Shevchenko 2016-12-28 15:53 ` Luis Oliveira 2016-12-28 15:53 ` Luis Oliveira 2016-12-28 16:31 ` Andy Shevchenko 2016-12-28 16:31 ` Andy Shevchenko 2016-12-28 16:41 ` Luis Oliveira 2016-12-28 16:41 ` Luis Oliveira 2016-12-28 16:49 ` Carlos Palminha 2016-12-28 16:49 ` Carlos Palminha 2016-12-28 17:10 ` Andy Shevchenko 2016-12-28 18:10 ` Luis Oliveira 2016-12-28 18:10 ` Luis Oliveira 2017-01-05 12:13 ` Luis Oliveira 2017-01-05 12:13 ` Luis Oliveira 2017-01-05 12:43 ` Andy Shevchenko 2016-12-28 14:43 ` [PATCH v5 7/7] i2c: designware: style changes in existing code Luis Oliveira 2016-12-28 15:50 ` Andy Shevchenko [this message] 2016-12-28 15:50 ` Andy Shevchenko
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1482940223.9552.167.camel@linux.intel.com \ --to=andriy.shevchenko@linux.intel.com \ --cc=CARLOS.PALMINHA@synopsys.com \ --cc=Joao.Pinto@synopsys.com \ --cc=Luis.Oliveira@synopsys.com \ --cc=Ramiro.Oliveira@synopsys.com \ --cc=devicetree@vger.kernel.org \ --cc=jarkko.nikula@linux.intel.com \ --cc=linux-i2c@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mark.rutland@arm.com \ --cc=mika.westerberg@linux.intel.com \ --cc=robh+dt@kernel.org \ --cc=wsa@the-dreams.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.