summaryrefslogtreecommitdiffstats
path: root/sound/firewire/tascam/tascam.h
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2017-04-14 09:46:26 +0200
committerTakashi Iwai <tiwai@suse.de>2017-04-14 14:50:29 +0200
commit9bae2150d0144e0be423367e5385442141979213 (patch)
tree201a54f6e8b31d0cb7fa8c5738a66486af87e068 /sound/firewire/tascam/tascam.h
parentALSA: firewire-lib/firewire-tascam: localize async midi port (diff)
downloadlinux-9bae2150d0144e0be423367e5385442141979213.tar.xz
linux-9bae2150d0144e0be423367e5385442141979213.zip
ALSA: firewire-tascam: remove callback function from async midi port
As a result of localization of async midi port, ALSA driver for TASCAM FireWire series can call helper function directly instead of callback registration. This commit removes the redundant design. Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to '')
-rw-r--r--sound/firewire/tascam/tascam.h9
1 files changed, 1 insertions, 8 deletions
diff --git a/sound/firewire/tascam/tascam.h b/sound/firewire/tascam/tascam.h
index de76313e5d50..116a2003f19e 100644
--- a/sound/firewire/tascam/tascam.h
+++ b/sound/firewire/tascam/tascam.h
@@ -45,11 +45,6 @@ struct snd_tscm_spec {
#define TSCM_MIDI_IN_PORT_MAX 4
#define TSCM_MIDI_OUT_PORT_MAX 4
-struct snd_fw_async_midi_port;
-typedef int (*snd_fw_async_midi_port_fill)(
- struct snd_rawmidi_substream *substream,
- u8 *buf);
-
struct snd_fw_async_midi_port {
struct fw_device *parent;
struct work_struct work;
@@ -64,7 +59,6 @@ struct snd_fw_async_midi_port {
unsigned int len;
struct snd_rawmidi_substream *substream;
- snd_fw_async_midi_port_fill fill;
int consume_bytes;
};
@@ -155,8 +149,7 @@ int snd_tscm_stream_lock_try(struct snd_tscm *tscm);
void snd_tscm_stream_lock_release(struct snd_tscm *tscm);
int snd_fw_async_midi_port_init(struct snd_fw_async_midi_port *port,
- struct fw_unit *unit, u64 addr, unsigned int len,
- snd_fw_async_midi_port_fill fill);
+ struct fw_unit *unit, u64 addr, unsigned int len);
void snd_fw_async_midi_port_destroy(struct snd_fw_async_midi_port *port);
static inline void