Skip to content

Commit

Permalink
ASoC: pxa: remove __dev* attributes
Browse files Browse the repository at this point in the history
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 <[email protected]>
Acked-by: Haojian Zhuang <[email protected]>
Signed-off-by: Mark Brown <[email protected]>
  • Loading branch information
wfp5p authored and broonie committed Dec 9, 2012
1 parent a0a3d51 commit 570f6fe
Show file tree
Hide file tree
Showing 17 changed files with 50 additions and 50 deletions.
6 changes: 3 additions & 3 deletions sound/soc/pxa/brownstone.c
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ static struct snd_soc_card brownstone = {
.num_dapm_routes = ARRAY_SIZE(brownstone_audio_map),
};

static int __devinit brownstone_probe(struct platform_device *pdev)
static int brownstone_probe(struct platform_device *pdev)
{
int ret;

Expand All @@ -152,7 +152,7 @@ static int __devinit brownstone_probe(struct platform_device *pdev)
return ret;
}

static int __devexit brownstone_remove(struct platform_device *pdev)
static int brownstone_remove(struct platform_device *pdev)
{
snd_soc_unregister_card(&brownstone);
return 0;
Expand All @@ -164,7 +164,7 @@ static struct platform_driver mmp_driver = {
.owner = THIS_MODULE,
},
.probe = brownstone_probe,
.remove = __devexit_p(brownstone_remove),
.remove = brownstone_remove,
};

module_platform_driver(mmp_driver);
Expand Down
6 changes: 3 additions & 3 deletions sound/soc/pxa/corgi.c
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ static struct snd_soc_card corgi = {
.num_dapm_routes = ARRAY_SIZE(corgi_audio_map),
};

static int __devinit corgi_probe(struct platform_device *pdev)
static int corgi_probe(struct platform_device *pdev)
{
struct snd_soc_card *card = &corgi;
int ret;
Expand All @@ -317,7 +317,7 @@ static int __devinit corgi_probe(struct platform_device *pdev)
return ret;
}

static int __devexit corgi_remove(struct platform_device *pdev)
static int corgi_remove(struct platform_device *pdev)
{
struct snd_soc_card *card = platform_get_drvdata(pdev);

Expand All @@ -331,7 +331,7 @@ static struct platform_driver corgi_driver = {
.owner = THIS_MODULE,
},
.probe = corgi_probe,
.remove = __devexit_p(corgi_remove),
.remove = corgi_remove,
};

module_platform_driver(corgi_driver);
Expand Down
6 changes: 3 additions & 3 deletions sound/soc/pxa/e740_wm9705.c
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ static struct gpio e740_audio_gpios[] = {
{ GPIO_E740_WM9705_nAVDD2, GPIOF_OUT_INIT_HIGH, "Audio power" },
};

static int __devinit e740_probe(struct platform_device *pdev)
static int e740_probe(struct platform_device *pdev)
{
struct snd_soc_card *card = &e740;
int ret;
Expand All @@ -165,7 +165,7 @@ static int __devinit e740_probe(struct platform_device *pdev)
return ret;
}

static int __devexit e740_remove(struct platform_device *pdev)
static int e740_remove(struct platform_device *pdev)
{
struct snd_soc_card *card = platform_get_drvdata(pdev);

Expand All @@ -180,7 +180,7 @@ static struct platform_driver e740_driver = {
.owner = THIS_MODULE,
},
.probe = e740_probe,
.remove = __devexit_p(e740_remove),
.remove = e740_remove,
};

module_platform_driver(e740_driver);
Expand Down
6 changes: 3 additions & 3 deletions sound/soc/pxa/e750_wm9705.c
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ static struct gpio e750_audio_gpios[] = {
{ GPIO_E750_SPK_AMP_OFF, GPIOF_OUT_INIT_HIGH, "Speaker amp" },
};

static int __devinit e750_probe(struct platform_device *pdev)
static int e750_probe(struct platform_device *pdev)
{
struct snd_soc_card *card = &e750;
int ret;
Expand All @@ -147,7 +147,7 @@ static int __devinit e750_probe(struct platform_device *pdev)
return ret;
}

