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

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

ASoC: OMAP: 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 ce69ace5

sound/soc/omap/ams-delta.c

+3 −3
Original line number Diff line number Diff line
@@ -575,7 +575,7 @@ static struct snd_soc_card ams_delta_audio_card = { 
};



/* Module init/exit */

static __devinit int ams_delta_probe(struct platform_device *pdev)

static int ams_delta_probe(struct platform_device *pdev)

{

	struct snd_soc_card *card = &ams_delta_audio_card;

	int ret;
@@ -591,7 +591,7 @@ static __devinit int ams_delta_probe(struct platform_device *pdev) 
	return 0;

}



static int __devexit ams_delta_remove(struct platform_device *pdev)

static int ams_delta_remove(struct platform_device *pdev)

{

	struct snd_soc_card *card = platform_get_drvdata(pdev);
@@ -616,7 +616,7 @@ static struct platform_driver ams_delta_driver = { 
		.owner = THIS_MODULE,

	},

	.probe = ams_delta_probe,

	.remove = __devexit_p(ams_delta_remove),

	.remove = ams_delta_remove,

};



module_platform_driver(ams_delta_driver);

sound/soc/omap/mcbsp.c

+3 −4
Original line number Diff line number Diff line
@@ -930,8 +930,7 @@ static const struct attribute_group sidetone_attr_group = { 
	.attrs = (struct attribute **)sidetone_attrs,

};



static int __devinit omap_st_add(struct omap_mcbsp *mcbsp,

				 struct resource *res)

static int omap_st_add(struct omap_mcbsp *mcbsp, struct resource *res)

{

	struct omap_mcbsp_st_data *st_data;

	int err;
@@ -957,7 +956,7 @@ static int __devinit omap_st_add(struct omap_mcbsp *mcbsp, 
 * McBSP1 and McBSP3 are directly mapped on 1610 and 1510.

 * 730 has only 2 McBSP, and both of them are MPU peripherals.

 */

int __devinit omap_mcbsp_init(struct platform_device *pdev)

int omap_mcbsp_init(struct platform_device *pdev)

{

	struct omap_mcbsp *mcbsp = platform_get_drvdata(pdev);

	struct resource *res;
@@ -1085,7 +1084,7 @@ int __devinit omap_mcbsp_init(struct platform_device *pdev) 
	return ret;

}



void __devexit omap_mcbsp_sysfs_remove(struct omap_mcbsp *mcbsp)

void omap_mcbsp_sysfs_remove(struct omap_mcbsp *mcbsp)

{

	if (mcbsp->pdata->buffer_size)

		sysfs_remove_group(&mcbsp->dev->kobj, &additional_attr_group);

sound/soc/omap/mcbsp.h

+2 −2
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ int omap_st_enable(struct omap_mcbsp *mcbsp); 
int omap_st_disable(struct omap_mcbsp *mcbsp);

int omap_st_is_enabled(struct omap_mcbsp *mcbsp);



int __devinit omap_mcbsp_init(struct platform_device *pdev);

void __devexit omap_mcbsp_sysfs_remove(struct omap_mcbsp *mcbsp);

int omap_mcbsp_init(struct platform_device *pdev);

void omap_mcbsp_sysfs_remove(struct omap_mcbsp *mcbsp);



#endif /* __ASOC_MCBSP_H */

sound/soc/omap/omap-abe-twl6040.c

+3 −3
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ static struct snd_soc_card omap_abe_card = { 
	.num_dapm_routes = ARRAY_SIZE(audio_map),

};



static __devinit int omap_abe_probe(struct platform_device *pdev)

static int omap_abe_probe(struct platform_device *pdev)

{

	struct omap_abe_twl6040_data *pdata = dev_get_platdata(&pdev->dev);

	struct device_node *node = pdev->dev.of_node;
@@ -390,7 +390,7 @@ static __devinit int omap_abe_probe(struct platform_device *pdev) 
	return ret;

}



static int __devexit omap_abe_remove(struct platform_device *pdev)

static int omap_abe_remove(struct platform_device *pdev)

{

	struct snd_soc_card *card = platform_get_drvdata(pdev);

	struct abe_twl6040 *priv = snd_soc_card_get_drvdata(card);
@@ -417,7 +417,7 @@ static struct platform_driver omap_abe_driver = { 
		.of_match_table = omap_abe_of_match,

	},

	.probe = omap_abe_probe,

	.remove = __devexit_p(omap_abe_remove),

	.remove = omap_abe_remove,

};



module_platform_driver(omap_abe_driver);

sound/soc/omap/omap-dmic.c

+3 −3
Original line number Diff line number Diff line
@@ -448,7 +448,7 @@ static struct snd_soc_dai_driver omap_dmic_dai = { 
	.ops = &omap_dmic_dai_ops,

};



static __devinit int asoc_dmic_probe(struct platform_device *pdev)

static int asoc_dmic_probe(struct platform_device *pdev)

{

	struct omap_dmic *dmic;

	struct resource *res;
@@ -518,7 +518,7 @@ static __devinit int asoc_dmic_probe(struct platform_device *pdev) 
	return ret;

}



static int __devexit asoc_dmic_remove(struct platform_device *pdev)

static int asoc_dmic_remove(struct platform_device *pdev)

{

	struct omap_dmic *dmic = platform_get_drvdata(pdev);
@@ -541,7 +541,7 @@ static struct platform_driver asoc_dmic_driver = { 
		.of_match_table = omap_dmic_of_match,

	},

	.probe = asoc_dmic_probe,

	.remove = __devexit_p(asoc_dmic_remove),

	.remove = asoc_dmic_remove,

};



module_platform_driver(asoc_dmic_driver);