From: SF Markus Elfring <elfring@users.sourceforge.net>
To: linux-omap@vger.kernel.org, Lee Jones <lee.jones@linaro.org>,
Tony Lindgren <tony@atomide.com>
Cc: LKML <linux-kernel@vger.kernel.org>, kernel-janitors@vger.kernel.org
Subject: [PATCH 3/3] mfd/omap-usb-tll: Return an error code only as a constant in usbtll_omap_probe()
Date: Mon, 15 Jan 2018 14:17:26 +0100 [thread overview]
Message-ID: <367e77d8-3a65-2c12-5e79-75a626b65f41@users.sourceforge.net> (raw)
In-Reply-To: <c048a681-70e4-ecdd-e0f8-48c8f1bb0ac4@users.sourceforge.net>
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Mon, 15 Jan 2018 14:00:45 +0100
* Return an error code without storing it in an intermediate variable.
* Delete the label "err_clk_alloc" and local variable "ret"
which became unnecessary with this refactoring.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/mfd/omap-usb-tll.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/drivers/mfd/omap-usb-tll.c b/drivers/mfd/omap-usb-tll.c
index c8b4ad40910a..6c0be886fd87 100644
--- a/drivers/mfd/omap-usb-tll.c
+++ b/drivers/mfd/omap-usb-tll.c
@@ -216,7 +216,6 @@ static int usbtll_omap_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev;
struct resource *res;
struct usbtll_omap *tll;
- int ret = 0;
int i, ver;
dev_dbg(dev, "starting TI HSUSB TLL Controller\n");
@@ -254,8 +253,9 @@ static int usbtll_omap_probe(struct platform_device *pdev)
tll->ch_clk = devm_kzalloc(dev, sizeof(struct clk *) * tll->nch,
GFP_KERNEL);
if (!tll->ch_clk) {
- ret = -ENOMEM;
- goto err_clk_alloc;
+ pm_runtime_put_sync(dev);
+ pm_runtime_disable(dev);
+ return -ENOMEM;
}
for (i = 0; i < tll->nch; i++) {
@@ -278,12 +278,6 @@ static int usbtll_omap_probe(struct platform_device *pdev)
spin_unlock(&tll_lock);
return 0;
-
-err_clk_alloc:
- pm_runtime_put_sync(dev);
- pm_runtime_disable(dev);
-
- return ret;
}
/**
--
2.15.1
next prev parent reply other threads:[~2018-01-15 13:17 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-15 13:14 [PATCH 0/3] mfd/omap-usb-tll: Adjustments for usbtll_omap_probe() SF Markus Elfring
2018-01-15 13:15 ` [PATCH 1/3] mfd/omap-usb-tll: Delete two error messages for a failed memory allocation in usbtll_omap_probe() SF Markus Elfring
2018-01-15 13:41 ` Ladislav Michl
2018-01-15 15:34 ` Roger Quadros
2018-01-15 15:38 ` SF Markus Elfring
2018-01-15 16:05 ` Ladislav Michl
2018-01-15 16:21 ` [1/3] " SF Markus Elfring
2018-01-15 16:35 ` Ladislav Michl
2018-01-15 17:06 ` SF Markus Elfring
2018-01-15 17:41 ` Ladislav Michl
2018-01-15 18:12 ` SF Markus Elfring
2018-01-15 18:30 ` Ladislav Michl
2018-01-15 19:04 ` mfd/omap-usb-tll: Allocate driver data at once " SF Markus Elfring
2018-01-15 19:23 ` Ladislav Michl
2018-01-15 19:40 ` SF Markus Elfring
2018-01-15 19:26 ` SF Markus Elfring
2018-01-15 19:33 ` Ladislav Michl
2018-01-15 13:16 ` [PATCH 2/3] mfd/omap-usb-tll: Improve a size determination " SF Markus Elfring
2018-01-22 15:50 ` Lee Jones
2018-01-15 13:17 ` SF Markus Elfring [this message]
2018-01-22 15:50 ` [PATCH 3/3] mfd/omap-usb-tll: Return an error code only as a constant " Lee Jones
2018-01-23 13:04 ` Lee Jones
2018-01-23 14:43 ` [3/3] " SF Markus Elfring
2018-01-23 15:04 ` Lee Jones
2018-01-23 17:13 ` Ladislav Michl
2018-01-24 15:16 ` Lee Jones
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=367e77d8-3a65-2c12-5e79-75a626b65f41@users.sourceforge.net \
--to=elfring@users.sourceforge.net \
--cc=kernel-janitors@vger.kernel.org \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=tony@atomide.com \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).