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, 5 insertions, 13 deletions

diff --git a/drivers/rtc/rtc-max8998.c b/drivers/rtc/rtc-max8998.c
index 8f234a075e8f..48b6612fae7f 100644
--- a/drivers/rtc/rtc-max8998.c
+++ b/drivers/rtc/rtc-max8998.c
@@ -256,7 +256,8 @@ static int max8998_rtc_probe(struct platform_device *pdev)
         struct max8998_rtc_info *info;
         int ret;
 
-        info = kzalloc(sizeof(struct max8998_rtc_info), GFP_KERNEL);
+        info = devm_kzalloc(&pdev->dev, sizeof(struct max8998_rtc_info),
+                        GFP_KERNEL);
         if (!info)
                 return -ENOMEM;
 
@@ -267,7 +268,7 @@ static int max8998_rtc_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, info);
 
-        info->rtc_dev = rtc_device_register("max8998-rtc", &pdev->dev,
+        info->rtc_dev = devm_rtc_device_register(&pdev->dev, "max8998-rtc",
                         &max8998_rtc_ops, THIS_MODULE);
 
         if (IS_ERR(info->rtc_dev)) {
@@ -276,8 +277,8 @@ static int max8998_rtc_probe(struct platform_device *pdev)
                 goto out_rtc;
         }
 
-        ret = request_threaded_irq(info->irq, NULL, max8998_rtc_alarm_irq, 0,
-                        "rtc-alarm0", info);
+        ret = devm_request_threaded_irq(&pdev->dev, info->irq, NULL,
+                                max8998_rtc_alarm_irq, 0, "rtc-alarm0", info);
 
         if (ret < 0)
                 dev_err(&pdev->dev, "Failed to request alarm IRQ: %d: %d\n",
@@ -294,20 +295,11 @@ static int max8998_rtc_probe(struct platform_device *pdev)
 
 out_rtc:
         platform_set_drvdata(pdev, NULL);
-        kfree(info);
         return ret;
 }
 
 static int max8998_rtc_remove(struct platform_device *pdev)
 {
-        struct max8998_rtc_info *info = platform_get_drvdata(pdev);
-
-        if (info) {
-                free_irq(info->irq, info);
-                rtc_device_unregister(info->rtc_dev);
-                kfree(info);
-        }
-
         return 0;
 }