Merge branch 'akpm' (incoming from Andrew)

Merge second batch of fixes from Andrew Morton:

 - various misc bits

 - some printk updates

 - a new "SRAM" driver.

 - MAINTAINERS updates

 - the backlight driver queue

 - checkpatch updates

 - a few init/ changes

 - a huge number of drivers/rtc changes

 - fatfs updates

 - some lib/idr.c work

 - some renaming of the random driver interfaces

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (285 commits)
  net: rename random32 to prandom
  net/core: remove duplicate statements by do-while loop
  net/core: rename random32() to prandom_u32()
  net/netfilter: rename random32() to prandom_u32()
  net/sched: rename random32() to prandom_u32()
  net/sunrpc: rename random32() to prandom_u32()
  scsi: rename random32() to prandom_u32()
  lguest: rename random32() to prandom_u32()
  uwb: rename random32() to prandom_u32()
  video/uvesafb: rename random32() to prandom_u32()
  mmc: rename random32() to prandom_u32()
  drbd: rename random32() to prandom_u32()
  kernel/: rename random32() to prandom_u32()
  mm/: rename random32() to prandom_u32()
  lib/: rename random32() to prandom_u32()
  x86: rename random32() to prandom_u32()
  x86: pageattr-test: remove srandom32 call
  uuid: use prandom_bytes()
  raid6test: use prandom_bytes()
  sctp: convert sctp_assoc_set_id() to use idr_alloc_cyclic()
  ...

1 files changed, 4 insertions, 6 deletions

diff --git a/drivers/rtc/rtc-test.c b/drivers/rtc/rtc-test.c
index b92e0f6383e6..7746e65b93f2 100644
--- a/drivers/rtc/rtc-test.c
+++ b/drivers/rtc/rtc-test.c
@@ -99,8 +99,10 @@ static DEVICE_ATTR(irq, S_IRUGO | S_IWUSR, test_irq_show, test_irq_store);
 static int test_probe(struct platform_device *plat_dev)
 {
         int err;
-        struct rtc_device *rtc = rtc_device_register("test", &plat_dev->dev,
-                                                &test_rtc_ops, THIS_MODULE);
+        struct rtc_device *rtc;
+
+        rtc = devm_rtc_device_register(&plat_dev->dev, "test",
+                                &test_rtc_ops, THIS_MODULE);
         if (IS_ERR(rtc)) {
                 err = PTR_ERR(rtc);
                 return err;
@@ -115,15 +117,11 @@ static int test_probe(struct platform_device *plat_dev)
         return 0;
 
 err:
-        rtc_device_unregister(rtc);
         return err;
 }
 
 static int test_remove(struct platform_device *plat_dev)
 {
-        struct rtc_device *rtc = platform_get_drvdata(plat_dev);
-
-        rtc_device_unregister(rtc);
         device_remove_file(&plat_dev->dev, &dev_attr_irq);
 
         return 0;