summaryrefslogtreecommitdiff
path: root/sound/firewire/oxfw/oxfw.h
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2014-12-09 00:10:40 +0900
committerTakashi Iwai <tiwai@suse.de>2014-12-10 10:46:46 +0100
commitfec7b7536207897693e708411dcb95909d56c431 (patch)
tree20ddf4a16d5669eaed1f2874cca52ce520a1a7bc /sound/firewire/oxfw/oxfw.h
parenta113ff886b9a6e892dd4107be1fd7883cf020885 (diff)
ALSA: oxfw: Change the way to name card
This is a preparation for more models. In following commit, members of 'struct snd_card' related to name becomes to consists of vendor and model strings in device's config-rom. Current supported devices also has strings in their config rom, but the strings are too long to name sound card, thus this driver still keep hard-coded vendor and model names for them. Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Acked-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire/oxfw/oxfw.h')
-rw-r--r--sound/firewire/oxfw/oxfw.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/firewire/oxfw/oxfw.h b/sound/firewire/oxfw/oxfw.h
index 6164bf3e1f5a..a61c75cbaba8 100644
--- a/sound/firewire/oxfw/oxfw.h
+++ b/sound/firewire/oxfw/oxfw.h
@@ -28,8 +28,8 @@
struct device_info {
const char *driver_name;
- const char *short_name;
- const char *long_name;
+ const char *vendor_name;
+ const char *model_name;
int (*pcm_constraints)(struct snd_pcm_runtime *runtime);
unsigned int mixer_channels;
u8 mute_fb_id;