From: Rene Herman <rene.herman@keyaccess.nl>
To: Takashi Iwai <tiwai@suse.de>
Cc: ALSA devel <alsa-devel@alsa-project.org>,
Linux Kernel <linux-kernel@vger.kernel.org>
Subject: [ALSA 2/2] a few more -- unregister platform device again if probe was unsuccessful
Date: Thu, 13 Apr 2006 03:43:30 +0200 [thread overview]
Message-ID: <443DACC2.5050802@keyaccess.nl> (raw)
[-- Attachment #1: Type: text/plain, Size: 592 bytes --]
Hi Takashi.
This second one unregisters the platform device again when the probe is
unsuccesful for sound/drivers, sound/arm/sa11xx-uda1341.c and
sound/ppc/powermac.c. This gets them all.
sound/arm/sa11xx-uda1341.c | 14 +++++++++-----
sound/drivers/dummy.c | 4 ++++
sound/drivers/mpu401/mpu401.c | 4 ++++
sound/drivers/mtpav.c | 14 +++++++++-----
sound/drivers/serial-u16550.c | 4 ++++
sound/drivers/virmidi.c | 4 ++++
sound/ppc/powermac.c | 14 +++++++++-----
Signed-off-by: Rene Herman <rene.herman@keyaccess.nl>
[-- Attachment #2: alsa_platform_unregister_remainder.diff --]
[-- Type: text/plain, Size: 4530 bytes --]
Index: mm/sound/arm/sa11xx-uda1341.c
===================================================================
--- mm.orig/sound/arm/sa11xx-uda1341.c 2006-03-20 06:53:29.000000000 +0100
+++ mm/sound/arm/sa11xx-uda1341.c 2006-04-13 02:04:30.000000000 +0200
@@ -984,11 +984,15 @@ static int __init sa11xx_uda1341_init(vo
if ((err = platform_driver_register(&sa11xx_uda1341_driver)) < 0)
return err;
device = platform_device_register_simple(SA11XX_UDA1341_DRIVER, -1, NULL, 0);
- if (IS_ERR(device)) {
- platform_driver_unregister(&sa11xx_uda1341_driver);
- return PTR_ERR(device);
- }
- return 0;
+ if (!IS_ERR(device)) {
+ if (platform_get_drvdata(device))
+ return 0;
+ platform_device_unregister(device);
+ err = -ENODEV
+ } else
+ err = PTR_ERR(device);
+ platform_driver_unregister(&sa11xx_uda1341_driver);
+ return err;
}
static void __exit sa11xx_uda1341_exit(void)
Index: mm/sound/drivers/dummy.c
===================================================================
--- mm.orig/sound/drivers/dummy.c 2006-04-13 01:45:57.000000000 +0200
+++ mm/sound/drivers/dummy.c 2006-04-13 02:05:33.000000000 +0200
@@ -677,6 +677,10 @@ static int __init alsa_card_dummy_init(v
i, NULL, 0);
if (IS_ERR(device))
continue;
+ if (!platform_get_drvdata(device)) {
+ platform_device_unregister(device);
+ continue;
+ }
devices[i] = device;
cards++;
}
Index: mm/sound/drivers/mpu401/mpu401.c
===================================================================
--- mm.orig/sound/drivers/mpu401/mpu401.c 2006-04-13 01:45:57.000000000 +0200
+++ mm/sound/drivers/mpu401/mpu401.c 2006-04-13 02:06:23.000000000 +0200
@@ -254,6 +254,10 @@ static int __init alsa_card_mpu401_init(
i, NULL, 0);
if (IS_ERR(device))
continue;
+ if (!platform_get_drvdata(device)) {
+ platform_device_unregister(device);
+ continue;
+ }
platform_devices[i] = device;
snd_mpu401_devices++;
}
Index: mm/sound/drivers/mtpav.c
===================================================================
--- mm.orig/sound/drivers/mtpav.c 2006-04-13 01:45:57.000000000 +0200
+++ mm/sound/drivers/mtpav.c 2006-04-13 02:08:27.000000000 +0200
@@ -770,11 +770,15 @@ static int __init alsa_card_mtpav_init(v
return err;
device = platform_device_register_simple(SND_MTPAV_DRIVER, -1, NULL, 0);
- if (IS_ERR(device)) {
- platform_driver_unregister(&snd_mtpav_driver);
- return PTR_ERR(device);
- }
- return 0;
+ if (!IS_ERR(device)) {
+ if (platform_get_drvdata(device))
+ return 0;
+ platform_device_unregister(device);
+ err = -ENODEV;
+ } else
+ err = PTR_ERR(device);
+ platform_driver_unregister(&snd_mtpav_driver);
+ return err;
}
static void __exit alsa_card_mtpav_exit(void)
Index: mm/sound/drivers/serial-u16550.c
===================================================================
--- mm.orig/sound/drivers/serial-u16550.c 2006-04-13 01:45:57.000000000 +0200
+++ mm/sound/drivers/serial-u16550.c 2006-04-13 02:09:07.000000000 +0200
@@ -998,6 +998,10 @@ static int __init alsa_card_serial_init(
i, NULL, 0);
if (IS_ERR(device))
continue;
+ if (!platform_get_drvdata(device)) {
+ platform_device_unregister(device);
+ continue;
+ }
devices[i] = device;
cards++;
}
Index: mm/sound/drivers/virmidi.c
===================================================================
--- mm.orig/sound/drivers/virmidi.c 2006-04-13 01:45:57.000000000 +0200
+++ mm/sound/drivers/virmidi.c 2006-04-13 02:09:53.000000000 +0200
@@ -171,6 +171,10 @@ static int __init alsa_card_virmidi_init
i, NULL, 0);
if (IS_ERR(device))
continue;
+ if (!platform_get_drvdata(device)) {
+ platform_device_unregister(device);
+ continue;
+ }
devices[i] = device;
cards++;
}
Index: mm/sound/ppc/powermac.c
===================================================================
--- mm.orig/sound/ppc/powermac.c 2006-03-20 06:53:29.000000000 +0100
+++ mm/sound/ppc/powermac.c 2006-04-13 02:11:27.000000000 +0200
@@ -188,11 +188,15 @@ static int __init alsa_card_pmac_init(vo
if ((err = platform_driver_register(&snd_pmac_driver)) < 0)
return err;
device = platform_device_register_simple(SND_PMAC_DRIVER, -1, NULL, 0);
- if (IS_ERR(device)) {
- platform_driver_unregister(&snd_pmac_driver);
- return PTR_ERR(device);
- }
- return 0;
+ if (!IS_ERR(device)) {
+ if (platform_get_drvdata(device))
+ return 0;
+ platform_device_unregister(device);
+ err = -ENODEV;
+ } else
+ err = PTR_ERR(device);
+ platform_driver_unregister(&snd_pmac_driver);
+ return err;
}
next reply other threads:[~2006-04-13 1:41 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-04-13 1:43 Rene Herman [this message]
-- strict thread matches above, loose matches on Subject: below --
2006-04-13 1:43 [ALSA 2/2] a few more -- unregister platform device again if probe was unsuccessful Rene Herman
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=443DACC2.5050802@keyaccess.nl \
--to=rene.herman@keyaccess.nl \
--cc=alsa-devel@alsa-project.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tiwai@suse.de \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.