summaryrefslogtreecommitdiff
path: root/sound/firewire/oxfw/oxfw.h
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2021-06-07 11:12:44 +0300
committerTakashi Iwai <tiwai@suse.de>2021-06-07 18:14:08 +0300
commitb566e972f59443adfd9b5d0cea83c2c0cf1e1bdc (patch)
tree2a5fcadee0d821963241e4bbc8182a0bd221fd06 /sound/firewire/oxfw/oxfw.h
parentd42dca6b469f538c646431772ceda05bacbe5e1e (diff)
downloadlinux-b566e972f59443adfd9b5d0cea83c2c0cf1e1bdc.tar.xz
ALSA: oxfw: cease from delayed card registration
The delayed registration of sound card instance brings less benefit than complication of kobject management. This commit ceases from it. Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Link: https://lore.kernel.org/r/20210607081250.13397-4-o-takashi@sakamocchi.jp Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire/oxfw/oxfw.h')
-rw-r--r--sound/firewire/oxfw/oxfw.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/firewire/oxfw/oxfw.h b/sound/firewire/oxfw/oxfw.h
index 853135b5002d..ee47abcb0c90 100644
--- a/sound/firewire/oxfw/oxfw.h
+++ b/sound/firewire/oxfw/oxfw.h
@@ -40,6 +40,8 @@ enum snd_oxfw_quirk {
SND_OXFW_QUIRK_WRONG_DBS = 0x02,
// Blocking transmission mode is used.
SND_OXFW_QUIRK_BLOCKING_TRANSMISSION = 0x04,
+ // Stanton SCS1.d and SCS1.m support unique transaction.
+ SND_OXFW_QUIRK_SCS_TRANSACTION = 0x08,
};
/* This is an arbitrary number for convinience. */
@@ -50,9 +52,6 @@ struct snd_oxfw {
struct mutex mutex;
spinlock_t lock;
- bool registered;
- struct delayed_work dwork;
-
// The combination of snd_oxfw_quirk enumeration-constants.
unsigned int quirks;
bool has_output;
@@ -73,7 +72,6 @@ struct snd_oxfw {
bool dev_lock_changed;
wait_queue_head_t hwdep_wait;
- const struct ieee1394_device_id *entry;
void *spec;
struct amdtp_domain domain;