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

Commit ebdb71ea authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Linus Torvalds
Browse files

[PATCH] PNP: adjust pnp_register_card_driver() signature: interwave 



Remove the assumption that pnp_register_card_driver() returns the
number of devices claimed.  And fix some __init/__devinit issues.

Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Adam Belay <ambx1@neo.rr.com>
Cc: Jaroslav Kysela <perex@suse.cz>
Acked-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6a3a3a02

sound/isa/gus/interwave.c

+7 −5
Original line number Diff line number Diff line
@@ -791,7 +791,7 @@ static int __devinit snd_interwave_probe(struct snd_card *card, int dev) 
	return 0;

}



static int __init snd_interwave_nonpnp_probe1(int dev, struct platform_device *devptr)

static int __devinit snd_interwave_nonpnp_probe1(int dev, struct platform_device *devptr)

{

	struct snd_card *card;

	int err;
@@ -809,7 +809,7 @@ static int __init snd_interwave_nonpnp_probe1(int dev, struct platform_device *d 
	return 0;

}



static int __init snd_interwave_nonpnp_probe(struct platform_device *pdev)

static int __devinit snd_interwave_nonpnp_probe(struct platform_device *pdev)

{

	int dev = pdev->id;

	int err;
@@ -867,6 +867,7 @@ static struct platform_driver snd_interwave_driver = { 
};



#ifdef CONFIG_PNP

static unsigned int __devinitdata interwave_pnp_devices;



static int __devinit snd_interwave_pnp_detect(struct pnp_card_link *pcard,

					      const struct pnp_card_device_id *pid)
@@ -897,6 +898,7 @@ static int __devinit snd_interwave_pnp_detect(struct pnp_card_link *pcard, 
	}

	pnp_set_card_drvdata(pcard, card);

	dev++;

	interwave_pnp_devices++;

	return 0;

}
@@ -954,10 +956,10 @@ static int __init alsa_card_interwave_init(void) 
	}



	/* ISA PnP cards */

	i = pnp_register_card_driver(&interwave_pnpc_driver);

	if (i >= 0) {

	err = pnp_register_card_driver(&interwave_pnpc_driver);

	if (!err) {

		pnp_registered = 1;

		cards += i;

		cards += interwave_pnp_devices;;

	}



	if (!cards) {