static int __devexit e750_remove(struct platform_device *pdev)
static int e750_remove(struct platform_device *pdev)
{
struct snd_soc_card *card = platform_get_drvdata(pdev);

Expand All @@ -162,7 +162,7 @@ static struct platform_driver e750_driver = {
.owner = THIS_MODULE,
},
.probe = e750_probe,
.remove = __devexit_p(e750_remove),
.remove = e750_remove,
};

module_platform_driver(e750_driver);
Expand Down
6 changes: 3 additions & 3 deletions sound/soc/pxa/e800_wm9712.c
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ static struct gpio e800_audio_gpios[] = {
{ GPIO_E800_HP_AMP_OFF, GPIOF_OUT_INIT_HIGH, "Speaker amp" },
};

static int __devinit e800_probe(struct platform_device *pdev)
static int e800_probe(struct platform_device *pdev)
{
struct snd_soc_card *card = &e800;
int ret;
Expand All @@ -137,7 +137,7 @@ static int __devinit e800_probe(struct platform_device *pdev)
return ret;
}

static int __devexit e800_remove(struct platform_device *pdev)
static int e800_remove(struct platform_device *pdev)
{
struct snd_soc_card *card = platform_get_drvdata(pdev);

Expand All @@ -152,7 +152,7 @@ static struct platform_driver e800_driver = {
.owner = THIS_MODULE,
},
.probe = e800_probe,
.remove = __devexit_p(e800_remove),
.remove = e800_remove,
};

module_platform_driver(e800_driver);
Expand Down
6 changes: 3 additions & 3 deletions sound/soc/pxa/imote2.c
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ static struct snd_soc_card imote2 = {
.num_links = 1,
};

static int __devinit imote2_probe(struct platform_device *pdev)
static int imote2_probe(struct platform_device *pdev)
{
struct snd_soc_card *card = &imote2;
int ret;
Expand All @@ -79,7 +79,7 @@ static int __devinit imote2_probe(struct platform_device *pdev)
return ret;
}

static int __devexit imote2_remove(struct platform_device *pdev)
static int imote2_remove(struct platform_device *pdev)
{
struct snd_soc_card *card = platform_get_drvdata(pdev);

Expand All @@ -93,7 +93,7 @@ static struct platform_driver imote2_driver = {
.owner = THIS_MODULE,
},
.probe = imote2_probe,
.remove = __devexit_p(imote2_remove),
.remove = imote2_remove,
};

module_platform_driver(imote2_driver);
Expand Down
6 changes: 3 additions & 3 deletions sound/soc/pxa/mioa701_wm9713.c
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ static struct snd_soc_card mioa701 = {
.num_links = ARRAY_SIZE(mioa701_dai),
};

static int __devinit mioa701_wm9713_probe(struct platform_device *pdev)
static int mioa701_wm9713_probe(struct platform_device *pdev)
{
int rc;

Expand All @@ -202,7 +202,7 @@ static int __devinit mioa701_wm9713_probe(struct platform_device *pdev)
return rc;
}

