dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

ASoC: fsl: 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: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Bill Pemberton 2012-12-07 09:26:16 -05:00 committed by Mark Brown
parent fdca21ad46
commit a0a3d518c3
16 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sound/soc/fsl/eukrea-tlv320.c
View File

@ -93,7 +93,7 @@ static struct snd_soc_card eukrea_tlv320 = {
.num_links = 1,
};
static int __devinit eukrea_tlv320_probe(struct platform_device *pdev)
static int eukrea_tlv320_probe(struct platform_device *pdev)
{
int ret;
int int_port = 0, ext_port;
@ -142,7 +142,7 @@ static int __devinit eukrea_tlv320_probe(struct platform_device *pdev)
return ret;
}
static int __devexit eukrea_tlv320_remove(struct platform_device *pdev)
static int eukrea_tlv320_remove(struct platform_device *pdev)
{
snd_soc_unregister_card(&eukrea_tlv320);
@ -155,7 +155,7 @@ static struct platform_driver eukrea_tlv320_driver = {
.owner = THIS_MODULE,
},
.probe = eukrea_tlv320_probe,
.remove = __devexit_p(eukrea_tlv320_remove),};
.remove = eukrea_tlv320_remove,};
module_platform_driver(eukrea_tlv320_driver);

6
sound/soc/fsl/fsl_dma.c
View File

@ -894,7 +894,7 @@ static struct snd_pcm_ops fsl_dma_ops = {
.pointer = fsl_dma_pointer,
};
static int __devinit fsl_soc_dma_probe(struct platform_device *pdev)
static int fsl_soc_dma_probe(struct platform_device *pdev)
{
struct dma_object *dma;
struct device_node *np = pdev->dev.of_node;
@ -958,7 +958,7 @@ static int __devinit fsl_soc_dma_probe(struct platform_device *pdev)
return 0;
}
static int __devexit fsl_soc_dma_remove(struct platform_device *pdev)
static int fsl_soc_dma_remove(struct platform_device *pdev)
{
struct dma_object *dma = dev_get_drvdata(&pdev->dev);
@ -983,7 +983,7 @@ static struct platform_driver fsl_soc_dma_driver = {
.of_match_table = fsl_soc_dma_ids,
},
.probe = fsl_soc_dma_probe,
.remove = __devexit_p(fsl_soc_dma_remove),
.remove = fsl_soc_dma_remove,
};
module_platform_driver(fsl_soc_dma_driver);

2
sound/soc/fsl/fsl_ssi.c
View File

