Browse Source

ALSA: sparc: 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: Takashi Iwai <tiwai@suse.de>
imx_3.10.17_1.0.0_ga
Bill Pemberton 8 years ago
committed by Takashi Iwai
parent
commit
32e02a7b69
3 changed files with 41 additions and 41 deletions
  1. +8
    -8
      sound/sparc/amd7930.c
  2. +19
    -19
      sound/sparc/cs4231.c
  3. +14
    -14
      sound/sparc/dbri.c

+ 8
- 8
sound/sparc/amd7930.c View File

@ -755,7 +755,7 @@ static struct snd_pcm_ops snd_amd7930_capture_ops = {
.pointer = snd_amd7930_capture_pointer,
};
static int __devinit snd_amd7930_pcm(struct snd_amd7930 *amd)
static int snd_amd7930_pcm(struct snd_amd7930 *amd)
{
struct snd_pcm *pcm;
int err;
@ -854,7 +854,7 @@ static int snd_amd7930_put_volume(struct snd_kcontrol *kctl, struct snd_ctl_elem
return change;
}
static struct snd_kcontrol_new amd7930_controls[] __devinitdata = {
static struct snd_kcontrol_new amd7930_controls[] = {
{
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Monitor Volume",
@ -884,7 +884,7 @@ static struct snd_kcontrol_new amd7930_controls[] __devinitdata = {
},
};
static int __devinit snd_amd7930_mixer(struct snd_amd7930 *amd)
static int snd_amd7930_mixer(struct snd_amd7930 *amd)
{
struct snd_card *card;
int idx, err;
@ -933,10 +933,10 @@ static struct snd_device_ops snd_amd7930_dev_ops = {
.dev_free = snd_amd7930_dev_free,
};
static int __devinit snd_amd7930_create(struct snd_card *card,
struct platform_device *op,
int irq, int dev,
struct snd_amd7930 **ramd)
static int snd_amd7930_create(struct snd_card *card,
struct platform_device *op,
int irq, int dev,
struct snd_amd7930 **ramd)
{
struct snd_amd7930 *amd;
unsigned long flags;
@ -1002,7 +1002,7 @@ static int __devinit snd_amd7930_create(struct snd_card *card,
return 0;
}
static int __devinit amd7930_sbus_probe(struct platform_device *op)
static int amd7930_sbus_probe(struct platform_device *op)
{
struct resource *rp = &op->resource[0];
static int dev_num;


+ 19
- 19
sound/sparc/cs4231.c View File

@ -702,7 +702,7 @@ static int snd_cs4231_timer_stop(struct snd_timer *timer)
return 0;
}
static void __devinit snd_cs4231_init(struct snd_cs4231 *chip)
static void snd_cs4231_init(struct snd_cs4231 *chip)
{
unsigned long flags;
@ -1019,7 +1019,7 @@ static snd_pcm_uframes_t snd_cs4231_capture_pointer(
return bytes_to_frames(substream->runtime, ptr);
}
static int __devinit snd_cs4231_probe(struct snd_cs4231 *chip)
static int snd_cs4231_probe(struct snd_cs4231 *chip)
{
unsigned long flags;
int i;
@ -1218,7 +1218,7 @@ static struct snd_pcm_ops snd_cs4231_capture_ops = {
.pointer = snd_cs4231_capture_pointer,
};
static int __devinit snd_cs4231_pcm(struct snd_card *card)
static int snd_cs4231_pcm(struct snd_card *card)
{
struct snd_cs4231 *chip = card->private_data;
struct snd_pcm *pcm;
@ -1247,7 +1247,7 @@ static int __devinit snd_cs4231_pcm(struct snd_card *card)
return 0;
}
static int __devinit snd_cs4231_timer(struct snd_card *card)
static int snd_cs4231_timer(struct snd_card *card)
{
struct snd_cs4231 *chip = card->private_data;
struct snd_timer *timer;
@ -1498,7 +1498,7 @@ static int snd_cs4231_put_double(struct snd_kcontrol *kcontrol,
.private_value = (left_reg) | ((right_reg) << 8) | ((shift_left) << 16) | \
((shift_right) << 19) | ((mask) << 24) | ((invert) << 22) }
static struct snd_kcontrol_new snd_cs4231_controls[] __devinitdata = {
static struct snd_kcontrol_new snd_cs4231_controls[] = {
CS4231_DOUBLE("PCM Playback Switch", 0, CS4231_LEFT_OUTPUT,
CS4231_RIGHT_OUTPUT, 7, 7, 1, 1),
CS4231_DOUBLE("PCM Playback Volume", 0, CS4231_LEFT_OUTPUT,
@ -1537,7 +1537,7 @@ CS4231_SINGLE("Line Out Switch", 0, CS4231_PIN_CTRL, 6, 1, 1),
CS4231_SINGLE("Headphone Out Switch", 0, CS4231_PIN_CTRL, 7, 1, 1)
};
static int __devinit snd_cs4231_mixer(struct snd_card *card)
static int snd_cs4231_mixer(struct snd_card *card)
{
struct snd_cs4231 *chip = card->private_data;
int err, idx;
@ -1558,7 +1558,7 @@ static int __devinit snd_cs4231_mixer(struct snd_card *card)
static int dev;
static int __devinit cs4231_attach_begin(struct snd_card **rcard)
static int cs4231_attach_begin(struct snd_card **rcard)
{
struct snd_card *card;
struct snd_cs4231 *chip;
@ -1589,7 +1589,7 @@ static int __devinit cs4231_attach_begin(struct snd_card **rcard)
return 0;
}
static int __devinit cs4231_attach_finish(struct snd_card *card)
static int cs4231_attach_finish(struct snd_card *card)
{
struct snd_cs4231 *chip = card->private_data;
int err;
@ -1793,9 +1793,9 @@ static struct snd_device_ops snd_cs4231_sbus_dev_ops = {
.dev_free = snd_cs4231_sbus_dev_free,
};
static int __devinit snd_cs4231_sbus_create(struct snd_card *card,
struct platform_device *op,
int dev)
static int snd_cs4231_sbus_create(struct snd_card *card,
struct platform_device *op,
int dev)
{
struct snd_cs4231 *chip = card->private_data;
int err;
@ -1856,7 +1856,7 @@ static int __devinit snd_cs4231_sbus_create(struct snd_card *card,
return 0;
}
static int __devinit cs4231_sbus_probe(struct platform_device *op)
static int cs4231_sbus_probe(struct platform_device *op)
{
struct resource *rp = &op->resource[0];
struct snd_card *card;
@ -1959,9 +1959,9 @@ static struct snd_device_ops snd_cs4231_ebus_dev_ops = {
.dev_free = snd_cs4231_ebus_dev_free,
};
static int __devinit snd_cs4231_ebus_create(struct snd_card *card,
struct platform_device *op,
int dev)
static int snd_cs4231_ebus_create(struct snd_card *card,
struct platform_device *op,
int dev)
{
struct snd_cs4231 *chip = card->private_data;
int err;
@ -2048,7 +2048,7 @@ static int __devinit snd_cs4231_ebus_create(struct snd_card *card,
return 0;
}
static int __devinit cs4231_ebus_probe(struct platform_device *op)
static int cs4231_ebus_probe(struct platform_device *op)
{
struct snd_card *card;
int err;
@ -2072,7 +2072,7 @@ static int __devinit cs4231_ebus_probe(struct platform_device *op)
}
#endif
static int __devinit cs4231_probe(struct platform_device *op)
static int cs4231_probe(struct platform_device *op)
{
#ifdef EBUS_SUPPORT
if (!strcmp(op->dev.of_node->parent->name, "ebus"))
@ -2086,7 +2086,7 @@ static int __devinit cs4231_probe(struct platform_device *op)
return -ENODEV;
}
static int __devexit cs4231_remove(struct platform_device *op)
static int cs4231_remove(struct platform_device *op)
{
struct snd_cs4231 *chip = dev_get_drvdata(&op->dev);
@ -2115,7 +2115,7 @@ static struct platform_driver cs4231_driver = {
.of_match_table = cs4231_match,
},
.probe = cs4231_probe,
.remove = __devexit_p(cs4231_remove),
.remove = cs4231_remove,
};
module_platform_driver(cs4231_driver);

+ 14
- 14
sound/sparc/dbri.c View File

@ -745,7 +745,7 @@ static void dbri_reset(struct snd_dbri *dbri)
}
/* Lock must not be held before calling this */
static void __devinit dbri_initialize(struct snd_dbri *dbri)
static void dbri_initialize(struct snd_dbri *dbri)
{
s32 *cmd;
u32 dma_addr;
@ -1305,7 +1305,7 @@ to the DBRI via the CHI interface and few of the DBRI's PIO pins.
* Lock must not be held before calling it.
*/
static __devinit void cs4215_setup_pipes(struct snd_dbri *dbri)
static void cs4215_setup_pipes(struct snd_dbri *dbri)
{
unsigned long flags;
@ -1338,7 +1338,7 @@ static __devinit void cs4215_setup_pipes(struct snd_dbri *dbri)
dbri_cmdwait(dbri);
}
static __devinit int cs4215_init_data(struct cs4215 *mm)
static int cs4215_init_data(struct cs4215 *mm)
{
/*
* No action, memory resetting only.
@ -1630,7 +1630,7 @@ static int cs4215_prepare(struct snd_dbri *dbri, unsigned int rate,
/*
*
*/
static __devinit int cs4215_init(struct snd_dbri *dbri)
static int cs4215_init(struct snd_dbri *dbri)
{
u32 reg2 = sbus_readl(dbri->regs + REG2);
dprintk(D_MM, "cs4215_init: reg2=0x%x\n", reg2);
@ -2217,7 +2217,7 @@ static struct snd_pcm_ops snd_dbri_ops = {
.pointer = snd_dbri_pointer,
};
static int __devinit snd_dbri_pcm(struct snd_card *card)
static int snd_dbri_pcm(struct snd_card *card)
{
struct snd_pcm *pcm;
int err;
@ -2409,7 +2409,7 @@ static int snd_cs4215_put_single(struct snd_kcontrol *kcontrol,
.private_value = (entry) | ((shift) << 8) | ((mask) << 16) | \
((invert) << 24) },
static struct snd_kcontrol_new dbri_controls[] __devinitdata = {
static struct snd_kcontrol_new dbri_controls[] = {
{
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Playback Volume",
@ -2436,7 +2436,7 @@ static struct snd_kcontrol_new dbri_controls[] __devinitdata = {
CS4215_SINGLE("Mic boost", 4, 4, 1, 1)
};
static int __devinit snd_dbri_mixer(struct snd_card *card)
static int snd_dbri_mixer(struct snd_card *card)
{
int idx, err;
struct snd_dbri *dbri;
@ -2500,7 +2500,7 @@ static void dbri_debug_read(struct snd_info_entry *entry,
}
#endif
static void __devinit snd_dbri_proc(struct snd_card *card)
static void snd_dbri_proc(struct snd_card *card)
{
struct snd_dbri *dbri = card->private_data;
struct snd_info_entry *entry;
@ -2523,9 +2523,9 @@ static void __devinit snd_dbri_proc(struct snd_card *card)
*/
static void snd_dbri_free(struct snd_dbri *dbri);
static int __devinit snd_dbri_create(struct snd_card *card,
struct platform_device *op,
int irq, int dev)
static int snd_dbri_create(struct snd_card *card,
struct platform_device *op,
int irq, int dev)
{
struct snd_dbri *dbri = card->private_data;
int err;
@ -2593,7 +2593,7 @@ static void snd_dbri_free(struct snd_dbri *dbri)
(void *)dbri->dma, dbri->dma_dvma);
}
static int __devinit dbri_probe(struct platform_device *op)
static int dbri_probe(struct platform_device *op)
{
struct snd_dbri *dbri;
struct resource *rp;
@ -2663,7 +2663,7 @@ _err:
return err;
}
static int __devexit dbri_remove(struct platform_device *op)
static int dbri_remove(struct platform_device *op)
{
struct snd_card *card = dev_get_drvdata(&op->dev);
@ -2694,7 +2694,7 @@ static struct platform_driver dbri_sbus_driver = {
.of_match_table = dbri_match,
},
.probe = dbri_probe,
.remove = __devexit_p(dbri_remove),
.remove = dbri_remove,
};
module_platform_driver(dbri_sbus_driver);

Loading…
Cancel
Save