Skip to content

L
linux
Commit fdca21ad authored by Bill Pemberton's avatar Bill Pemberton Committed by Mark Brown
Browse files
Options

ASoC: Samsung: remove __dev* attributes 

CONFIG_HOTPLUG is going away as an option.  As result the __dev*
markings will be going away.

Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst,
and __devexit.
Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent d7f1be84
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 56 deletions
sound/soc/samsung/ac97.c
View file @ fdca21ad
...@@ -370,7 +370,7 @@ static struct snd_soc_dai_driver s3c_ac97_dai[] = { ...@@ -370,7 +370,7 @@ static struct snd_soc_dai_driver s3c_ac97_dai[] = {
}, },
}; };
static __devinit int s3c_ac97_probe(struct platform_device *pdev) static int s3c_ac97_probe(struct platform_device *pdev)
{ {
struct resource *mem_res, *dmatx_res, *dmarx_res, *dmamic_res, *irq_res; struct resource *mem_res, *dmatx_res, *dmarx_res, *dmamic_res, *irq_res;
struct s3c_audio_pdata *ac97_pdata; struct s3c_audio_pdata *ac97_pdata;
...@@ -485,7 +485,7 @@ static __devinit int s3c_ac97_probe(struct platform_device *pdev) ...@@ -485,7 +485,7 @@ static __devinit int s3c_ac97_probe(struct platform_device *pdev)
return ret; return ret;
} }
static __devexit int s3c_ac97_remove(struct platform_device *pdev) static int s3c_ac97_remove(struct platform_device *pdev)
{ {
struct resource *mem_res, *irq_res; struct resource *mem_res, *irq_res;
...@@ -510,7 +510,7 @@ static __devexit int s3c_ac97_remove(struct platform_device *pdev) ...@@ -510,7 +510,7 @@ static __devexit int s3c_ac97_remove(struct platform_device *pdev)
static struct platform_driver s3c_ac97_driver = { static struct platform_driver s3c_ac97_driver = {
.probe = s3c_ac97_probe, .probe = s3c_ac97_probe,
.remove = __devexit_p(s3c_ac97_remove), .remove = s3c_ac97_remove,
.driver = { .driver = {
.name = "samsung-ac97", .name = "samsung-ac97",
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
sound/soc/samsung/bells.c
View file @ fdca21ad
...@@ -412,7 +412,7 @@ static struct snd_soc_card bells_cards[] = { ...@@ -412,7 +412,7 @@ static struct snd_soc_card bells_cards[] = {
}; };
static __devinit int bells_probe(struct platform_device *pdev) static int bells_probe(struct platform_device *pdev)
{ {
int ret; int ret;
...@@ -429,7 +429,7 @@ static __devinit int bells_probe(struct platform_device *pdev) ...@@ -429,7 +429,7 @@ static __devinit int bells_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __devexit bells_remove(struct platform_device *pdev) static int bells_remove(struct platform_device *pdev)
{ {
snd_soc_unregister_card(&bells_cards[pdev->id]); snd_soc_unregister_card(&bells_cards[pdev->id]);
...@@ -443,7 +443,7 @@ static struct platform_driver bells_driver = { ...@@ -443,7 +443,7 @@ static struct platform_driver bells_driver = {
.pm = &snd_soc_pm_ops, .pm = &snd_soc_pm_ops,
}, },
.probe = bells_probe, .probe = bells_probe,
.remove = __devexit_p(bells_remove), .remove = bells_remove,
}; };
module_platform_driver(bells_driver); module_platform_driver(bells_driver);
......
sound/soc/samsung/dma.c
View file @ fdca21ad
...@@ -432,13 +432,13 @@ static struct snd_soc_platform_driver samsung_asoc_platform = { ...@@ -432,13 +432,13 @@ static struct snd_soc_platform_driver samsung_asoc_platform = {
.pcm_free = dma_free_dma_buffers, .pcm_free = dma_free_dma_buffers,
}; };
int __devinit asoc_dma_platform_register(struct device *dev) int asoc_dma_platform_register(struct device *dev)
{ {
return snd_soc_register_platform(dev, &samsung_asoc_platform); return snd_soc_register_platform(dev, &samsung_asoc_platform);
} }
EXPORT_SYMBOL_GPL(asoc_dma_platform_register); EXPORT_SYMBOL_GPL(asoc_dma_platform_register);
void __devexit asoc_dma_platform_unregister(struct device *dev) void asoc_dma_platform_unregister(struct device *dev)
{ {
snd_soc_unregister_platform(dev); snd_soc_unregister_platform(dev);
} }
......
sound/soc/samsung/i2s.c
View file @ fdca21ad
...@@ -952,8 +952,7 @@ static const struct snd_soc_dai_ops samsung_i2s_dai_ops = { ...@@ -952,8 +952,7 @@ static const struct snd_soc_dai_ops samsung_i2s_dai_ops = {
SNDRV_PCM_FMTBIT_S16_LE | \ SNDRV_PCM_FMTBIT_S16_LE | \
SNDRV_PCM_FMTBIT_S24_LE) SNDRV_PCM_FMTBIT_S24_LE)
static __devinit static struct i2s_dai *i2s_alloc_dai(struct platform_device *pdev, bool sec)
struct i2s_dai *i2s_alloc_dai(struct platform_device *pdev, bool sec)
{ {
struct i2s_dai *i2s; struct i2s_dai *i2s;
...@@ -994,7 +993,7 @@ struct i2s_dai *i2s_alloc_dai(struct platform_device *pdev, bool sec) ...@@ -994,7 +993,7 @@ struct i2s_dai *i2s_alloc_dai(struct platform_device *pdev, bool sec)
return i2s; return i2s;
} }
static __devinit int samsung_i2s_probe(struct platform_device *pdev) static int samsung_i2s_probe(struct platform_device *pdev)
{ {
u32 dma_pl_chan, dma_cp_chan, dma_pl_sec_chan; u32 dma_pl_chan, dma_cp_chan, dma_pl_sec_chan;
struct i2s_dai *pri_dai, *sec_dai = NULL; struct i2s_dai *pri_dai, *sec_dai = NULL;
...@@ -1117,7 +1116,7 @@ static __devinit int samsung_i2s_probe(struct platform_device *pdev) ...@@ -1117,7 +1116,7 @@ static __devinit int samsung_i2s_probe(struct platform_device *pdev)
return ret; return ret;
} }
static __devexit int samsung_i2s_remove(struct platform_device *pdev) static int samsung_i2s_remove(struct platform_device *pdev)
{ {
struct i2s_dai *i2s, *other; struct i2s_dai *i2s, *other;
struct resource *res; struct resource *res;
...@@ -1146,7 +1145,7 @@ static __devexit int samsung_i2s_remove(struct platform_device *pdev) ...@@ -1146,7 +1145,7 @@ static __devexit int samsung_i2s_remove(struct platform_device *pdev)
static struct platform_driver samsung_i2s_driver = { static struct platform_driver samsung_i2s_driver = {
.probe = samsung_i2s_probe, .probe = samsung_i2s_probe,
.remove = __devexit_p(samsung_i2s_remove), .remove = samsung_i2s_remove,
.driver = { .driver = {
.name = "samsung-i2s", .name = "samsung-i2s",
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
sound/soc/samsung/idma.c
View file @ fdca21ad
...@@ -416,12 +416,12 @@ static struct snd_soc_platform_driver asoc_idma_platform = { ...@@ -416,12 +416,12 @@ static struct snd_soc_platform_driver asoc_idma_platform = {
.pcm_free = idma_free, .pcm_free = idma_free,
}; };
static int __devinit asoc_idma_platform_probe(struct platform_device *pdev) static int asoc_idma_platform_probe(struct platform_device *pdev)
{ {
return snd_soc_register_platform(&pdev->dev, &asoc_idma_platform); return snd_soc_register_platform(&pdev->dev, &asoc_idma_platform);
} }
static int __devexit asoc_idma_platform_remove(struct platform_device *pdev) static int asoc_idma_platform_remove(struct platform_device *pdev)
{ {
snd_soc_unregister_platform(&pdev->dev); snd_soc_unregister_platform(&pdev->dev);
return 0; return 0;
...@@ -434,7 +434,7 @@ static struct platform_driver asoc_idma_driver = { ...@@ -434,7 +434,7 @@ static struct platform_driver asoc_idma_driver = {
}, },
.probe = asoc_idma_platform_probe, .probe = asoc_idma_platform_probe,
.remove = __devexit_p(asoc_idma_platform_remove), .remove = asoc_idma_platform_remove,
}; };
module_platform_driver(asoc_idma_driver); module_platform_driver(asoc_idma_driver);
......
sound/soc/samsung/littlemill.c
View file @ fdca21ad
...@@ -297,7 +297,7 @@ static struct snd_soc_card littlemill = { ...@@ -297,7 +297,7 @@ static struct snd_soc_card littlemill = {
.late_probe = littlemill_late_probe, .late_probe = littlemill_late_probe,
}; };
static __devinit int littlemill_probe(struct platform_device *pdev) static int littlemill_probe(struct platform_device *pdev)
{ {
struct snd_soc_card *card = &littlemill; struct snd_soc_card *card = &littlemill;
int ret; int ret;
...@@ -314,7 +314,7 @@ static __devinit int littlemill_probe(struct platform_device *pdev) ...@@ -314,7 +314,7 @@ static __devinit int littlemill_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __devexit littlemill_remove(struct platform_device *pdev) static int littlemill_remove(struct platform_device *pdev)
{ {
struct snd_soc_card *card = platform_get_drvdata(pdev); struct snd_soc_card *card = platform_get_drvdata(pdev);
...@@ -330,7 +330,7 @@ static struct platform_driver littlemill_driver = { ...@@ -330,7 +330,7 @@ static struct platform_driver littlemill_driver = {
.pm = &snd_soc_pm_ops, .pm = &snd_soc_pm_ops,
}, },
.probe = littlemill_probe, .probe = littlemill_probe,
.remove = __devexit_p(littlemill_remove), .remove = littlemill_remove,
}; };
module_platform_driver(littlemill_driver); module_platform_driver(littlemill_driver);
......
sound/soc/samsung/lowland.c
View file @ fdca21ad
...@@ -180,7 +180,7 @@ static struct snd_soc_card lowland = { ...@@ -180,7 +180,7 @@ static struct snd_soc_card lowland = {
.num_dapm_routes = ARRAY_SIZE(audio_paths), .num_dapm_routes = ARRAY_SIZE(audio_paths),
}; };
static __devinit int lowland_probe(struct platform_device *pdev) static int lowland_probe(struct platform_device *pdev)
{ {
struct snd_soc_card *card = &lowland; struct snd_soc_card *card = &lowland;
int ret; int ret;
...@@ -197,7 +197,7 @@ static __devinit int lowland_probe(struct platform_device *pdev) ...@@ -197,7 +197,7 @@ static __devinit int lowland_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __devexit lowland_remove(struct platform_device *pdev) static int lowland_remove(struct platform_device *pdev)
{ {
struct snd_soc_card *card = platform_get_drvdata(pdev); struct snd_soc_card *card = platform_get_drvdata(pdev);
...@@ -213,7 +213,7 @@ static struct platform_driver lowland_driver = { ...@@ -213,7 +213,7 @@ static struct platform_driver lowland_driver = {
.pm = &snd_soc_pm_ops, .pm = &snd_soc_pm_ops,
}, },
.probe = lowland_probe, .probe = lowland_probe,
.remove = __devexit_p(lowland_remove), .remove = lowland_remove,
}; };
module_platform_driver(lowland_driver); module_platform_driver(lowland_driver);
......
sound/soc/samsung/pcm.c
View file @ fdca21ad
...@@ -490,7 +490,7 @@ static struct snd_soc_dai_driver s3c_pcm_dai[] = { ...@@ -490,7 +490,7 @@ static struct snd_soc_dai_driver s3c_pcm_dai[] = {
}, },
}; };
static __devinit int s3c_pcm_dev_probe(struct platform_device *pdev) static int s3c_pcm_dev_probe(struct platform_device *pdev)
{ {
struct s3c_pcm_info *pcm; struct s3c_pcm_info *pcm;
struct resource *mem_res, *dmatx_res, *dmarx_res; struct resource *mem_res, *dmatx_res, *dmarx_res;
...@@ -613,7 +613,7 @@ static __devinit int s3c_pcm_dev_probe(struct platform_device *pdev) ...@@ -613,7 +613,7 @@ static __devinit int s3c_pcm_dev_probe(struct platform_device *pdev)
return ret; return ret;
} }
static __devexit int s3c_pcm_dev_remove(struct platform_device *pdev) static int s3c_pcm_dev_remove(struct platform_device *pdev)
{ {
struct s3c_pcm_info *pcm = &s3c_pcm[pdev->id]; struct s3c_pcm_info *pcm = &s3c_pcm[pdev->id];
struct resource *mem_res; struct resource *mem_res;
...@@ -638,7 +638,7 @@ static __devexit int s3c_pcm_dev_remove(struct platform_device *pdev) ...@@ -638,7 +638,7 @@ static __devexit int s3c_pcm_dev_remove(struct platform_device *pdev)
static struct platform_driver s3c_pcm_driver = { static struct platform_driver s3c_pcm_driver = {
.probe = s3c_pcm_dev_probe, .probe = s3c_pcm_dev_probe,
.remove = __devexit_p(s3c_pcm_dev_remove), .remove = s3c_pcm_dev_remove,
.driver = { .driver = {
.name = "samsung-pcm", .name = "samsung-pcm",
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
sound/soc/samsung/s3c2412-i2s.c
View file @ fdca21ad
...@@ -160,7 +160,7 @@ static struct snd_soc_dai_driver s3c2412_i2s_dai = { ...@@ -160,7 +160,7 @@ static struct snd_soc_dai_driver s3c2412_i2s_dai = {
.ops = &s3c2412_i2s_dai_ops, .ops = &s3c2412_i2s_dai_ops,
}; };
static __devinit int s3c2412_iis_dev_probe(struct platform_device *pdev) static int s3c2412_iis_dev_probe(struct platform_device *pdev)
{ {
int ret = 0; int ret = 0;
...@@ -182,7 +182,7 @@ static __devinit int s3c2412_iis_dev_probe(struct platform_device *pdev) ...@@ -182,7 +182,7 @@ static __devinit int s3c2412_iis_dev_probe(struct platform_device *pdev)
return ret; return ret;
} }
static __devexit int s3c2412_iis_dev_remove(struct platform_device *pdev) static int s3c2412_iis_dev_remove(struct platform_device *pdev)
{ {
asoc_dma_platform_unregister(&pdev->dev); asoc_dma_platform_unregister(&pdev->dev);
snd_soc_unregister_dai(&pdev->dev); snd_soc_unregister_dai(&pdev->dev);
...@@ -191,7 +191,7 @@ static __devexit int s3c2412_iis_dev_remove(struct platform_device *pdev) ...@@ -191,7 +191,7 @@ static __devexit int s3c2412_iis_dev_remove(struct platform_device *pdev)
static struct platform_driver s3c2412_iis_driver = { static struct platform_driver s3c2412_iis_driver = {
.probe = s3c2412_iis_dev_probe, .probe = s3c2412_iis_dev_probe,
.remove = __devexit_p(s3c2412_iis_dev_remove), .remove = s3c2412_iis_dev_remove,
.driver = { .driver = {
.name = "s3c2412-iis", .name = "s3c2412-iis",
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
sound/soc/samsung/s3c24xx-i2s.c
View file @ fdca21ad
...@@ -465,7 +465,7 @@ static struct snd_soc_dai_driver s3c24xx_i2s_dai = { ...@@ -465,7 +465,7 @@ static struct snd_soc_dai_driver s3c24xx_i2s_dai = {
.ops = &s3c24xx_i2s_dai_ops, .ops = &s3c24xx_i2s_dai_ops,
}; };
static __devinit int s3c24xx_iis_dev_probe(struct platform_device *pdev) static int s3c24xx_iis_dev_probe(struct platform_device *pdev)
{ {
int ret = 0; int ret = 0;
...@@ -487,7 +487,7 @@ static __devinit int s3c24xx_iis_dev_probe(struct platform_device *pdev) ...@@ -487,7 +487,7 @@ static __devinit int s3c24xx_iis_dev_probe(struct platform_device *pdev)
return ret; return ret;
} }
static __devexit int s3c24xx_iis_dev_remove(struct platform_device *pdev) static int s3c24xx_iis_dev_remove(struct platform_device *pdev)
{ {
asoc_dma_platform_unregister(&pdev->dev); asoc_dma_platform_unregister(&pdev->dev);
snd_soc_unregister_dai(&pdev->dev); snd_soc_unregister_dai(&pdev->dev);
...@@ -496,7 +496,7 @@ static __devexit int s3c24xx_iis_dev_remove(struct platform_device *pdev) ...@@ -496,7 +496,7 @@ static __devexit int s3c24xx_iis_dev_remove(struct platform_device *pdev)
static struct platform_driver s3c24xx_iis_driver = { static struct platform_driver s3c24xx_iis_driver = {
.probe = s3c24xx_iis_dev_probe, .probe = s3c24xx_iis_dev_probe,
.remove = __devexit_p(s3c24xx_iis_dev_remove), .remove = s3c24xx_iis_dev_remove,
.driver = { .driver = {
.name = "s3c24xx-iis", .name = "s3c24xx-iis",
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
sound/soc/samsung/s3c24xx_simtec.c
View file @ fdca21ad
...@@ -313,8 +313,8 @@ const struct dev_pm_ops simtec_audio_pmops = { ...@@ -313,8 +313,8 @@ const struct dev_pm_ops simtec_audio_pmops = {
EXPORT_SYMBOL_GPL(simtec_audio_pmops); EXPORT_SYMBOL_GPL(simtec_audio_pmops);
#endif #endif
int __devinit simtec_audio_core_probe(struct platform_device *pdev, int simtec_audio_core_probe(struct platform_device *pdev,
struct snd_soc_card *card) struct snd_soc_card *card)
{ {
struct platform_device *snd_dev; struct platform_device *snd_dev;
int ret; int ret;
...@@ -371,7 +371,7 @@ int __devinit simtec_audio_core_probe(struct platform_device *pdev, ...@@ -371,7 +371,7 @@ int __devinit simtec_audio_core_probe(struct platform_device *pdev,
} }
EXPORT_SYMBOL_GPL(simtec_audio_core_probe); EXPORT_SYMBOL_GPL(simtec_audio_core_probe);
int __devexit simtec_audio_remove(struct platform_device *pdev) int simtec_audio_remove(struct platform_device *pdev)
{ {
struct platform_device *snd_dev = platform_get_drvdata(pdev); struct platform_device *snd_dev = platform_get_drvdata(pdev);
......
sound/soc/samsung/s3c24xx_simtec_hermes.c
View file @ fdca21ad
...@@ -99,7 +99,7 @@ static struct snd_soc_card snd_soc_machine_simtec_aic33 = { ...@@ -99,7 +99,7 @@ static struct snd_soc_card snd_soc_machine_simtec_aic33 = {
.num_dapm_routes = ARRAY_SIZE(base_map), .num_dapm_routes = ARRAY_SIZE(base_map),
}; };
static int __devinit simtec_audio_hermes_probe(struct platform_device *pd) static int simtec_audio_hermes_probe(struct platform_device *pd)
{ {
dev_info(&pd->dev, "probing....\n"); dev_info(&pd->dev, "probing....\n");
return simtec_audio_core_probe(pd, &snd_soc_machine_simtec_aic33); return simtec_audio_core_probe(pd, &snd_soc_machine_simtec_aic33);
...@@ -112,7 +112,7 @@ static struct platform_driver simtec_audio_hermes_platdrv = { ...@@ -112,7 +112,7 @@ static struct platform_driver simtec_audio_hermes_platdrv = {
.pm = simtec_audio_pm, .pm = simtec_audio_pm,
}, },
.probe = simtec_audio_hermes_probe, .probe = simtec_audio_hermes_probe,
.remove = __devexit_p(simtec_audio_remove), .remove = simtec_audio_remove,
}; };
module_platform_driver(simtec_audio_hermes_platdrv); module_platform_driver(simtec_audio_hermes_platdrv);
......
sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c
View file @ fdca21ad
...@@ -88,7 +88,7 @@ static struct snd_soc_card snd_soc_machine_simtec_aic23 = { ...@@ -88,7 +88,7 @@ static struct snd_soc_card snd_soc_machine_simtec_aic23 = {
.num_dapm_routes = ARRAY_SIZE(base_map), .num_dapm_routes = ARRAY_SIZE(base_map),
}; };
static int __devinit simtec_audio_tlv320aic23_probe(struct platform_device *pd) static int simtec_audio_tlv320aic23_probe(struct platform_device *pd)
{ {
return simtec_audio_core_probe(pd, &snd_soc_machine_simtec_aic23); return simtec_audio_core_probe(pd, &snd_soc_machine_simtec_aic23);
} }
...@@ -100,7 +100,7 @@ static struct platform_driver simtec_audio_tlv320aic23_driver = { ...@@ -100,7 +100,7 @@ static struct platform_driver simtec_audio_tlv320aic23_driver = {
.pm = simtec_audio_pm, .pm = simtec_audio_pm,
}, },
.probe = simtec_audio_tlv320aic23_probe, .probe = simtec_audio_tlv320aic23_probe,
.remove = __devexit_p(simtec_audio_remove), .remove = simtec_audio_remove,
}; };
module_platform_driver(simtec_audio_tlv320aic23_driver); module_platform_driver(simtec_audio_tlv320aic23_driver);
......
sound/soc/samsung/smdk_wm8580pcm.c
View file @ fdca21ad
...@@ -153,7 +153,7 @@ static struct snd_soc_card smdk_pcm = { ...@@ -153,7 +153,7 @@ static struct snd_soc_card smdk_pcm = {
* is absent (or not connected), so we connect EXT_VOICE_CLK(OSC4), * is absent (or not connected), so we connect EXT_VOICE_CLK(OSC4),
* 2.0484Mhz, directly with MCLK both Codec and SoC. * 2.0484Mhz, directly with MCLK both Codec and SoC.
*/ */
static int __devinit snd_smdk_probe(struct platform_device *pdev) static int snd_smdk_probe(struct platform_device *pdev)
{ {
int ret = 0; int ret = 0;
...@@ -173,7 +173,7 @@ static int __devinit snd_smdk_probe(struct platform_device *pdev) ...@@ -173,7 +173,7 @@ static int __devinit snd_smdk_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __devexit snd_smdk_remove(struct platform_device *pdev) static int snd_smdk_remove(struct platform_device *pdev)
{ {
snd_soc_unregister_card(&smdk_pcm); snd_soc_unregister_card(&smdk_pcm);
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
...@@ -186,7 +186,7 @@ static struct platform_driver snd_smdk_driver = { ...@@ -186,7 +186,7 @@ static struct platform_driver snd_smdk_driver = {
.name = "samsung-smdk-pcm", .name = "samsung-smdk-pcm",
}, },
.probe = snd_smdk_probe, .probe = snd_smdk_probe,
.remove = __devexit_p(snd_smdk_remove), .remove = snd_smdk_remove,
}; };
module_platform_driver(snd_smdk_driver); module_platform_driver(snd_smdk_driver);
......
sound/soc/samsung/smdk_wm8994.c
View file @ fdca21ad
...@@ -150,7 +150,7 @@ static struct snd_soc_card smdk = { ...@@ -150,7 +150,7 @@ static struct snd_soc_card smdk = {
}; };
static int __devinit smdk_audio_probe(struct platform_device *pdev) static int smdk_audio_probe(struct platform_device *pdev)
{ {
int ret; int ret;
struct snd_soc_card *card = &smdk; struct snd_soc_card *card = &smdk;
...@@ -164,7 +164,7 @@ static int __devinit smdk_audio_probe(struct platform_device *pdev) ...@@ -164,7 +164,7 @@ static int __devinit smdk_audio_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit smdk_audio_remove(struct platform_device *pdev) static int smdk_audio_remove(struct platform_device *pdev)
{ {
struct snd_soc_card *card = platform_get_drvdata(pdev); struct snd_soc_card *card = platform_get_drvdata(pdev);
...@@ -179,7 +179,7 @@ static struct platform_driver smdk_audio_driver = { ...@@ -179,7 +179,7 @@ static struct platform_driver smdk_audio_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = smdk_audio_probe, .probe = smdk_audio_probe,
.remove = __devexit_p(smdk_audio_remove), .remove = smdk_audio_remove,
}; };
module_platform_driver(smdk_audio_driver); module_platform_driver(smdk_audio_driver);
......
sound/soc/samsung/smdk_wm8994pcm.c
View file @ fdca21ad
...@@ -129,7 +129,7 @@ static struct snd_soc_card smdk_pcm = { ...@@ -129,7 +129,7 @@ static struct snd_soc_card smdk_pcm = {
.num_links = 1, .num_links = 1,
}; };
static int __devinit snd_smdk_probe(struct platform_device *pdev) static int snd_smdk_probe(struct platform_device *pdev)
{ {
int ret = 0; int ret = 0;
...@@ -143,7 +143,7 @@ static int __devinit snd_smdk_probe(struct platform_device *pdev) ...@@ -143,7 +143,7 @@ static int __devinit snd_smdk_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __devexit snd_smdk_remove(struct platform_device *pdev) static int snd_smdk_remove(struct platform_device *pdev)
{ {
snd_soc_unregister_card(&smdk_pcm); snd_soc_unregister_card(&smdk_pcm);
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
...@@ -156,7 +156,7 @@ static struct platform_driver snd_smdk_driver = { ...@@ -156,7 +156,7 @@ static struct platform_driver snd_smdk_driver = {
.name = "samsung-smdk-pcm", .name = "samsung-smdk-pcm",
}, },
.probe = snd_smdk_probe, .probe = snd_smdk_probe,
.remove = __devexit_p(snd_smdk_remove), .remove = snd_smdk_remove,
}; };
module_platform_driver(snd_smdk_driver); module_platform_driver(snd_smdk_driver);
......
sound/soc/samsung/spdif.c
View file @ fdca21ad
...@@ -357,7 +357,7 @@ static struct snd_soc_dai_driver samsung_spdif_dai = { ...@@ -357,7 +357,7 @@ static struct snd_soc_dai_driver samsung_spdif_dai = {
.resume = spdif_resume, .resume = spdif_resume,
}; };
static __devinit int spdif_probe(struct platform_device *pdev) static int spdif_probe(struct platform_device *pdev)
{ {
struct s3c_audio_pdata *spdif_pdata; struct s3c_audio_pdata *spdif_pdata;
struct resource *mem_res, *dma_res; struct resource *mem_res, *dma_res;
...@@ -460,7 +460,7 @@ static __devinit int spdif_probe(struct platform_device *pdev) ...@@ -460,7 +460,7 @@ static __devinit int spdif_probe(struct platform_device *pdev)
return ret; return ret;
} }
static __devexit int spdif_remove(struct platform_device *pdev) static int spdif_remove(struct platform_device *pdev)
{ {
struct samsung_spdif_info *spdif = &spdif_info; struct samsung_spdif_info *spdif = &spdif_info;
struct resource *mem_res; struct resource *mem_res;
...@@ -484,7 +484,7 @@ static __devexit int spdif_remove(struct platform_device *pdev) ...@@ -484,7 +484,7 @@ static __devexit int spdif_remove(struct platform_device *pdev)
static struct platform_driver samsung_spdif_driver = { static struct platform_driver samsung_spdif_driver = {
.probe = spdif_probe, .probe = spdif_probe,
.remove = __devexit_p(spdif_remove), .remove = spdif_remove,
.driver = { .driver = {
.name = "samsung-spdif", .name = "samsung-spdif",
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
sound/soc/samsung/speyside.c
View file @ fdca21ad
...@@ -320,7 +320,7 @@ static struct snd_soc_card speyside = { ...@@ -320,7 +320,7 @@ static struct snd_soc_card speyside = {
.late_probe = speyside_late_probe, .late_probe = speyside_late_probe,
}; };
static __devinit int speyside_probe(struct platform_device *pdev) static int speyside_probe(struct platform_device *pdev)
{ {
struct snd_soc_card *card = &speyside; struct snd_soc_card *card = &speyside;
int ret; int ret;
...@@ -337,7 +337,7 @@ static __devinit int speyside_probe(struct platform_device *pdev) ...@@ -337,7 +337,7 @@ static __devinit int speyside_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __devexit speyside_remove(struct platform_device *pdev) static int speyside_remove(struct platform_device *pdev)
{ {
struct snd_soc_card *card = platform_get_drvdata(pdev); struct snd_soc_card *card = platform_get_drvdata(pdev);
...@@ -353,7 +353,7 @@ static struct platform_driver speyside_driver = { ...@@ -353,7 +353,7 @@ static struct platform_driver speyside_driver = {
.pm = &snd_soc_pm_ops, .pm = &snd_soc_pm_ops,
}, },
.probe = speyside_probe, .probe = speyside_probe,
.remove = __devexit_p(speyside_remove), .remove = speyside_remove,
}; };
module_platform_driver(speyside_driver); module_platform_driver(speyside_driver);
......
sound/soc/samsung/tobermory.c
View file @ fdca21ad
...@@ -214,7 +214,7 @@ static struct snd_soc_card tobermory = { ...@@ -214,7 +214,7 @@ static struct snd_soc_card tobermory = {
.late_probe = tobermory_late_probe, .late_probe = tobermory_late_probe,
}; };
static __devinit int tobermory_probe(struct platform_device *pdev) static int tobermory_probe(struct platform_device *pdev)
{ {
struct snd_soc_card *card = &tobermory; struct snd_soc_card *card = &tobermory;
int ret; int ret;
...@@ -231,7 +231,7 @@ static __devinit int tobermory_probe(struct platform_device *pdev) ...@@ -231,7 +231,7 @@ static __devinit int tobermory_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __devexit tobermory_remove(struct platform_device *pdev) static int tobermory_remove(struct platform_device *pdev)
{ {
struct snd_soc_card *card = platform_get_drvdata(pdev); struct snd_soc_card *card = platform_get_drvdata(pdev);
...@@ -247,7 +247,7 @@ static struct platform_driver tobermory_driver = { ...@@ -247,7 +247,7 @@ static struct platform_driver tobermory_driver = {
.pm = &snd_soc_pm_ops, .pm = &snd_soc_pm_ops,
}, },
.probe = tobermory_probe, .probe = tobermory_probe,
.remove = __devexit_p(tobermory_remove), .remove = tobermory_remove,
}; };
module_platform_driver(tobermory_driver); module_platform_driver(tobermory_driver);
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7