sound: struct device - replace bus_id with dev_name(), dev_set_name()
[stripped sound/isa/* changes, replaced with the next patch -- tiwai] Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
b02555c384
commit
bb072bf098
|
@ -176,7 +176,7 @@ int soundbus_add_one(struct soundbus_dev *dev)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
snprintf(dev->ofdev.dev.bus_id, BUS_ID_SIZE, "soundbus:%x", ++devcount);
|
dev_set_name(&dev->ofdev.dev, "soundbus:%x", ++devcount);
|
||||||
dev->ofdev.dev.bus = &soundbus_bus_type;
|
dev->ofdev.dev.bus = &soundbus_bus_type;
|
||||||
return of_device_register(&dev->ofdev);
|
return of_device_register(&dev->ofdev);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1153,7 +1153,7 @@ snd_ml403_ac97cr_create(struct snd_card *card, struct platform_device *pfdev,
|
||||||
/* get irq */
|
/* get irq */
|
||||||
irq = platform_get_irq(pfdev, 0);
|
irq = platform_get_irq(pfdev, 0);
|
||||||
if (request_irq(irq, snd_ml403_ac97cr_irq, IRQF_DISABLED,
|
if (request_irq(irq, snd_ml403_ac97cr_irq, IRQF_DISABLED,
|
||||||
pfdev->dev.bus_id, (void *)ml403_ac97cr)) {
|
dev_name(&pfdev->dev), (void *)ml403_ac97cr)) {
|
||||||
snd_printk(KERN_ERR SND_ML403_AC97CR_DRIVER ": "
|
snd_printk(KERN_ERR SND_ML403_AC97CR_DRIVER ": "
|
||||||
"unable to grab IRQ %d\n",
|
"unable to grab IRQ %d\n",
|
||||||
irq);
|
irq);
|
||||||
|
@ -1166,7 +1166,7 @@ snd_ml403_ac97cr_create(struct snd_card *card, struct platform_device *pfdev,
|
||||||
ml403_ac97cr->irq);
|
ml403_ac97cr->irq);
|
||||||
irq = platform_get_irq(pfdev, 1);
|
irq = platform_get_irq(pfdev, 1);
|
||||||
if (request_irq(irq, snd_ml403_ac97cr_irq, IRQF_DISABLED,
|
if (request_irq(irq, snd_ml403_ac97cr_irq, IRQF_DISABLED,
|
||||||
pfdev->dev.bus_id, (void *)ml403_ac97cr)) {
|
dev_name(&pfdev->dev), (void *)ml403_ac97cr)) {
|
||||||
snd_printk(KERN_ERR SND_ML403_AC97CR_DRIVER ": "
|
snd_printk(KERN_ERR SND_ML403_AC97CR_DRIVER ": "
|
||||||
"unable to grab IRQ %d\n",
|
"unable to grab IRQ %d\n",
|
||||||
irq);
|
irq);
|
||||||
|
|
|
@ -95,7 +95,7 @@ static int soc_ac97_dev_register(struct snd_soc_codec *codec)
|
||||||
codec->ac97->dev.parent = NULL;
|
codec->ac97->dev.parent = NULL;
|
||||||
codec->ac97->dev.release = soc_ac97_device_release;
|
codec->ac97->dev.release = soc_ac97_device_release;
|
||||||
|
|
||||||
snprintf(codec->ac97->dev.bus_id, BUS_ID_SIZE, "%d-%d:%s",
|
dev_set_name(&codec->ac97->dev, "%d-%d:%s",
|
||||||
codec->card->number, 0, codec->name);
|
codec->card->number, 0, codec->name);
|
||||||
err = device_register(&codec->ac97->dev);
|
err = device_register(&codec->ac97->dev);
|
||||||
if (err < 0) {
|
if (err < 0) {
|
||||||
|
|
Loading…
Reference in New Issue