Commit 74557fe3 authored by Adam Belay's avatar Adam Belay

[SOUND] Remove __(dev)initdata from all pnp sound drivers

This patch is needed in order to avoid a potential oops.  It is
similiar to the changes made to pci.
parent 85326b02
...@@ -93,7 +93,7 @@ struct snd_card_ad1816a { ...@@ -93,7 +93,7 @@ struct snd_card_ad1816a {
struct pnp_dev *devmpu; struct pnp_dev *devmpu;
}; };
static struct pnp_card_device_id snd_ad1816a_pnpids[] __devinitdata = { static struct pnp_card_device_id snd_ad1816a_pnpids[] = {
/* Analog Devices AD1815 */ /* Analog Devices AD1815 */
{ .id = "ADS7150", .devs = { { .id = "ADS7150" }, { .id = "ADS7151" } } }, { .id = "ADS7150", .devs = { { .id = "ADS7150" }, { .id = "ADS7151" } } },
/* Analog Devices AD1816A - added by Kenneth Platz <kxp@atl.hp.com> */ /* Analog Devices AD1816A - added by Kenneth Platz <kxp@atl.hp.com> */
......
...@@ -98,7 +98,7 @@ struct snd_card_als100 { ...@@ -98,7 +98,7 @@ struct snd_card_als100 {
struct pnp_dev *devopl; struct pnp_dev *devopl;
}; };
static struct pnp_card_device_id snd_als100_pnpids[] __devinitdata = { static struct pnp_card_device_id snd_als100_pnpids[] = {
/* ALS100 - PRO16PNP */ /* ALS100 - PRO16PNP */
{ .id = "ALS0001", .devs = { { "@@@0001" }, { "@X@0001" }, { "@H@0001" } } }, { .id = "ALS0001", .devs = { { "@@@0001" }, { "@X@0001" }, { "@H@0001" } } },
/* ALS110 - MF1000 - Digimate 3D Sound */ /* ALS110 - MF1000 - Digimate 3D Sound */
......
...@@ -109,7 +109,7 @@ struct snd_card_azt2320 { ...@@ -109,7 +109,7 @@ struct snd_card_azt2320 {
struct pnp_dev *devmpu; struct pnp_dev *devmpu;
}; };
static struct pnp_card_device_id snd_azt2320_pnpids[] __devinitdata = { static struct pnp_card_device_id snd_azt2320_pnpids[] = {
/* PRO16V */ /* PRO16V */
{ .id = "AZT1008", .devs = { { "AZT1008" }, { "AZT2001" }, } }, { .id = "AZT1008", .devs = { { "AZT1008" }, { "AZT2001" }, } },
/* Aztech Sound Galaxy 16 */ /* Aztech Sound Galaxy 16 */
......
...@@ -172,7 +172,7 @@ static snd_card_t *snd_cmi8330_legacy[SNDRV_CARDS] = SNDRV_DEFAULT_PTR; ...@@ -172,7 +172,7 @@ static snd_card_t *snd_cmi8330_legacy[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
#ifdef CONFIG_PNP #ifdef CONFIG_PNP
static struct pnp_card_device_id snd_cmi8330_pnpids[] __devinitdata = { static struct pnp_card_device_id snd_cmi8330_pnpids[] = {
{ .id = "CMI0001", .devs = { { "@@@0001" }, { "@X@0001" } } }, { .id = "CMI0001", .devs = { { "@@@0001" }, { "@X@0001" } } },
{ .id = "" } { .id = "" }
}; };
......
...@@ -174,7 +174,7 @@ static snd_card_t *snd_cs4236_legacy[SNDRV_CARDS] = SNDRV_DEFAULT_PTR; ...@@ -174,7 +174,7 @@ static snd_card_t *snd_cs4236_legacy[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
#ifdef CS4232 #ifdef CS4232
static struct pnp_card_device_id snd_cs423x_pnpids[] __devinitdata = { static struct pnp_card_device_id snd_cs423x_pnpids[] = {
/* Philips PCA70PS */ /* Philips PCA70PS */
{ .id = "CSC0d32", .devs = { { "CSC0000" }, { "CSC0010" }, { "PNPb006" } } }, { .id = "CSC0d32", .devs = { { "CSC0000" }, { "CSC0010" }, { "PNPb006" } } },
/* TerraTec Maestro 32/96 (CS4232) */ /* TerraTec Maestro 32/96 (CS4232) */
...@@ -193,7 +193,7 @@ static struct pnp_card_device_id snd_cs423x_pnpids[] __devinitdata = { ...@@ -193,7 +193,7 @@ static struct pnp_card_device_id snd_cs423x_pnpids[] __devinitdata = {
{ .id = "" } /* end */ { .id = "" } /* end */
}; };
#else /* CS4236 */ #else /* CS4236 */
static struct pnp_card_device_id snd_cs423x_pnpids[] __devinitdata = { static struct pnp_card_device_id snd_cs423x_pnpids[] = {
/* Intel Marlin Spike Motherboard - CS4235 */ /* Intel Marlin Spike Motherboard - CS4235 */
{ .id = "CSC0225", .devs = { { "CSC0000" }, { "CSC0010" }, { "CSC0003" } } }, { .id = "CSC0225", .devs = { { "CSC0000" }, { "CSC0010" }, { "CSC0003" } } },
/* Intel Marlin Spike Motherboard (#2) - CS4235 */ /* Intel Marlin Spike Motherboard (#2) - CS4235 */
......
...@@ -88,7 +88,7 @@ struct snd_card_dt019x { ...@@ -88,7 +88,7 @@ struct snd_card_dt019x {
struct pnp_dev *devopl; struct pnp_dev *devopl;
}; };
static struct pnp_card_device_id snd_dt019x_pnpids[] __devinitdata = { static struct pnp_card_device_id snd_dt019x_pnpids[] = {
/* DT197A30 */ /* DT197A30 */
{ .id = "RWB1688", .devs = { { "@@@0001" }, { "@X@0001" }, { "@H@0001" }, } }, { .id = "RWB1688", .devs = { { "@@@0001" }, { "@X@0001" }, { "@H@0001" }, } },
/* DT0196 / ALS-007 */ /* DT0196 / ALS-007 */
......
...@@ -1940,7 +1940,7 @@ static snd_card_t *snd_audiodrive_legacy[SNDRV_CARDS] = SNDRV_DEFAULT_PTR; ...@@ -1940,7 +1940,7 @@ static snd_card_t *snd_audiodrive_legacy[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
#ifdef CONFIG_PNP #ifdef CONFIG_PNP
static struct pnp_card_device_id snd_audiodrive_pnpids[] __devinitdata = { static struct pnp_card_device_id snd_audiodrive_pnpids[] = {
/* ESS 1868 (integrated on Compaq dual P-Pro motherboard and Genius 18PnP 3D) */ /* ESS 1868 (integrated on Compaq dual P-Pro motherboard and Genius 18PnP 3D) */
{ .id = "ESS1868", .devs = { { "ESS1868" }, { "ESS0000" } } }, { .id = "ESS1868", .devs = { { "ESS1868" }, { "ESS0000" } } },
/* ESS 1868 (integrated on Maxisound Cards) */ /* ESS 1868 (integrated on Maxisound Cards) */
......
...@@ -138,7 +138,7 @@ static snd_card_t *snd_interwave_legacy[SNDRV_CARDS] = SNDRV_DEFAULT_PTR; ...@@ -138,7 +138,7 @@ static snd_card_t *snd_interwave_legacy[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
#ifdef CONFIG_PNP #ifdef CONFIG_PNP
static struct pnp_card_device_id snd_interwave_pnpids[] __devinitdata = { static struct pnp_card_device_id snd_interwave_pnpids[] = {
#ifndef SNDRV_STB #ifndef SNDRV_STB
/* Gravis UltraSound Plug & Play */ /* Gravis UltraSound Plug & Play */
{ .id = "GRV0001", .devs = { { .id = "GRV0000" } } }, { .id = "GRV0001", .devs = { { .id = "GRV0000" } } },
......
...@@ -161,7 +161,7 @@ static snd_card_t *snd_opl3sa2_legacy[SNDRV_CARDS] = SNDRV_DEFAULT_PTR; ...@@ -161,7 +161,7 @@ static snd_card_t *snd_opl3sa2_legacy[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
#ifdef CONFIG_PNP #ifdef CONFIG_PNP
static struct pnp_card_device_id snd_opl3sa2_pnpids[] __devinitdata = { static struct pnp_card_device_id snd_opl3sa2_pnpids[] = {
/* Yamaha YMF719E-S (Genius Sound Maker 3DX) */ /* Yamaha YMF719E-S (Genius Sound Maker 3DX) */
{ .id = "YMH0020", .devs = { { "YMH0021" } } }, { .id = "YMH0020", .devs = { { "YMH0021" } } },
/* Yamaha OPL3-SA3 (integrated on Intel's Pentium II AL440LX motherboard) */ /* Yamaha OPL3-SA3 (integrated on Intel's Pentium II AL440LX motherboard) */
......
...@@ -69,7 +69,7 @@ struct snd_card_es968 { ...@@ -69,7 +69,7 @@ struct snd_card_es968 {
struct pnp_dev *dev; struct pnp_dev *dev;
}; };
static struct pnp_card_device_id snd_es968_pnpids[] __devinitdata = { static struct pnp_card_device_id snd_es968_pnpids[] = {
{ .id = "ESS0968", .devs = { { "@@@0968" }, } }, { .id = "ESS0968", .devs = { { "@@@0968" }, } },
{ .id = "", } /* end */ { .id = "", } /* end */
}; };
......
...@@ -157,7 +157,7 @@ struct snd_card_sb16 { ...@@ -157,7 +157,7 @@ struct snd_card_sb16 {
static snd_card_t *snd_sb16_legacy[SNDRV_CARDS] = SNDRV_DEFAULT_PTR; static snd_card_t *snd_sb16_legacy[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
static struct pnp_card_device_id snd_sb16_pnpids[] __devinitdata = { static struct pnp_card_device_id snd_sb16_pnpids[] = {
#ifndef SNDRV_SBAWE #ifndef SNDRV_SBAWE
/* Sound Blaster 16 PnP */ /* Sound Blaster 16 PnP */
{ .id = "CTL0024", .devs = { { "CTL0031" } } }, { .id = "CTL0024", .devs = { { "CTL0031" } } },
......
...@@ -78,7 +78,7 @@ MODULE_PARM_DESC(dma, "DMA # for SoundScape driver."); ...@@ -78,7 +78,7 @@ MODULE_PARM_DESC(dma, "DMA # for SoundScape driver.");
MODULE_PARM_SYNTAX(dma, SNDRV_DMA8_DESC); MODULE_PARM_SYNTAX(dma, SNDRV_DMA8_DESC);
#ifdef CONFIG_PNP #ifdef CONFIG_PNP
static struct pnp_card_device_id sscape_pnpids[] __devinitdata = { static struct pnp_card_device_id sscape_pnpids[] = {
{ .id = "ENS3081", .devs = { { "ENS0000" } } }, { .id = "ENS3081", .devs = { { "ENS0000" } } },
{ .id = "" } /* end */ { .id = "" } /* end */
}; };
......
...@@ -102,7 +102,7 @@ static snd_card_t *snd_wavefront_legacy[SNDRV_CARDS] = SNDRV_DEFAULT_PTR; ...@@ -102,7 +102,7 @@ static snd_card_t *snd_wavefront_legacy[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
#ifdef CONFIG_PNP #ifdef CONFIG_PNP
static struct pnp_card_device_id snd_wavefront_pnpids[] __devinitdata = { static struct pnp_card_device_id snd_wavefront_pnpids[] = {
/* Tropez */ /* Tropez */
{ .id = "CSC7532", .devs = { { "CSC0000" }, { "CSC0010" }, { "PnPb006" }, { "CSC0004" } } }, { .id = "CSC7532", .devs = { { "CSC0000" }, { "CSC0010" }, { "PnPb006" }, { "CSC0004" } } },
/* Tropez+ */ /* Tropez+ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment