summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2008-11-02 03:50:35 +0100
committerTakashi Iwai <tiwai@suse.de>2008-11-03 08:57:33 +0100
commitbb072bf0980abbe4fc905df91857a8ad34ca673c (patch)
tree8468d4060e37b785c05804590d90a4c23747fa66 /sound/soc
parentb02555c3845f02924b8224ff1fd9a44f2c144dbb (diff)
downloadop-kernel-dev-bb072bf0980abbe4fc905df91857a8ad34ca673c.zip
op-kernel-dev-bb072bf0980abbe4fc905df91857a8ad34ca673c.tar.gz
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>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/soc-core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 462e635d..0af3bbd 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -95,8 +95,8 @@ static int soc_ac97_dev_register(struct snd_soc_codec *codec)
codec->ac97->dev.parent = NULL;
codec->ac97->dev.release = soc_ac97_device_release;
- snprintf(codec->ac97->dev.bus_id, BUS_ID_SIZE, "%d-%d:%s",
- codec->card->number, 0, codec->name);
+ dev_set_name(&codec->ac97->dev, "%d-%d:%s",
+ codec->card->number, 0, codec->name);
err = device_register(&codec->ac97->dev);
if (err < 0) {
snd_printk(KERN_ERR "Can't register ac97 bus\n");
OpenPOWER on IntegriCloud