ALSA: fireface: rename callback functions

It's cleared that Fireface 400 transmits quadlet message for two purposes
at least; received MIDI messages and notification of knob control
operation. Nevertheless current implementation uses callback function name
just for MIDI messages.

This commit renames the callback functions.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Link: https://lore.kernel.org/r/20230112120954.500692-2-o-takashi@sakamocchi.jp
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/firewire/fireface/ff-protocol-former.c b/sound/firewire/fireface/ff-protocol-former.c
index 8900ffe517ed3fb01ca7b6ebde10707914e8cdc9..16afcb334e3cbfd4d857336bac85fdecf84bd5cf 100644 (file)
--- a/sound/firewire/fireface/ff-protocol-former.c
+++ b/sound/firewire/fireface/ff-protocol-former.c
@@ -402,8 +402,8 @@ static void ff800_finish_session(struct snd_ff *ff)
 // address.
 // A write transaction to clear registered higher 4 bytes of destination address
 // has an effect to suppress asynchronous transaction from device.
-static void ff800_handle_midi_msg(struct snd_ff *ff, unsigned int offset,
-                                 __le32 *buf, size_t length)
+static void ff800_handle_midi_msg(struct snd_ff *ff, unsigned int offset, const __le32 *buf,
+                                 size_t length)
 {
        int i;
 
@@ -418,7 +418,7 @@ static void ff800_handle_midi_msg(struct snd_ff *ff, unsigned int offset,
 }
 
 const struct snd_ff_protocol snd_ff_protocol_ff800 = {
-       .handle_midi_msg        = ff800_handle_midi_msg,
+       .handle_msg             = ff800_handle_midi_msg,
        .fill_midi_msg          = former_fill_midi_msg,
        .get_clock              = former_get_clock,
        .switch_fetching_mode   = former_switch_fetching_mode,
@@ -553,8 +553,8 @@ static void ff400_finish_session(struct snd_ff *ff)
 // input attenuation. This driver allocates destination address with '0000'0000
 // in its lower offset and expects userspace application to configure the
 // register for it.
-static void ff400_handle_midi_msg(struct snd_ff *ff, unsigned int offset,
-                                 __le32 *buf, size_t length)
+static void ff400_handle_msg(struct snd_ff *ff, unsigned int offset, const __le32 *buf,
+                            size_t length)
 {
        int i;
 
@@ -592,7 +592,7 @@ static void ff400_handle_midi_msg(struct snd_ff *ff, unsigned int offset,
 }
 
 const struct snd_ff_protocol snd_ff_protocol_ff400 = {
-       .handle_midi_msg        = ff400_handle_midi_msg,
+       .handle_msg             = ff400_handle_msg,
        .fill_midi_msg          = former_fill_midi_msg,
        .get_clock              = former_get_clock,
        .switch_fetching_mode   = former_switch_fetching_mode,

diff --git a/sound/firewire/fireface/ff-protocol-latter.c b/sound/firewire/fireface/ff-protocol-latter.c
index 76c3eab36d4e07ad34939d7c2e4c8786118e73f1..e7a066fb1eade9f5bab628f51c8aa7d99af1d09d 100644 (file)
--- a/sound/firewire/fireface/ff-protocol-latter.c
+++ b/sound/firewire/fireface/ff-protocol-latter.c
@@ -393,8 +393,8 @@ static void latter_dump_status(struct snd_ff *ff, struct snd_info_buffer *buffer
 // input attenuation. This driver allocates for the first option
 // (0x'....'....'0000'0000) and expects userspace application to configure the
 // register for it.
-static void latter_handle_midi_msg(struct snd_ff *ff, unsigned int offset,
-                                  __le32 *buf, size_t length)
+static void latter_handle_midi_msg(struct snd_ff *ff, unsigned int offset, const __le32 *buf,
+                                  size_t length)
 {
        u32 data = le32_to_cpu(*buf);
        unsigned int index = (data & 0x000000f0) >> 4;
@@ -529,7 +529,7 @@ static int latter_fill_midi_msg(struct snd_ff *ff,
 }
 
 const struct snd_ff_protocol snd_ff_protocol_latter = {
-       .handle_midi_msg        = latter_handle_midi_msg,
+       .handle_msg             = latter_handle_midi_msg,
        .fill_midi_msg          = latter_fill_midi_msg,
        .get_clock              = latter_get_clock,
        .switch_fetching_mode   = latter_switch_fetching_mode,

diff --git a/sound/firewire/fireface/ff-transaction.c b/sound/firewire/fireface/ff-transaction.c
index ee7122c461d46f442cfdea976c337b97ac640bba..764c772a0b1ee0201676393f3722f1389818805b 100644 (file)
--- a/sound/firewire/fireface/ff-transaction.c
+++ b/sound/firewire/fireface/ff-transaction.c
@@ -125,10 +125,9 @@ static void transmit_midi1_msg(struct work_struct *work)
        transmit_midi_msg(ff, 1);
 }
 
-static void handle_midi_msg(struct fw_card *card, struct fw_request *request,
-                           int tcode, int destination, int source,
-                           int generation, unsigned long long offset,
-                           void *data, size_t length, void *callback_data)
+static void handle_msg(struct fw_card *card, struct fw_request *request, int tcode,
+                      int destination, int source, int generation, unsigned long long offset,
+                      void *data, size_t length, void *callback_data)
 {
        struct snd_ff *ff = callback_data;
        __le32 *buf = data;
@@ -136,8 +135,7 @@ static void handle_midi_msg(struct fw_card *card, struct fw_request *request,
        fw_send_response(card, request, RCODE_COMPLETE);
 
        offset -= ff->async_handler.offset;
-       ff->spec->protocol->handle_midi_msg(ff, (unsigned int)offset, buf,
-                                           length);
+       ff->spec->protocol->handle_msg(ff, (unsigned int)offset, buf, length);
 }
 
 static int allocate_own_address(struct snd_ff *ff, int i)
@@ -146,7 +144,7 @@ static int allocate_own_address(struct snd_ff *ff, int i)
        int err;
 
        ff->async_handler.length = ff->spec->midi_addr_range;
-       ff->async_handler.address_callback = handle_midi_msg;
+       ff->async_handler.address_callback = handle_msg;
        ff->async_handler.callback_data = ff;
 
        midi_msg_region.start = 0x000100000000ull * i;

diff --git a/sound/firewire/fireface/ff.h b/sound/firewire/fireface/ff.h
index 0535f0b58b672f616b8cb0683b6370633f697454..0358b444bd01b294688829207ed449f32c8c850b 100644 (file)
--- a/sound/firewire/fireface/ff.h
+++ b/sound/firewire/fireface/ff.h
@@ -110,8 +110,8 @@ enum snd_ff_clock_src {
 };
 
 struct snd_ff_protocol {
-       void (*handle_midi_msg)(struct snd_ff *ff, unsigned int offset,
-                               __le32 *buf, size_t length);
+       void (*handle_msg)(struct snd_ff *ff, unsigned int offset, const __le32 *buf,
+                          size_t length);
        int (*fill_midi_msg)(struct snd_ff *ff,
                             struct snd_rawmidi_substream *substream,
                             unsigned int port);