@ -639,7 +639,7 @@ static void make_lowercase(char *s)
}
}
static int __devinit fsl_ssi_probe(struct platform_device *pdev)
static int fsl_ssi_probe(struct platform_device *pdev)
{
struct fsl_ssi_private *ssi_private;
int ret = 0;

8
sound/soc/fsl/imx-audmux.c
View File

@ -162,7 +162,7 @@ static void __init audmux_debugfs_init(void)
}
}
static void __devexit audmux_debugfs_remove(void)
static void audmux_debugfs_remove(void)
{
debugfs_remove_recursive(audmux_debugfs_root);
}
@ -244,7 +244,7 @@ int imx_audmux_v2_configure_port(unsigned int port, unsigned int ptcr,
}
EXPORT_SYMBOL_GPL(imx_audmux_v2_configure_port);
static int __devinit imx_audmux_probe(struct platform_device *pdev)
static int imx_audmux_probe(struct platform_device *pdev)
{
struct resource *res;
struct pinctrl *pinctrl;
@ -278,7 +278,7 @@ static int __devinit imx_audmux_probe(struct platform_device *pdev)
return 0;
}
static int __devexit imx_audmux_remove(struct platform_device *pdev)
static int imx_audmux_remove(struct platform_device *pdev)
{
if (audmux_type == IMX31_AUDMUX)
audmux_debugfs_remove();
@ -289,7 +289,7 @@ static int __devexit imx_audmux_remove(struct platform_device *pdev)
static struct platform_driver imx_audmux_driver = {
.probe = imx_audmux_probe,
.remove = __devexit_p(imx_audmux_remove),
.remove = imx_audmux_remove,
.id_table = imx_audmux_ids,
.driver = {
.name = DRIVER_NAME,

6
sound/soc/fsl/imx-mc13783.c
View File

@ -98,7 +98,7 @@ static struct snd_soc_card imx_mc13783 = {
.num_dapm_routes = ARRAY_SIZE(imx_mc13783_routes),
};
static int __devinit imx_mc13783_probe(struct platform_device *pdev)
static int imx_mc13783_probe(struct platform_device *pdev)
{
int ret;
@ -148,7 +148,7 @@ static int __devinit imx_mc13783_probe(struct platform_device *pdev)
return ret;
}
static int __devexit imx_mc13783_remove(struct platform_device *pdev)
static int imx_mc13783_remove(struct platform_device *pdev)
{
snd_soc_unregister_card(&imx_mc13783);
@ -161,7 +161,7 @@ static struct platform_driver imx_mc13783_audio_driver = {
.owner = THIS_MODULE,
},
.probe = imx_mc13783_probe,
.remove = __devexit_p(imx_mc13783_remove)
.remove = imx_mc13783_remove
};
module_platform_driver(imx_mc13783_audio_driver);

6
sound/soc/fsl/imx-pcm-dma.c
View File

@ -154,12 +154,12 @@ static struct snd_soc_platform_driver imx_soc_platform_mx2 = {
.pcm_free = imx_pcm_free,
};
static int __devinit imx_soc_platform_probe(struct platform_device *pdev)
static int imx_soc_platform_probe(struct platform_device *pdev)
{
return snd_soc_register_platform(&pdev->dev, &imx_soc_platform_mx2);
}
static int __devexit imx_soc_platform_remove(struct platform_device *pdev)
static int imx_soc_platform_remove(struct platform_device *pdev)
{
snd_soc_unregister_platform(&pdev->dev);
return 0;
@ -171,7 +171,7 @@ static struct platform_driver imx_pcm_driver = {
.owner = THIS_MODULE,
},
.probe = imx_soc_platform_probe,
.remove = __devexit_p(imx_soc_platform_remove),
.remove = imx_soc_platform_remove,
};
module_platform_driver(imx_pcm_driver);

6
sound/soc/fsl/imx-pcm-fiq.c
View File

@ -282,7 +282,7 @@ static struct snd_soc_platform_driver imx_soc_platform_fiq = {
.pcm_free = imx_pcm_fiq_free,
};
static int __devinit imx_soc_platform_probe(struct platform_device *pdev)
static int imx_soc_platform_probe(struct platform_device *pdev)
{
struct imx_ssi *ssi = platform_get_drvdata(pdev);
int ret;
@ -316,7 +316,7 @@ failed_register:
return ret;
}
static int __devexit imx_soc_platform_remove(struct platform_device *pdev)
static int imx_soc_platform_remove(struct platform_device *pdev)
{
snd_soc_unregister_platform(&pdev->dev);
return 0;
@ -329,7 +329,7 @@ static struct platform_driver imx_pcm_driver = {
},
.probe = imx_soc_platform_probe,
.remove = __devexit_p(imx_soc_platform_remove),
.remove = imx_soc_platform_remove,
};
module_platform_driver(imx_pcm_driver);

6
sound/soc/fsl/imx-sgtl5000.c
View File

@ -56,7 +56,7 @@ static const struct snd_soc_dapm_widget imx_sgtl5000_dapm_widgets[] = {
SND_SOC_DAPM_SPK("Ext Spk", NULL),
};
static int __devinit imx_sgtl5000_probe(struct platform_device *pdev)
static int imx_sgtl5000_probe(struct platform_device *pdev)
{
struct device_node *np = pdev->dev.of_node;
struct device_node *ssi_np, *codec_np;
@ -185,7 +185,7 @@ fail:
return ret;
}
static int __devexit imx_sgtl5000_remove(struct platform_device *pdev)
static int imx_sgtl5000_remove(struct platform_device *pdev)
{
struct imx_sgtl5000_data *data = platform_get_drvdata(pdev);
@ -211,7 +211,7 @@ static struct platform_driver imx_sgtl5000_driver = {
.of_match_table = imx_sgtl5000_dt_ids,
},
.probe = imx_sgtl5000_probe,
.remove = __devexit_p(imx_sgtl5000_remove),
.remove = imx_sgtl5000_remove,
};
module_platform_driver(imx_sgtl5000_driver);

4
sound/soc/fsl/imx-ssi.c
View File

@ -639,7 +639,7 @@ failed_clk:
return ret;
}
static int __devexit imx_ssi_remove(struct platform_device *pdev)
static int imx_ssi_remove(struct platform_device *pdev)
{
struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
struct imx_ssi *ssi = platform_get_drvdata(pdev);
@ -660,7 +660,7 @@ static int __devexit imx_ssi_remove(struct platform_device *pdev)
static struct platform_driver imx_ssi_driver = {
.probe = imx_ssi_probe,
.remove = __devexit_p(imx_ssi_remove),
.remove = imx_ssi_remove,
.driver = {
.name = "imx-ssi",

8
sound/soc/fsl/mpc5200_psc_ac97.c
View File

@ -277,7 +277,7 @@ static struct snd_soc_dai_driver psc_ac97_dai[] = {
* - Probe/remove operations
* - OF device match table
*/
static int __devinit psc_ac97_of_probe(struct platform_device *op)
static int psc_ac97_of_probe(struct platform_device *op)
{
int rc;
struct snd_ac97 ac97;
@ -310,7 +310,7 @@ static int __devinit psc_ac97_of_probe(struct platform_device *op)
return 0;
}
static int __devexit psc_ac97_of_remove(struct platform_device *op)
static int psc_ac97_of_remove(struct platform_device *op)
{
mpc5200_audio_dma_destroy(op);
snd_soc_unregister_dais(&op->dev, ARRAY_SIZE(psc_ac97_dai));
@ -318,7 +318,7 @@ static int __devexit psc_ac97_of_remove(struct platform_device *op)
}
/* Match table for of_platform binding */
static struct of_device_id psc_ac97_match[] __devinitdata = {
static struct of_device_id psc_ac97_match[] = {
{ .compatible = "fsl,mpc5200-psc-ac97", },
{ .compatible = "fsl,mpc5200b-psc-ac97", },
{}
@ -327,7 +327,7 @@ MODULE_DEVICE_TABLE(of, psc_ac97_match);
static struct platform_driver psc_ac97_driver = {
.probe = psc_ac97_of_probe,
.remove = __devexit_p(psc_ac97_of_remove),
.remove = psc_ac97_of_remove,
.driver = {
.name = "mpc5200-psc-ac97",
.owner = THIS_MODULE,

8
sound/soc/fsl/mpc5200_psc_i2s.c
View File

@ -153,7 +153,7 @@ static struct snd_soc_dai_driver psc_i2s_dai[] = {{
* - Probe/remove operations
* - OF device match table
*/
static int __devinit psc_i2s_of_probe(struct platform_device *op)
static int psc_i2s_of_probe(struct platform_device *op)
{
int rc;
struct psc_dma *psc_dma;
@ -205,7 +205,7 @@ static int __devinit psc_i2s_of_probe(struct platform_device *op)
}
static int __devexit psc_i2s_of_remove(struct platform_device *op)
static int psc_i2s_of_remove(struct platform_device *op)
{
mpc5200_audio_dma_destroy(op);
snd_soc_unregister_dais(&op->dev, ARRAY_SIZE(psc_i2s_dai));
@ -213,7 +213,7 @@ static int __devexit psc_i2s_of_remove(struct platform_device *op)
}
/* Match table for of_platform binding */
static struct of_device_id psc_i2s_match[] __devinitdata = {
static struct of_device_id psc_i2s_match[] = {
{ .compatible = "fsl,mpc5200-psc-i2s", },
{ .compatible = "fsl,mpc5200b-psc-i2s", },
{}
@ -222,7 +222,7 @@ MODULE_DEVICE_TABLE(of, psc_i2s_match);
static struct platform_driver psc_i2s_driver = {
.probe = psc_i2s_of_probe,
.remove = __devexit_p(psc_i2s_of_remove),
.remove = psc_i2s_of_remove,
.driver = {
.name = "mpc5200-psc-i2s",
.owner = THIS_MODULE,

4
sound/soc/fsl/mpc8610_hpcd.c
View File

@ -368,7 +368,7 @@ error_alloc:
*
* This function is called when the platform device is removed.
*/
static int __devexit mpc8610_hpcd_remove(struct platform_device *pdev)
static int mpc8610_hpcd_remove(struct platform_device *pdev)
{
struct snd_soc_card *card = platform_get_drvdata(pdev);
struct mpc8610_hpcd_data *machine_data =
@ -382,7 +382,7 @@ static int __devexit mpc8610_hpcd_remove(struct platform_device *pdev)
static struct platform_driver mpc8610_hpcd_driver = {
.probe = mpc8610_hpcd_probe,
.remove = __devexit_p(mpc8610_hpcd_remove),
.remove = mpc8610_hpcd_remove,
.driver = {
/* The name must match 'compatible' property in the device tree,
* in lowercase letters.

6
sound/soc/fsl/mx27vis-aic32x4.c
View File

@ -180,7 +180,7 @@ static struct snd_soc_card mx27vis_aic32x4 = {
.num_dapm_routes = ARRAY_SIZE(aic32x4_dapm_routes),
};
static int __devinit mx27vis_aic32x4_probe(struct platform_device *pdev)
static int mx27vis_aic32x4_probe(struct platform_device *pdev)
{
struct snd_mx27vis_platform_data *pdata = pdev->dev.platform_data;
int ret;
@ -219,7 +219,7 @@ static int __devinit mx27vis_aic32x4_probe(struct platform_device *pdev)
return ret;
}
static int __devexit mx27vis_aic32x4_remove(struct platform_device *pdev)
static int mx27vis_aic32x4_remove(struct platform_device *pdev)
{
snd_soc_unregister_card(&mx27vis_aic32x4);
@ -232,7 +232,7 @@ static struct platform_driver mx27vis_aic32x4_audio_driver = {
.owner = THIS_MODULE,
},
.probe = mx27vis_aic32x4_probe,
.remove = __devexit_p(mx27vis_aic32x4_remove),
.remove = mx27vis_aic32x4_remove,
};
module_platform_driver(mx27vis_aic32x4_audio_driver);

4
sound/soc/fsl/p1022_ds.c
View File

@ -376,7 +376,7 @@ error_put:
*
* This function is called when the platform device is removed.
*/
static int __devexit p1022_ds_remove(struct platform_device *pdev)
static int p1022_ds_remove(struct platform_device *pdev)
{
struct snd_soc_card *card = platform_get_drvdata(pdev);
struct machine_data *mdata =
@ -390,7 +390,7 @@ static int __devexit p1022_ds_remove(struct platform_device *pdev)
static struct platform_driver p1022_ds_driver = {
.probe = p1022_ds_probe,
.remove = __devexit_p(p1022_ds_remove),
.remove = p1022_ds_remove,
.driver = {
/*
* The name must match 'compatible' property in the device tree,

4
sound/soc/fsl/p1022_rdk.c
View File

@ -326,7 +326,7 @@ error_put:
*
* This function is called when the platform device is removed.
*/
static int __devexit p1022_rdk_remove(struct platform_device *pdev)
static int p1022_rdk_remove(struct platform_device *pdev)
{
struct snd_soc_card *card = platform_get_drvdata(pdev);
struct machine_data *mdata =
@ -340,7 +340,7 @@ static int __devexit p1022_rdk_remove(struct platform_device *pdev)
static struct platform_driver p1022_rdk_driver = {
.probe = p1022_rdk_probe,
.remove = __devexit_p(p1022_rdk_remove),
.remove = p1022_rdk_remove,
.driver = {
/*
* The name must match 'compatible' property in the device tree,

4
sound/soc/fsl/pcm030-audio-fabric.c
View File

@ -101,7 +101,7 @@ static int __init pcm030_fabric_probe(struct platform_device *op)
return ret;
}
static int __devexit pcm030_fabric_remove(struct platform_device *op)
static int pcm030_fabric_remove(struct platform_device *op)
{
struct pcm030_audio_data *pdata = platform_get_drvdata(op);
int ret;
@ -120,7 +120,7 @@ MODULE_DEVICE_TABLE(of, pcm030_audio_match);
static struct platform_driver pcm030_fabric_driver = {
.probe = pcm030_fabric_probe,
.remove = __devexit_p(pcm030_fabric_remove),
.remove = pcm030_fabric_remove,
.driver = {
.name = DRV_NAME,
.owner = THIS_MODULE,