summaryrefslogtreecommitdiff
path: root/sound/firewire/fireface/ff.c
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2018-12-16 17:32:33 +0900
committerTakashi Iwai <tiwai@suse.de>2018-12-16 10:18:31 +0100
commit6d1ef1bbfed5f903aaab743a08bde41cc372d646 (patch)
tree4d48405c13e0ddb55e0db09552ac369d6195eb0d /sound/firewire/fireface/ff.c
parentfc716397a5c7a20247a39c9347fb7a543e0ae4ad (diff)
ALSA: fireface: code refactoring to handle model-specific registers
As a result of investigation for Fireface 800, 'struct snd_ff_spec.regs' is just for higher address to receive tx asynchronous packets of MIDI messages, thus it can be simplified. This commit simplifies it. Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire/fireface/ff.c')
-rw-r--r--sound/firewire/fireface/ff.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/sound/firewire/fireface/ff.c b/sound/firewire/fireface/ff.c
index f7a752930060..36575f4159d1 100644
--- a/sound/firewire/fireface/ff.c
+++ b/sound/firewire/fireface/ff.c
@@ -152,9 +152,7 @@ static const struct snd_ff_spec spec_ff800 = {
.midi_in_ports = 1,
.midi_out_ports = 1,
.protocol = &snd_ff_protocol_ff800,
- .regs = {
- [SND_FF_REG_TYPE_MIDI_HIGH_ADDR] = 0x000200000320ull,
- },
+ .midi_high_addr = 0x000200000320ull,
};
static const struct snd_ff_spec spec_ff400 = {
@@ -164,9 +162,7 @@ static const struct snd_ff_spec spec_ff400 = {
.midi_in_ports = 2,
.midi_out_ports = 2,
.protocol = &snd_ff_protocol_ff400,
- .regs = {
- [SND_FF_REG_TYPE_MIDI_HIGH_ADDR] = 0x0000801003f4ull,
- },
+ .midi_high_addr = 0x0000801003f4ull,
};
static const struct ieee1394_device_id snd_ff_id_table[] = {