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

Commit 788c6043 authored by Prarit Bhargava's avatar Prarit Bhargava Committed by Jaroslav Kysela
Browse files

[ALSA] Fix __devinit and __devexit issues with sound drivers 



Fix __devinit and __devexit issues with sound drivers.
Resolves MODPOST warnings similar to:
WARNING: sound/drivers/snd-dummy.o - Section mismatch: reference to .init.text:snd_dummy_probe from .data.rel.local between 'snd_dummy_driver' (at offset 0x0) and 'snd_dummy_controls'
WARNING: sound/drivers/snd-mtpav.o - Section mismatch: reference to .init.text:snd_mtpav_probe from .data.rel.local between 'snd_mtpav_driver' (at offset 0x0) and 'snd_mtpav_input'
WARNING: sound/drivers/snd-virmidi.o - Section mismatch: reference to .init.text:snd_virmidi_probe from .data.rel.local after 'snd_virmidi_driver' (at offset 0x0)

Signed-off-by: default avatarPrarit Bhargava <prarit@redhat.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent 46f02ca3

sound/arm/pxa2xx-ac97.c

+3 −3
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ static int pxa2xx_ac97_resume(struct platform_device *dev) 
#define pxa2xx_ac97_resume	NULL

#endif



static int pxa2xx_ac97_probe(struct platform_device *dev)

static int __devinit pxa2xx_ac97_probe(struct platform_device *dev)

{

	struct snd_card *card;

	struct snd_ac97_bus *ac97_bus;
@@ -369,7 +369,7 @@ static int pxa2xx_ac97_probe(struct platform_device *dev) 
	return ret;

}



static int pxa2xx_ac97_remove(struct platform_device *dev)

static int __devexit pxa2xx_ac97_remove(struct platform_device *dev)

