tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by Kay Sievers and committed by Takashi Iwai bb072bf0 b02555c3

+5 -5
unified split
+1 -1
sound/aoa/soundbus/core.c
··· 176 return -EINVAL; 177 } 178 179 - snprintf(dev->ofdev.dev.bus_id, BUS_ID_SIZE, "soundbus:%x", ++devcount); 180 dev->ofdev.dev.bus = &soundbus_bus_type; 181 return of_device_register(&dev->ofdev); 182 }
··· 176 return -EINVAL; 177 } 178 179 + dev_set_name(&dev->ofdev.dev, "soundbus:%x", ++devcount); 180 dev->ofdev.dev.bus = &soundbus_bus_type; 181 return of_device_register(&dev->ofdev); 182 }
+2 -2
sound/drivers/ml403-ac97cr.c
··· 1153 /* get irq */ 1154 irq = platform_get_irq(pfdev, 0); 1155 if (request_irq(irq, snd_ml403_ac97cr_irq, IRQF_DISABLED, 1156 - pfdev->dev.bus_id, (void *)ml403_ac97cr)) { 1157 snd_printk(KERN_ERR SND_ML403_AC97CR_DRIVER ": " 1158 "unable to grab IRQ %d\n", 1159 irq); ··· 1166 ml403_ac97cr->irq); 1167 irq = platform_get_irq(pfdev, 1); 1168 if (request_irq(irq, snd_ml403_ac97cr_irq, IRQF_DISABLED, 1169 - pfdev->dev.bus_id, (void *)ml403_ac97cr)) { 1170 snd_printk(KERN_ERR SND_ML403_AC97CR_DRIVER ": " 1171 "unable to grab IRQ %d\n", 1172 irq);
··· 1153 /* get irq */ 1154 irq = platform_get_irq(pfdev, 0); 1155 if (request_irq(irq, snd_ml403_ac97cr_irq, IRQF_DISABLED, 1156 + dev_name(&pfdev->dev), (void *)ml403_ac97cr)) { 1157 snd_printk(KERN_ERR SND_ML403_AC97CR_DRIVER ": " 1158 "unable to grab IRQ %d\n", 1159 irq); ··· 1166 ml403_ac97cr->irq); 1167 irq = platform_get_irq(pfdev, 1); 1168 if (request_irq(irq, snd_ml403_ac97cr_irq, IRQF_DISABLED, 1169 + dev_name(&pfdev->dev), (void *)ml403_ac97cr)) { 1170 snd_printk(KERN_ERR SND_ML403_AC97CR_DRIVER ": " 1171 "unable to grab IRQ %d\n", 1172 irq);
+2 -2
sound/soc/soc-core.c
··· 95 codec->ac97->dev.parent = NULL; 96 codec->ac97->dev.release = soc_ac97_device_release; 97 98 - snprintf(codec->ac97->dev.bus_id, BUS_ID_SIZE, "%d-%d:%s", 99 - codec->card->number, 0, codec->name); 100 err = device_register(&codec->ac97->dev); 101 if (err < 0) { 102 snd_printk(KERN_ERR "Can't register ac97 bus\n");
··· 95 codec->ac97->dev.parent = NULL; 96 codec->ac97->dev.release = soc_ac97_device_release; 97 98 + dev_set_name(&codec->ac97->dev, "%d-%d:%s", 99 + codec->card->number, 0, codec->name); 100 err = device_register(&codec->ac97->dev); 101 if (err < 0) { 102 snd_printk(KERN_ERR "Can't register ac97 bus\n");