From fd3f382552c53e288cb338abd9cccfe78a120c54 Mon Sep 17 00:00:00 2001 From: Stephen Boyd Date: Thu, 8 Mar 2012 11:41:14 -0800 Subject: [PATCH] --- yaml --- r: 289219 b: refs/heads/master c: 06caa4174ef7ec0f9c1e7c898a52e737c4897714 h: refs/heads/master i: 289217: 5cdbf13ee0ab5ac46c162d43bc7bbf6917faf706 289215: 82849b492f9c056e41e74ae5dbdd9517de3e6f4d v: v3 --- [refs] | 2 +- trunk/drivers/staging/android/ram_console.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 390f1aefd06b..944838b9aea4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3ee0206b5e359aed4dd4f31834bac1d6ac657b5f +refs/heads/master: 06caa4174ef7ec0f9c1e7c898a52e737c4897714 diff --git a/trunk/drivers/staging/android/ram_console.c b/trunk/drivers/staging/android/ram_console.c index b242be246cd8..2918bc19f294 100644 --- a/trunk/drivers/staging/android/ram_console.c +++ b/trunk/drivers/staging/android/ram_console.c @@ -50,7 +50,7 @@ void ram_console_enable_console(int enabled) ram_console.flags &= ~CON_ENABLED; } -static int ram_console_driver_probe(struct platform_device *pdev) +static int __init ram_console_probe(struct platform_device *pdev) { struct ram_console_platform_data *pdata = pdev->dev.platform_data; struct persistent_ram_zone *prz; @@ -75,7 +75,6 @@ static int ram_console_driver_probe(struct platform_device *pdev) } static struct platform_driver ram_console_driver = { - .probe = ram_console_driver_probe, .driver = { .name = "ram_console", }, @@ -83,9 +82,7 @@ static struct platform_driver ram_console_driver = { static int __init ram_console_module_init(void) { - int err; - err = platform_driver_register(&ram_console_driver); - return err; + return platform_driver_probe(&ram_console_driver, ram_console_probe); } static ssize_t ram_console_read_old(struct file *file, char __user *buf,