summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTushar Behera <tushar.behera@linaro.org>2012-12-17 16:02:45 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-12-17 17:15:21 -0800
commit076c7265488cc4016c6502f3f9d8dbf1e97fd147 (patch)
tree4daa2ec2f31d3cb0ccea6cd47aae2393d19623cc
parentf803f0d079ded4272d7a1c9813bfd24c58b8ee5f (diff)
downloadlwn-076c7265488cc4016c6502f3f9d8dbf1e97fd147.tar.gz
lwn-076c7265488cc4016c6502f3f9d8dbf1e97fd147.zip
drivers/rtc/rtc-s3c.c: remove unnecessary err_nores label
err_nores label redirects to a simple return statement. Move the return statement to caller location and remove the label. Signed-off-by: Tushar Behera <tushar.behera@linaro.org> Cc: Alessandro Zummo <a.zummo@towertech.it> Cc: Grant Likely <grant.likely@secretlab.ca> Cc: Rob Herring <rob.herring@calxeda.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/rtc/rtc-s3c.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
index a7a2a998fa91..d9da51193bc3 100644
--- a/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
@@ -501,8 +501,7 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev)
if (s3c_rtc_mem == NULL) {
dev_err(&pdev->dev, "failed to reserve memory region\n");
- ret = -ENOENT;
- goto err_nores;
+ return -ENOENT;
}
s3c_rtc_base = ioremap(res->start, resource_size(res));
@@ -612,8 +611,6 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev)
err_nomap:
release_resource(s3c_rtc_mem);
-
- err_nores:
return ret;
}