From: Dmitry Torokhov <dtor_core@ameritech.net>
Date: Tue, 3 Jan 2006 22:57:35 +0000 (+0000)
Subject: [MMC] wbsd: convert to the new platfrom device interface
X-Git-Tag: v2.6.16-rc1~931^2~3
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=21500bb32acd4c34b50e5d985712e29792c1b9ad;p=linux-2.6-omap-h63xx.git

[MMC] wbsd: convert to the new platfrom device interface

platform_device_register_simple() is going away, switch to
using platfrom_device_alloc() + platform_device_add(). Also
make sure that wbsd_driver gets unregistered when wbsd_init
fails.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Acked-by: Pierre Ossman <drzeus@drzeus.cx>
---

diff --git a/drivers/mmc/wbsd.c b/drivers/mmc/wbsd.c
index 9df0ddeb3ff..4f13bd2ccf9 100644
--- a/drivers/mmc/wbsd.c
+++ b/drivers/mmc/wbsd.c
@@ -2087,10 +2087,20 @@ static int __init wbsd_drv_init(void)
 		if (result < 0)
 			return result;
 
-		wbsd_device = platform_device_register_simple(DRIVER_NAME, -1,
-			NULL, 0);
-		if (IS_ERR(wbsd_device))
-			return PTR_ERR(wbsd_device);
+		wbsd_device = platform_device_alloc(DRIVER_NAME, -1);
+		if (!wbsd_device)
+		{
+			platform_driver_unregister(&wbsd_driver);
+			return -ENOMEM;
+		}
+
+		result = platform_device_add(wbsd_device);
+		if (result)
+		{
+			platform_device_put(wbsd_device);
+			platform_driver_unregister(&wbsd_driver);
+			return result;
+		}
 	}
 
 	return 0;