Commit a0a3d518 authored by Bill Pemberton's avatar Bill Pemberton Committed by Mark Brown
Browse files

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: default avatarBill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent fdca21ad

sound/soc/fsl/eukrea-tlv320.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

sound/soc/fsl/fsl_dma.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

sound/soc/fsl/fsl_ssi.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

sound/soc/fsl/imx-audmux.c

+4 −4
Original line number Diff line number Diff line
@@ -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,

sound/soc/fsl/imx-mc13783.c

+3 −3
Original line number Diff line number Diff line
@@ -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);