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

Commit f40b6890 authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files

[ALSA] Fix section mismatch errors in ALSA PCI drivers 



Fixed 'section mismatch' errors in ALSA PCI drivers:
- removed invalid __devinitdata from pci id tables
- fix/remove __devinit of functions called in suspend/resume

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent 562b590d

Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl

+2 −2
Original line number Diff line number Diff line
@@ -1172,7 +1172,7 @@ 
  }        



  /* PCI IDs */

  static struct pci_device_id snd_mychip_ids[] __devinitdata = {

  static struct pci_device_id snd_mychip_ids[] = {

          { PCI_VENDOR_ID_FOO, PCI_DEVICE_ID_BAR,

            PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },

          ....
@@ -1565,7 +1565,7 @@ 
        <informalexample>

          <programlisting>

<![CDATA[

  static struct pci_device_id snd_mychip_ids[] __devinitdata = {

  static struct pci_device_id snd_mychip_ids[] = {

          { PCI_VENDOR_ID_FOO, PCI_DEVICE_ID_BAR,

            PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },

          ....

include/sound/cs46xx.h

+1 −0
Original line number Diff line number Diff line
@@ -1704,6 +1704,7 @@ struct snd_cs46xx { 
	int acpi_port;

	struct snd_kcontrol *eapd_switch; /* for amplifier hack */

	int accept_valid;	/* accept mmap valid (for OSS) */

	int in_suspend;



	struct gameport *gameport;

sound/pci/ad1889.c

+4 −4
Original line number Diff line number Diff line
@@ -241,14 +241,14 @@ ad1889_channel_reset(struct snd_ad1889 *chip, unsigned int channel) 
	}

}



static inline u16

static u16

snd_ad1889_ac97_read(struct snd_ac97 *ac97, unsigned short reg)

{

	struct snd_ad1889 *chip = ac97->private_data;

	return ad1889_readw(chip, AD_AC97_BASE + reg);

}



static inline void

static void

snd_ad1889_ac97_write(struct snd_ac97 *ac97, unsigned short reg, unsigned short val)

{

	struct snd_ad1889 *chip = ac97->private_data;
@@ -873,7 +873,7 @@ snd_ad1889_free(struct snd_ad1889 *chip) 
	return 0;

}



static inline int

static int

snd_ad1889_dev_free(struct snd_device *device) 

{

	struct snd_ad1889 *chip = device->device_data;
@@ -1051,7 +1051,7 @@ snd_ad1889_remove(struct pci_dev *pci) 
	pci_set_drvdata(pci, NULL);

}



static struct pci_device_id snd_ad1889_ids[] __devinitdata = {

static struct pci_device_id snd_ad1889_ids[] = {

	{ PCI_DEVICE(PCI_VENDOR_ID_ANALOG_DEVICES, PCI_DEVICE_ID_AD1889JS) },

	{ 0, },

};

sound/pci/ali5451/ali5451.c

+1 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ struct snd_ali { 
#endif

};



static struct pci_device_id snd_ali_ids[] __devinitdata = {

static struct pci_device_id snd_ali_ids[] = {

	{PCI_DEVICE(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M5451), 0, 0, 0},

	{0, }

};

sound/pci/als300.c

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ struct snd_als300_substream_data { 
	int block_counter_register;

};



static struct pci_device_id snd_als300_ids[] __devinitdata = {

static struct pci_device_id snd_als300_ids[] = {

	{ 0x4005, 0x0300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_ALS300 },

	{ 0x4005, 0x0308, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_ALS300_PLUS },

	{ 0, }