Subject: [merged] drivers-rtc-rtc-mxcc-remove-unneeded-label.patch removed from -mm tree
To: fabio.estevam@xxxxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Fri, 24 Jan 2014 11:02:30 -0800
The patch titled
Subject: drivers/rtc/rtc-mxc.c: remove unneeded label
has been removed from the -mm tree. Its filename was
drivers-rtc-rtc-mxcc-remove-unneeded-label.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Subject: drivers/rtc/rtc-mxc.c: remove unneeded label
There is no need to jump to the 'exit_free_pdata' label when
devm_clk_get() fails, as we can directly return the error and simplify the
code a bit.
Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/rtc/rtc-mxc.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff -puN drivers/rtc/rtc-mxc.c~drivers-rtc-rtc-mxcc-remove-unneeded-label drivers/rtc/rtc-mxc.c
--- a/drivers/rtc/rtc-mxc.c~drivers-rtc-rtc-mxcc-remove-unneeded-label
+++ a/drivers/rtc/rtc-mxc.c
@@ -391,8 +391,7 @@ static int mxc_rtc_probe(struct platform
pdata->clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(pdata->clk)) {
dev_err(&pdev->dev, "unable to get clock!\n");
- ret = PTR_ERR(pdata->clk);
- goto exit_free_pdata;
+ return PTR_ERR(pdata->clk);
}
clk_prepare_enable(pdata->clk);
@@ -447,8 +446,6 @@ static int mxc_rtc_probe(struct platform
exit_put_clk:
clk_disable_unprepare(pdata->clk);
-exit_free_pdata:
-
return ret;
}
_
Patches currently in -mm which might be from fabio.estevam@xxxxxxxxxxxxx are
origin.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
