evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[PATCH] mv64x600_wdt: convert to the new platform device interface

Browse source 
mv64x600_wdt: convert to the new platform device interface Do not use
platform_device_register_simple() as it is going away.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Dmitry Torokhov 2006-03-22 00:07:54 -08:00 • committed by Linus Torvalds
parent d39b6cfe66
commit eee8ab75c6
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/char/watchdog/mv64x60_wdt.c
View file

@ -228,14 +228,24 @@ static int __init mv64x60_wdt_init(void)
printk(KERN_INFO "MV64x60 watchdog driver\n"); printk(KERN_INFO "MV64x60 watchdog driver\n");
mv64x60_wdt_dev = platform_device_register_simple(MV64x60_WDT_NAME, mv64x60_wdt_dev = platform_device_alloc(MV64x60_WDT_NAME, -1);
-1, NULL, 0); if (!mv64x60_wdt_dev) {
if (IS_ERR(mv64x60_wdt_dev)) { ret = -ENOMEM;
ret = PTR_ERR(mv64x60_wdt_dev); goto out;
}
ret = platform_device_add(mv64x60_wdt_dev);
if (ret) {
platform_device_put(mv64x60_wdt_dev);
goto out; goto out;
} }
ret = platform_driver_register(&mv64x60_wdt_driver); ret = platform_driver_register(&mv64x60_wdt_driver);
if (ret) {
platform_device_unregister(mv64x60_wdt_dev);
goto out;
}
out: out:
return ret; return ret;
} }