static int __devexit mioa701_wm9713_remove(struct platform_device *pdev)
static int mioa701_wm9713_remove(struct platform_device *pdev)
{
struct snd_soc_card *card = platform_get_drvdata(pdev);

Expand All @@ -212,7 +212,7 @@ static int __devexit mioa701_wm9713_remove(struct platform_device *pdev)

static struct platform_driver mioa701_wm9713_driver = {
.probe = mioa701_wm9713_probe,
.remove = __devexit_p(mioa701_wm9713_remove),
.remove = mioa701_wm9713_remove,
.driver = {
.name = "mioa701-wm9713",
.owner = THIS_MODULE,
Expand Down
6 changes: 3 additions & 3 deletions sound/soc/pxa/mmp-pcm.c
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ struct snd_soc_platform_driver mmp_soc_platform = {
.pcm_free = mmp_pcm_free_dma_buffers,
};

static __devinit int mmp_pcm_probe(struct platform_device *pdev)
static int mmp_pcm_probe(struct platform_device *pdev)
{
struct mmp_audio_platdata *pdata = pdev->dev.platform_data;

Expand All @@ -274,7 +274,7 @@ static __devinit int mmp_pcm_probe(struct platform_device *pdev)
return snd_soc_register_platform(&pdev->dev, &mmp_soc_platform);
}

static int __devexit mmp_pcm_remove(struct platform_device *pdev)
static int mmp_pcm_remove(struct platform_device *pdev)
{
snd_soc_unregister_platform(&pdev->dev);
return 0;
Expand All @@ -287,7 +287,7 @@ static struct platform_driver mmp_pcm_driver = {
},

.probe = mmp_pcm_probe,
.remove = __devexit_p(mmp_pcm_remove),
.remove = mmp_pcm_remove,
};

module_platform_driver(mmp_pcm_driver);
Expand Down
6 changes: 3 additions & 3 deletions sound/soc/pxa/mmp-sspa.c
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ struct snd_soc_dai_driver mmp_sspa_dai = {
.ops = &mmp_sspa_dai_ops,
};

static __devinit int asoc_mmp_sspa_probe(struct platform_device *pdev)
static int asoc_mmp_sspa_probe(struct platform_device *pdev)
{
struct sspa_priv *priv;
struct resource *res;
Expand Down Expand Up @@ -453,7 +453,7 @@ static __devinit int asoc_mmp_sspa_probe(struct platform_device *pdev)
return snd_soc_register_dai(&pdev->dev, &mmp_sspa_dai);
}

static int __devexit asoc_mmp_sspa_remove(struct platform_device *pdev)
static int asoc_mmp_sspa_remove(struct platform_device *pdev)
{
struct sspa_priv *priv = platform_get_drvdata(pdev);

Expand All @@ -470,7 +470,7 @@ static struct platform_driver asoc_mmp_sspa_driver = {
.owner = THIS_MODULE,
},
.probe = asoc_mmp_sspa_probe,
.remove = __devexit_p(asoc_mmp_sspa_remove),
.remove = asoc_mmp_sspa_remove,
};

module_platform_driver(asoc_mmp_sspa_driver);
Expand Down
4 changes: 2 additions & 2 deletions sound/soc/pxa/palm27x.c
Original file line number Diff line number Diff line change
Expand Up @@ -187,15 +187,15 @@ static int palm27x_asoc_probe(struct platform_device *pdev)
return ret;
}

static int __devexit palm27x_asoc_remove(struct platform_device *pdev)
static int palm27x_asoc_remove(struct platform_device *pdev)
{
platform_device_unregister(palm27x_snd_device);
return 0;
}

static struct platform_driver palm27x_wm9712_driver = {
.probe = palm27x_asoc_probe,
.remove = __devexit_p(palm27x_asoc_remove),
.remove = palm27x_asoc_remove,
.driver = {
.name = "palm27x-asoc",
.owner = THIS_MODULE,
Expand Down
6 changes: 3 additions & 3 deletions sound/soc/pxa/poodle.c
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ static struct snd_soc_card poodle = {
.num_dapm_routes = ARRAY_SIZE(poodle_audio_map),
};

static int __devinit poodle_probe(struct platform_device *pdev)
static int poodle_probe(struct platform_device *pdev)
{
struct snd_soc_card *card = &poodle;
int ret;
Expand All @@ -291,7 +291,7 @@ static int __devinit poodle_probe(struct platform_device *pdev)
return ret;
}

static int __devexit poodle_remove(struct platform_device *pdev)
static int poodle_remove(struct platform_device *pdev)
{
struct snd_soc_card *card = platform_get_drvdata(pdev);

Expand All @@ -305,7 +305,7 @@ static struct platform_driver poodle_driver = {
.owner = THIS_MODULE,
},
.probe = poodle_probe,
.remove = __devexit_p(poodle_remove),
.remove = poodle_remove,
};

module_platform_driver(poodle_driver);
Expand Down
6 changes: 3 additions & 3 deletions sound/soc/pxa/pxa-ssp.c
Original file line number Diff line number Diff line change
Expand Up @@ -794,12 +794,12 @@ static struct snd_soc_dai_driver pxa_ssp_dai = {
.ops = &pxa_ssp_dai_ops,
};

static __devinit int asoc_ssp_probe(struct platform_device *pdev)
static int asoc_ssp_probe(struct platform_device *pdev)
{
return snd_soc_register_dai(&pdev->dev, &pxa_ssp_dai);
}

static int __devexit asoc_ssp_remove(struct platform_device *pdev)
static int asoc_ssp_remove(struct platform_device *pdev)
{
snd_soc_unregister_dai(&pdev->dev);
return 0;
Expand All @@ -812,7 +812,7 @@ static struct platform_driver asoc_ssp_driver = {
},

.probe = asoc_ssp_probe,
.remove = __devexit_p(asoc_ssp_remove),
.remove = asoc_ssp_remove,
};

module_platform_driver(asoc_ssp_driver);
Expand Down
8 changes: 4 additions & 4 deletions sound/soc/pxa/pxa2xx-ac97.c
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ static int pxa2xx_ac97_resume(struct snd_soc_dai *dai)
#define pxa2xx_ac97_resume NULL
#endif

static int __devinit pxa2xx_ac97_probe(struct snd_soc_dai *dai)
static int pxa2xx_ac97_probe(struct snd_soc_dai *dai)
{
return pxa2xx_ac97_hw_probe(to_platform_device(dai->dev));
}
Expand Down Expand Up @@ -234,7 +234,7 @@ static struct snd_soc_dai_driver pxa_ac97_dai_driver[] = {

EXPORT_SYMBOL_GPL(soc_ac97_ops);

static __devinit int pxa2xx_ac97_dev_probe(struct platform_device *pdev)
static int pxa2xx_ac97_dev_probe(struct platform_device *pdev)
{
if (pdev->id != -1) {
dev_err(&pdev->dev, "PXA2xx has only one AC97 port.\n");
Expand All @@ -249,15 +249,15 @@ static __devinit int pxa2xx_ac97_dev_probe(struct platform_device *pdev)
ARRAY_SIZE(pxa_ac97_dai_driver));
}

static int __devexit pxa2xx_ac97_dev_remove(struct platform_device *pdev)
static int pxa2xx_ac97_dev_remove(struct platform_device *pdev)
{
snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(pxa_ac97_dai_driver));
return 0;
}

static struct platform_driver pxa2xx_ac97_driver = {
.probe = pxa2xx_ac97_dev_probe,
.remove = __devexit_p(pxa2xx_ac97_dev_remove),
.remove = pxa2xx_ac97_dev_remove,
.driver = {
.name = "pxa2xx-ac97",
.owner = THIS_MODULE,
Expand Down
4 changes: 2 additions & 2 deletions sound/soc/pxa/pxa2xx-i2s.c
Original file line number Diff line number Diff line change
Expand Up @@ -365,15 +365,15 @@ static int pxa2xx_i2s_drv_probe(struct platform_device *pdev)
return snd_soc_register_dai(&pdev->dev, &pxa_i2s_dai);
}

static int __devexit pxa2xx_i2s_drv_remove(struct platform_device *pdev)
static int pxa2xx_i2s_drv_remove(struct platform_device *pdev)
{
snd_soc_unregister_dai(&pdev->dev);
return 0;
}

static struct platform_driver pxa2xx_i2s_driver = {
.probe = pxa2xx_i2s_drv_probe,
.remove = __devexit_p(pxa2xx_i2s_drv_remove),
.remove = pxa2xx_i2s_drv_remove,

.driver = {
.name = "pxa2xx-i2s",
Expand Down
6 changes: 3 additions & 3 deletions sound/soc/pxa/pxa2xx-pcm.c
Original file line number Diff line number Diff line change
Expand Up @@ -120,12 +120,12 @@ static struct snd_soc_platform_driver pxa2xx_soc_platform = {
.pcm_free = pxa2xx_pcm_free_dma_buffers,
};

static int __devinit pxa2xx_soc_platform_probe(struct platform_device *pdev)
static int pxa2xx_soc_platform_probe(struct platform_device *pdev)
{
return snd_soc_register_platform(&pdev->dev, &pxa2xx_soc_platform);
}

static int __devexit pxa2xx_soc_platform_remove(struct platform_device *pdev)
static int pxa2xx_soc_platform_remove(struct platform_device *pdev)
{
snd_soc_unregister_platform(&pdev->dev);
return 0;
Expand All @@ -138,7 +138,7 @@ static struct platform_driver pxa_pcm_driver = {
},

.probe = pxa2xx_soc_platform_probe,
.remove = __devexit_p(pxa2xx_soc_platform_remove),
.remove = pxa2xx_soc_platform_remove,
};

module_platform_driver(pxa_pcm_driver);
Expand Down
Loading

0 comments on commit 570f6fe

Please sign in to comment.