lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] pnp: mpu401: adjust pnp_register_driver signature

Browse Source 
This series of patches removes the assumption that pnp_register_driver()
returns the number of devices claimed.  Returning the count is unreliable
because devices may be hot-plugged in the future.  (Many devices don't support
hot-plug, of course, but PNP in general does.)

This changes the convention to "zero for success, or a negative error value,"
which matches pci_register_driver(), acpi_bus_register_driver(), and
platform_driver_register().

If drivers need to know the number of devices, they can count calls to their
.probe() methods.

This patch:

Remove the assumption that pnp_register_driver() returns the number of devices
claimed.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Adam Belay <ambx1@neo.rr.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Bjorn Helgaas
2006-03-27 01:17:04 -08:00
committed by Linus Torvalds
parent 7597fee389
commit f301ae6a69
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sound/drivers/mpu401/mpu401.c
View File

@@ -59,7 +59,8 @@ module_param_array(irq, int, NULL, 0444);
MODULE_PARM_DESC(irq, "IRQ # for MPU-401 device."); MODULE_PARM_DESC(irq, "IRQ # for MPU-401 device.");
static struct platform_device *platform_devices[SNDRV_CARDS]; static struct platform_device *platform_devices[SNDRV_CARDS];
static int pnp_registered = 0; static int pnp_registered;
static unsigned int snd_mpu401_devices;
static int snd_mpu401_create(int dev, struct snd_card **rcard) static int snd_mpu401_create(int dev, struct snd_card **rcard)
{ {
@@ -197,6 +198,7 @@ static int __devinit snd_mpu401_pnp_probe(struct pnp_dev *pnp_dev,
} }
snd_card_set_dev(card, &pnp_dev->dev); snd_card_set_dev(card, &pnp_dev->dev);
pnp_set_drvdata(pnp_dev, card); pnp_set_drvdata(pnp_dev, card);
snd_mpu401_devices++;
++dev; ++dev;
return 0; return 0;
} }
@@ -234,12 +236,11 @@ static void __init_or_module snd_mpu401_unregister_all(void)
static int __init alsa_card_mpu401_init(void) static int __init alsa_card_mpu401_init(void)
{ {
int i, err, devices; int i, err;
if ((err = platform_driver_register(&snd_mpu401_driver)) < 0) if ((err = platform_driver_register(&snd_mpu401_driver)) < 0)
return err; return err;
devices = 0;
for (i = 0; i < SNDRV_CARDS; i++) { for (i = 0; i < SNDRV_CARDS; i++) {
struct platform_device *device; struct platform_device *device;
if (! enable[i]) if (! enable[i])
@@ -255,14 +256,13 @@ static int __init alsa_card_mpu401_init(void)
goto errout; goto errout;
} }
platform_devices[i] = device; platform_devices[i] = device;
devices++; snd_mpu401_devices++;
} }
if ((err = pnp_register_driver(&snd_mpu401_pnp_driver)) >= 0) { err = pnp_register_driver(&snd_mpu401_pnp_driver);
if (!err)
pnp_registered = 1; pnp_registered = 1;
devices += err;
}
if (!devices) { if (!snd_mpu401_devices) {
#ifdef MODULE #ifdef MODULE
printk(KERN_ERR "MPU-401 device not found or device busy\n"); printk(KERN_ERR "MPU-401 device not found or device busy\n");
#endif #endif