Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21500bb3 authored by Dmitry Torokhov's avatar Dmitry Torokhov Committed by Russell King
Browse files

[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: default avatarDmitry Torokhov <dtor@mail.ru>
Acked-by: default avatarPierre Ossman <drzeus@drzeus.cx>
parent 63648fb5

drivers/mmc/wbsd.c

+14 −4
Original line number Diff line number Diff line
@@ -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;