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: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
parent
ce69ace56a
commit
7ff6000627
|
@ -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);
|
||||
|
|
|
@ -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 @@ err_thres:
|
|||
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);
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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 @@ err_unregister:
|
|||
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);
|
||||
|
|
|
@ -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 @@ err_put_clk:
|
|||
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);
|
||||
|
|
|
@ -45,7 +45,7 @@ static struct snd_soc_card snd_soc_omap_hdmi = {
|
|||
.num_links = 1,
|
||||
};
|
||||
|
||||
static __devinit int omap_hdmi_probe(struct platform_device *pdev)
|
||||
static int omap_hdmi_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct snd_soc_card *card = &snd_soc_omap_hdmi;
|
||||
int ret;
|
||||
|
@ -61,7 +61,7 @@ static __devinit int omap_hdmi_probe(struct platform_device *pdev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int __devexit omap_hdmi_remove(struct platform_device *pdev)
|
||||
static int omap_hdmi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct snd_soc_card *card = platform_get_drvdata(pdev);
|
||||
|
||||
|
@ -76,7 +76,7 @@ static struct platform_driver omap_hdmi_driver = {
|
|||
.owner = THIS_MODULE,
|
||||
},
|
||||
.probe = omap_hdmi_probe,
|
||||
.remove = __devexit_p(omap_hdmi_remove),
|
||||
.remove = omap_hdmi_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(omap_hdmi_driver);
|
||||
|
|
|
@ -262,7 +262,7 @@ static struct snd_soc_dai_driver omap_hdmi_dai = {
|
|||
.ops = &omap_hdmi_dai_ops,
|
||||
};
|
||||
|
||||
static __devinit int omap_hdmi_probe(struct platform_device *pdev)
|
||||
static int omap_hdmi_probe(struct platform_device *pdev)
|
||||
{
|
||||
int ret;
|
||||
struct resource *hdmi_rsrc;
|
||||
|
@ -324,7 +324,7 @@ static __devinit int omap_hdmi_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int __devexit omap_hdmi_remove(struct platform_device *pdev)
|
||||
static int omap_hdmi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct hdmi_priv *hdmi_data = dev_get_drvdata(&pdev->dev);
|
||||
|
||||
|
@ -345,7 +345,7 @@ static struct platform_driver hdmi_dai_driver = {
|
|||
.owner = THIS_MODULE,
|
||||
},
|
||||
.probe = omap_hdmi_probe,
|
||||
.remove = __devexit_p(omap_hdmi_remove),
|
||||
.remove = omap_hdmi_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(hdmi_dai_driver);
|
||||
|
|
|
@ -757,7 +757,7 @@ static const struct of_device_id omap_mcbsp_of_match[] = {
|
|||
};
|
||||
MODULE_DEVICE_TABLE(of, omap_mcbsp_of_match);
|
||||
|
||||
static __devinit int asoc_mcbsp_probe(struct platform_device *pdev)
|
||||
static int asoc_mcbsp_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct omap_mcbsp_platform_data *pdata = dev_get_platdata(&pdev->dev);
|
||||
struct omap_mcbsp *mcbsp;
|
||||
|
@ -798,7 +798,7 @@ static __devinit int asoc_mcbsp_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int __devexit asoc_mcbsp_remove(struct platform_device *pdev)
|
||||
static int asoc_mcbsp_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct omap_mcbsp *mcbsp = platform_get_drvdata(pdev);
|
||||
|
||||
|
@ -824,7 +824,7 @@ static struct platform_driver asoc_mcbsp_driver = {
|
|||
},
|
||||
|
||||
.probe = asoc_mcbsp_probe,
|
||||
.remove = __devexit_p(asoc_mcbsp_remove),
|
||||
.remove = asoc_mcbsp_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(asoc_mcbsp_driver);
|
||||
|
|
|
@ -429,7 +429,7 @@ void omap_mcpdm_configure_dn_offsets(struct snd_soc_pcm_runtime *rtd,
|
|||
}
|
||||
EXPORT_SYMBOL_GPL(omap_mcpdm_configure_dn_offsets);
|
||||
|
||||
static __devinit int asoc_mcpdm_probe(struct platform_device *pdev)
|
||||
static int asoc_mcpdm_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct omap_mcpdm *mcpdm;
|
||||
struct resource *res;
|
||||
|
@ -487,7 +487,7 @@ static __devinit int asoc_mcpdm_probe(struct platform_device *pdev)
|
|||
return snd_soc_register_dai(&pdev->dev, &omap_mcpdm_dai);
|
||||
}
|
||||
|
||||
static int __devexit asoc_mcpdm_remove(struct platform_device *pdev)
|
||||
static int asoc_mcpdm_remove(struct platform_device *pdev)
|
||||
{
|
||||
snd_soc_unregister_dai(&pdev->dev);
|
||||
return 0;
|
||||
|
@ -507,7 +507,7 @@ static struct platform_driver asoc_mcpdm_driver = {
|
|||
},
|
||||
|
||||
.probe = asoc_mcpdm_probe,
|
||||
.remove = __devexit_p(asoc_mcpdm_remove),
|
||||
.remove = asoc_mcpdm_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(asoc_mcpdm_driver);
|
||||
|
|
|
@ -297,13 +297,13 @@ static struct snd_soc_platform_driver omap_soc_platform = {
|
|||
.pcm_free = omap_pcm_free_dma_buffers,
|
||||
};
|
||||
|
||||
static __devinit int omap_pcm_probe(struct platform_device *pdev)
|
||||
static int omap_pcm_probe(struct platform_device *pdev)
|
||||
{
|
||||
return snd_soc_register_platform(&pdev->dev,
|
||||
&omap_soc_platform);
|
||||
}
|
||||
|
||||
static int __devexit omap_pcm_remove(struct platform_device *pdev)
|
||||
static int omap_pcm_remove(struct platform_device *pdev)
|
||||
{
|
||||
snd_soc_unregister_platform(&pdev->dev);
|
||||
return 0;
|
||||
|
@ -316,7 +316,7 @@ static struct platform_driver omap_pcm_driver = {
|
|||
},
|
||||
|
||||
.probe = omap_pcm_probe,
|
||||
.remove = __devexit_p(omap_pcm_remove),
|
||||
.remove = omap_pcm_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(omap_pcm_driver);
|
||||
|
|
|
@ -107,7 +107,7 @@ static struct snd_soc_card omap_twl4030_card = {
|
|||
.num_links = ARRAY_SIZE(omap_twl4030_dai_links),
|
||||
};
|
||||
|
||||
static __devinit int omap_twl4030_probe(struct platform_device *pdev)
|
||||
static int omap_twl4030_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct omap_tw4030_pdata *pdata = dev_get_platdata(&pdev->dev);
|
||||
struct device_node *node = pdev->dev.of_node;
|
||||
|
@ -154,7 +154,7 @@ static __devinit int omap_twl4030_probe(struct platform_device *pdev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int __devexit omap_twl4030_remove(struct platform_device *pdev)
|
||||
static int omap_twl4030_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct snd_soc_card *card = platform_get_drvdata(pdev);
|
||||
|
||||
|
@ -177,7 +177,7 @@ static struct platform_driver omap_twl4030_driver = {
|
|||
.of_match_table = omap_twl4030_of_match,
|
||||
},
|
||||
.probe = omap_twl4030_probe,
|
||||
.remove = __devexit_p(omap_twl4030_remove),
|
||||
.remove = omap_twl4030_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(omap_twl4030_driver);
|
||||
|
|
Loading…
Reference in a new issue