Merge branch 'akpm' (updates from Andrew Morton)

Merge first patch-bomb from Andrew Morton:
 - various misc bits
 - I'm been patchmonkeying ocfs2 for a while, as Joel and Mark have been
   distracted.  There has been quite a bit of activity.
 - About half the MM queue
 - Some backlight bits
 - Various lib/ updates
 - checkpatch updates
 - zillions more little rtc patches
 - ptrace
 - signals
 - exec
 - procfs
 - rapidio
 - nbd
 - aoe
 - pps
 - memstick
 - tools/testing/selftests updates

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (445 commits)
  tools/testing/selftests: don't assume the x bit is set on scripts
  selftests: add .gitignore for kcmp
  selftests: fix clean target in kcmp Makefile
  selftests: add .gitignore for vm
  selftests: add hugetlbfstest
  self-test: fix make clean
  selftests: exit 1 on failure
  kernel/resource.c: remove the unneeded assignment in function __find_resource
  aio: fix wrong comment in aio_complete()
  drivers/w1/slaves/w1_ds2408.c: add magic sequence to disable P0 test mode
  drivers/memstick/host/r592.c: convert to module_pci_driver
  drivers/memstick/host/jmb38x_ms: convert to module_pci_driver
  pps-gpio: add device-tree binding and support
  drivers/pps/clients/pps-gpio.c: convert to module_platform_driver
  drivers/pps/clients/pps-gpio.c: convert to devm_* helpers
  drivers/parport/share.c: use kzalloc
  Documentation/accounting/getdelays.c: avoid strncpy in accounting tool
  aoe: update internal version number to v83
  aoe: update copyright date
  aoe: perform I/O completions in parallel
  ...

1 files changed, 5 insertions, 14 deletions

diff --git a/drivers/rtc/rtc-at91sam9.c b/drivers/rtc/rtc-at91sam9.c
index b60a34cb145a..309b8b342d9c 100644
--- a/drivers/rtc/rtc-at91sam9.c
+++ b/drivers/rtc/rtc-at91sam9.c
@@ -324,16 +324,14 @@ static int at91_rtc_probe(struct platform_device *pdev)
         rtc->rtt = devm_ioremap(&pdev->dev, r->start, resource_size(r));
         if (!rtc->rtt) {
                 dev_err(&pdev->dev, "failed to map registers, aborting.\n");
-                ret = -ENOMEM;
-                goto fail;
+                return -ENOMEM;
         }
 
         rtc->gpbr = devm_ioremap(&pdev->dev, r_gpbr->start,
                                 resource_size(r_gpbr));
         if (!rtc->gpbr) {
                 dev_err(&pdev->dev, "failed to map gpbr registers, aborting.\n");
-                ret = -ENOMEM;
-                goto fail;
+                return -ENOMEM;
         }
 
         mr = rtt_readl(rtc, MR);
@@ -350,17 +348,15 @@ static int at91_rtc_probe(struct platform_device *pdev)
 
         rtc->rtcdev = devm_rtc_device_register(&pdev->dev, pdev->name,
                                         &at91_rtc_ops, THIS_MODULE);
-        if (IS_ERR(rtc->rtcdev)) {
-                ret = PTR_ERR(rtc->rtcdev);
-                goto fail;
-        }
+        if (IS_ERR(rtc->rtcdev))
+                return PTR_ERR(rtc->rtcdev);
 
         /* register irq handler after we know what name we'll use */
         ret = devm_request_irq(&pdev->dev, rtc->irq, at91_rtc_interrupt,
                                 IRQF_SHARED, dev_name(&rtc->rtcdev->dev), rtc);
         if (ret) {
                 dev_dbg(&pdev->dev, "can't share IRQ %d?\n", rtc->irq);
-                goto fail;
+                return ret;
         }
 
         /* NOTE:  sam9260 rev A silicon has a ROM bug which resets the
@@ -374,10 +370,6 @@ static int at91_rtc_probe(struct platform_device *pdev)
                                 dev_name(&rtc->rtcdev->dev));
 
         return 0;
-
-fail:
-        platform_set_drvdata(pdev, NULL);
-        return ret;
 }
 
 /*
@@ -391,7 +383,6 @@ static int at91_rtc_remove(struct platform_device *pdev)
         /* disable all interrupts */
         rtt_writel(rtc, MR, mr & ~(AT91_RTT_ALMIEN | AT91_RTT_RTTINCIEN));
 
-        platform_set_drvdata(pdev, NULL);
         return 0;
 }