{

	struct snd_card *card = platform_get_drvdata(dev);
@@ -386,7 +386,7 @@ static int pxa2xx_ac97_remove(struct platform_device *dev) 


static struct platform_driver pxa2xx_ac97_driver = {

	.probe		= pxa2xx_ac97_probe,

	.remove		= pxa2xx_ac97_remove,

	.remove		= __devexit_p(pxa2xx_ac97_remove),

	.suspend	= pxa2xx_ac97_suspend,

	.resume		= pxa2xx_ac97_resume,

	.driver		= {

sound/drivers/dummy.c

+6 −5
Original line number Diff line number Diff line
@@ -423,7 +423,8 @@ static struct snd_pcm_ops snd_card_dummy_capture_ops = { 
	.pointer =		snd_card_dummy_pcm_pointer,

};



static int __init snd_card_dummy_pcm(struct snd_dummy *dummy, int device, int substreams)

static int __devinit snd_card_dummy_pcm(struct snd_dummy *dummy, int device,

					int substreams)

{

	struct snd_pcm *pcm;

	int err;
@@ -562,7 +563,7 @@ DUMMY_VOLUME("CD Volume", 0, MIXER_ADDR_CD), 
DUMMY_CAPSRC("CD Capture Switch", 0, MIXER_ADDR_CD)

};



static int __init snd_card_dummy_new_mixer(struct snd_dummy *dummy)

static int __devinit snd_card_dummy_new_mixer(struct snd_dummy *dummy)

{

	struct snd_card *card = dummy->card;

	unsigned int idx;
@@ -579,7 +580,7 @@ static int __init snd_card_dummy_new_mixer(struct snd_dummy *dummy) 
	return 0;

}



static int __init snd_dummy_probe(struct platform_device *devptr)

static int __devinit snd_dummy_probe(struct platform_device *devptr)

{

	struct snd_card *card;

	struct snd_dummy *dummy;
@@ -617,7 +618,7 @@ static int __init snd_dummy_probe(struct platform_device *devptr) 
	return err;

}



static int snd_dummy_remove(struct platform_device *devptr)

static int __devexit snd_dummy_remove(struct platform_device *devptr)

{

	snd_card_free(platform_get_drvdata(devptr));

	platform_set_drvdata(devptr, NULL);
@@ -648,7 +649,7 @@ static int snd_dummy_resume(struct platform_device *pdev) 


static struct platform_driver snd_dummy_driver = {

	.probe		= snd_dummy_probe,

	.remove		= snd_dummy_remove,

	.remove		= __devexit_p(snd_dummy_remove),

#ifdef CONFIG_PM

	.suspend	= snd_dummy_suspend,

	.resume		= snd_dummy_resume,

sound/drivers/mtpav.c

+6 −6
Original line number Diff line number Diff line
@@ -583,7 +583,7 @@ static irqreturn_t snd_mtpav_irqh(int irq, void *dev_id) 
/*

 * get ISA resources

 */

static int __init snd_mtpav_get_ISA(struct mtpav * mcard)

static int __devinit snd_mtpav_get_ISA(struct mtpav * mcard)

{

	if ((mcard->res_port = request_region(port, 3, "MotuMTPAV MIDI")) == NULL) {

		snd_printk("MTVAP port 0x%lx is busy\n", port);
@@ -619,7 +619,7 @@ static struct snd_rawmidi_ops snd_mtpav_input = { 
 * get RAWMIDI resources

 */



static void __init snd_mtpav_set_name(struct mtpav *chip,

static void __devinit snd_mtpav_set_name(struct mtpav *chip,

				      struct snd_rawmidi_substream *substream)

{

	if (substream->number >= 0 && substream->number < chip->num_ports)
@@ -634,7 +634,7 @@ static void __init snd_mtpav_set_name(struct mtpav *chip, 
		strcpy(substream->name, "MTP broadcast");

}



static int __init snd_mtpav_get_RAWMIDI(struct mtpav *mcard)

static int __devinit snd_mtpav_get_RAWMIDI(struct mtpav *mcard)

{

	int rval;

	struct snd_rawmidi *rawmidi;
@@ -691,7 +691,7 @@ static void snd_mtpav_free(struct snd_card *card) 


/*

 */

static int __init snd_mtpav_probe(struct platform_device *dev)

static int __devinit snd_mtpav_probe(struct platform_device *dev)

{

	struct snd_card *card;

	int err;
@@ -745,7 +745,7 @@ static int __init snd_mtpav_probe(struct platform_device *dev) 
	return err;

}



static int snd_mtpav_remove(struct platform_device *devptr)

static int __devexit snd_mtpav_remove(struct platform_device *devptr)

{

	snd_card_free(platform_get_drvdata(devptr));

	platform_set_drvdata(devptr, NULL);
@@ -756,7 +756,7 @@ static int snd_mtpav_remove(struct platform_device *devptr) 


static struct platform_driver snd_mtpav_driver = {

	.probe		= snd_mtpav_probe,

	.remove		= snd_mtpav_remove,

	.remove		= __devexit_p(snd_mtpav_remove),

	.driver		= {

		.name	= SND_MTPAV_DRIVER

	},

sound/drivers/mts64.c

+3 −3
Original line number Diff line number Diff line
@@ -1026,7 +1026,7 @@ __err: 
	return err;

}



static int snd_mts64_remove(struct platform_device *pdev)

static int __devexit snd_mts64_remove(struct platform_device *pdev)

{

	struct snd_card *card = platform_get_drvdata(pdev);
@@ -1039,7 +1039,7 @@ static int snd_mts64_remove(struct platform_device *pdev) 


static struct platform_driver snd_mts64_driver = {

	.probe  = snd_mts64_probe,

	.remove = snd_mts64_remove,

	.remove = __devexit_p(snd_mts64_remove),

	.driver = {

		.name = PLATFORM_DRIVER

	}
@@ -1048,7 +1048,7 @@ static struct platform_driver snd_mts64_driver = { 
/*********************************************************************

 * module init stuff

 *********************************************************************/

static void snd_mts64_unregister_all(void)

static void __init_or_module snd_mts64_unregister_all(void)

{

	int i;

sound/drivers/portman2x4.c

+3 −3
Original line number Diff line number Diff line
@@ -811,7 +811,7 @@ __err: 
	return err;

}



static int snd_portman_remove(struct platform_device *pdev)

static int __devexit snd_portman_remove(struct platform_device *pdev)

{

	struct snd_card *card = platform_get_drvdata(pdev);
@@ -824,7 +824,7 @@ static int snd_portman_remove(struct platform_device *pdev) 


static struct platform_driver snd_portman_driver = {

	.probe  = snd_portman_probe,

	.remove = snd_portman_remove,

	.remove = __dev_exit_p(snd_portman_remove),

	.driver = {

		.name = PLATFORM_DRIVER

	}
@@ -833,7 +833,7 @@ static struct platform_driver snd_portman_driver = { 
/*********************************************************************

 * module init stuff

 *********************************************************************/

static void snd_portman_unregister_all(void)

static void __init_or_module snd_portman_unregister_all(void)

{

	int i;