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>
This commit is contained in:

committed by
Takashi Iwai

parent
e74033a858
commit
32e02a7b69
@@ -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);
|
||||
|
Reference in New Issue
Block a user