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

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

ASoC: ux500: 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 d8628d1c

sound/soc/ux500/mop500.c

+5 −5
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ static void mop500_of_node_put(void) 
	}

}



static int __devinit mop500_of_probe(struct platform_device *pdev,

static int mop500_of_probe(struct platform_device *pdev,

			   struct device_node *np)

{

	struct device_node *codec_np, *msp_np[2];
@@ -99,7 +99,7 @@ static int __devinit mop500_of_probe(struct platform_device *pdev, 
	return 0;

}



static int __devinit mop500_probe(struct platform_device *pdev)

static int mop500_probe(struct platform_device *pdev)

{

	struct device_node *np = pdev->dev.of_node;

	int ret;
@@ -136,7 +136,7 @@ static int __devinit mop500_probe(struct platform_device *pdev) 
	return ret;

}



static int __devexit mop500_remove(struct platform_device *pdev)

static int mop500_remove(struct platform_device *pdev)

{

	struct snd_soc_card *mop500_card = platform_get_drvdata(pdev);
@@ -161,7 +161,7 @@ static struct platform_driver snd_soc_mop500_driver = { 
		.of_match_table = snd_soc_mop500_match,

	},

	.probe = mop500_probe,

	.remove = __devexit_p(mop500_remove),

	.remove = mop500_remove,

};



module_platform_driver(snd_soc_mop500_driver);

sound/soc/ux500/ux500_msp_dai.c

+2 −2
Original line number Diff line number Diff line
@@ -768,7 +768,7 @@ static struct snd_soc_dai_driver ux500_msp_dai_drv[UX500_NBR_OF_DAI] = { 
	},

};



static int __devinit ux500_msp_drv_probe(struct platform_device *pdev)

static int ux500_msp_drv_probe(struct platform_device *pdev)

{

	struct ux500_msp_i2s_drvdata *drvdata;

	int ret = 0;
@@ -855,7 +855,7 @@ static int __devinit ux500_msp_drv_probe(struct platform_device *pdev) 
	return ret;

}



static int __devexit ux500_msp_drv_remove(struct platform_device *pdev)

static int ux500_msp_drv_remove(struct platform_device *pdev)

{

	struct ux500_msp_i2s_drvdata *drvdata = dev_get_drvdata(&pdev->dev);

sound/soc/ux500/ux500_pcm.c

+2 −2
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ static struct snd_soc_platform_driver ux500_pcm_soc_drv = { 
	.pcm_new        = ux500_pcm_new,

};



int __devinit ux500_pcm_register_platform(struct platform_device *pdev)

int ux500_pcm_register_platform(struct platform_device *pdev)

{

	int ret;
@@ -298,7 +298,7 @@ int __devinit ux500_pcm_register_platform(struct platform_device *pdev) 
}

EXPORT_SYMBOL_GPL(ux500_pcm_register_platform);



int __devexit ux500_pcm_unregister_platform(struct platform_device *pdev)

int ux500_pcm_unregister_platform(struct platform_device *pdev)

{

	snd_soc_unregister_platform(&pdev->dev);