Skip to content

Commit

Permalink
ALSA: AACI: 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 <wfp5p@virginia.edu>
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
wfp5p authored and tiwai committed Dec 7, 2012
1 parent e23e7a1 commit 6c9dc19
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions sound/arm/aaci.c
Original file line number Diff line number Diff line change
Expand Up @@ -786,7 +786,7 @@ static int aaci_resume(struct amba_device *dev)
#endif


static struct ac97_pcm ac97_defs[] __devinitdata = {
static struct ac97_pcm ac97_defs[] = {
[0] = { /* Front PCM */
.exclusive = 1,
.r = {
Expand Down Expand Up @@ -832,7 +832,7 @@ static struct snd_ac97_bus_ops aaci_bus_ops = {
.read = aaci_ac97_read,
};

static int __devinit aaci_probe_ac97(struct aaci *aaci)
static int aaci_probe_ac97(struct aaci *aaci)
{
struct snd_ac97_template ac97_template;
struct snd_ac97_bus *ac97_bus;
Expand Down Expand Up @@ -893,7 +893,7 @@ static void aaci_free_card(struct snd_card *card)
iounmap(aaci->base);
}

static struct aaci * __devinit aaci_init_card(struct amba_device *dev)
static struct aaci *aaci_init_card(struct amba_device *dev)
{
struct aaci *aaci;
struct snd_card *card;
Expand Down Expand Up @@ -926,7 +926,7 @@ static struct aaci * __devinit aaci_init_card(struct amba_device *dev)
return aaci;
}

static int __devinit aaci_init_pcm(struct aaci *aaci)
static int aaci_init_pcm(struct aaci *aaci)
{
struct snd_pcm *pcm;
int ret;
Expand All @@ -948,7 +948,7 @@ static int __devinit aaci_init_pcm(struct aaci *aaci)
return ret;
}

static unsigned int __devinit aaci_size_fifo(struct aaci *aaci)
static unsigned int aaci_size_fifo(struct aaci *aaci)
{
struct aaci_runtime *aacirun = &aaci->playback;
int i;
Expand Down Expand Up @@ -984,8 +984,8 @@ static unsigned int __devinit aaci_size_fifo(struct aaci *aaci)
return i;
}

static int __devinit aaci_probe(struct amba_device *dev,
const struct amba_id *id)
static int aaci_probe(struct amba_device *dev,
const struct amba_id *id)
{
struct aaci *aaci;
int ret, i;
Expand Down Expand Up @@ -1072,7 +1072,7 @@ static int __devinit aaci_probe(struct amba_device *dev,
return ret;
}

static int __devexit aaci_remove(struct amba_device *dev)
static int aaci_remove(struct amba_device *dev)
{
struct snd_card *card = amba_get_drvdata(dev);

Expand Down Expand Up @@ -1104,7 +1104,7 @@ static struct amba_driver aaci_driver = {
.name = DRIVER_NAME,
},
.probe = aaci_probe,
.remove = __devexit_p(aaci_remove),
.remove = aaci_remove,
.suspend = aaci_suspend,
.resume = aaci_resume,
.id_table = aaci_ids,
Expand Down

0 comments on commit 6c9dc19

Please sign in to comment.