commit 096a957169ff1c31d9d8fbf4e59e45497cfae10d

tjh.dev / kernel

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

sound: struct device - replace bus_id with dev_name(), dev_set_name()

Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
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 17 years ago 096a9571 366840d7

+3 -3

1 changed file

expand all

unified split

sound

pci

ac97

ac97_codec.c

+3 -3

sound/pci/ac97/ac97_codec.c

··· 1927 1927 ac97->dev.bus = &ac97_bus_type; 1928 1928 ac97->dev.parent = ac97->bus->card->dev; 1929 1929 ac97->dev.release = ac97_device_release; 1930 - snprintf(ac97->dev.bus_id, BUS_ID_SIZE, "%d-%d:%s", 1931 - ac97->bus->card->number, ac97->num, 1932 - snd_ac97_get_short_name(ac97)); 1930 + dev_set_name(&ac97->dev, "%d-%d:%s", 1931 + ac97->bus->card->number, ac97->num, 1932 + snd_ac97_get_short_name(ac97)); 1933 1933 if ((err = device_register(&ac97->dev)) < 0) { 1934 1934 snd_printk(KERN_ERR "Can't register ac97 bus\n"); 1935 1935 ac97->dev.bus = NULL;