From: Dmitry Torokhov <dtor_core@ameritech.net>
To: Andrew Morton <akpm@osdl.org>
Cc: LKML <linux-kernel@vger.kernel.org>, Russell King <rmk@arm.linux.org.uk>
Subject: [patch 3/6] mv64x600_wdt: convert to the new platform device interface
Date: Wed, 11 Jan 2006 01:47:49 -0500 [thread overview]
Message-ID: <20060111065751.899771000.dtor_core@ameritech.net> (raw)
In-Reply-To: 20060111064746.560312000.dtor_core@ameritech.net
[-- Attachment #1: mv64x60_wdt-new-platform-intf.patch --]
[-- Type: text/plain, Size: 1206 bytes --]
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>
---
drivers/char/watchdog/mv64x60_wdt.c | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
Index: work/drivers/char/watchdog/mv64x60_wdt.c
===================================================================
--- work.orig/drivers/char/watchdog/mv64x60_wdt.c
+++ work/drivers/char/watchdog/mv64x60_wdt.c
@@ -228,15 +228,25 @@ static int __init mv64x60_wdt_init(void)
printk(KERN_INFO "MV64x60 watchdog driver\n");
- mv64x60_wdt_dev = platform_device_register_simple(MV64x60_WDT_NAME,
- -1, NULL, 0);
- if (IS_ERR(mv64x60_wdt_dev)) {
- ret = PTR_ERR(mv64x60_wdt_dev);
+ mv64x60_wdt_dev = platform_device_alloc(MV64x60_WDT_NAME, -1);
+ if (!mv64x60_wdt_dev) {
+ ret = -ENOMEM;
+ goto out;
+ }
+
+ ret = platform_device_add(mv64x60_wdt_dev);
+ if (ret) {
+ platform_device_put(mv64x60_wdt_dev);
goto out;
}
ret = platform_driver_register(&mv64x60_wdt_driver);
- out:
+ if (ret) {
+ platform_device_unregister(mv64x60_wdt_dev);
+ goto out;
+ }
+
+ out:
return ret;
}
next prev parent reply other threads:[~2006-01-11 6:59 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-01-11 6:47 [patch 0/6] Assorted conversions to the new platform device interface Dmitry Torokhov
2006-01-11 6:47 ` [patch 1/6] hdaps: convert " Dmitry Torokhov
2006-01-11 6:47 ` [patch 2/6] vr41xx: " Dmitry Torokhov
2006-01-11 6:47 ` Dmitry Torokhov [this message]
2006-01-11 6:47 ` [patch 4/6] tb0219: " Dmitry Torokhov
2006-01-11 6:47 ` [patch 5/6] dcdbas: " Dmitry Torokhov
2006-01-11 6:47 ` [patch 6/6] serial8250: " Dmitry Torokhov
2006-01-16 22:27 ` Kumar Gala
2006-01-16 23:31 ` Russell King
2006-01-16 23:54 ` Kumar Gala
2006-01-17 2:35 ` Tony Lindgren
2006-01-17 19:36 ` Olaf Hering
2006-01-18 9:56 ` Russell King
2006-01-18 10:10 ` Olaf Hering
2006-01-18 11:03 ` Olaf Hering
2006-01-17 21:41 ` Grant Likely
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060111065751.899771000.dtor_core@ameritech.net \
--to=dtor_core@ameritech.net \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rmk@arm.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).