]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drivers/rtc/rtc-s3c.c: remove unnecessary err_nores label
authorTushar Behera <tushar.behera@linaro.org>
Tue, 18 Dec 2012 00:02:45 +0000 (16:02 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Dec 2012 01:15:21 +0000 (17:15 -0800)
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>
drivers/rtc/rtc-s3c.c

index a7a2a998fa91fd2b626b2a241dbeef7ff212341e..d9da51193bc38ab5f994d3fdd4248f7b14b6340f 100644 (file)
@@ -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;
 }