[alsa-devel] [PATCH 0/4] ALSA: firewire: some trivial fixes
Hi,
This patchset includes some trivial fixes for ALSA firewire stack. I don't mind to postpone them to 4.7 instead of 4.6-rc2.
Regards
Takashi Sakamoto (4): ALSA: bebob: remove needless argument from local function ALSA: oxfw: remove needless member from private structure ALSA: fireworks: move model quirk detection code to information parser ALSA: firewire-tascam: add Kconfig entry for TASCAM FW-1804
sound/firewire/Kconfig | 1 + sound/firewire/bebob/bebob.c | 4 ++-- sound/firewire/fireworks/fireworks.c | 21 +++++++++++---------- sound/firewire/oxfw/oxfw.h | 1 - 4 files changed, 14 insertions(+), 13 deletions(-)
The 'vendor_id' argument is not used in the local function. Let's remove it.
Signed-off-by: Takashi Sakamoto o-takashi@sakamocchi.jp --- sound/firewire/bebob/bebob.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/firewire/bebob/bebob.c b/sound/firewire/bebob/bebob.c index 3e4e075..932901d 100644 --- a/sound/firewire/bebob/bebob.c +++ b/sound/firewire/bebob/bebob.c @@ -67,7 +67,7 @@ static DECLARE_BITMAP(devices_used, SNDRV_CARDS); #define MODEL_MAUDIO_PROJECTMIX 0x00010091
static int -name_device(struct snd_bebob *bebob, unsigned int vendor_id) +name_device(struct snd_bebob *bebob) { struct fw_device *fw_dev = fw_parent_device(bebob->unit); char vendor[24] = {0}; @@ -232,7 +232,7 @@ bebob_probe(struct fw_unit *unit, spin_lock_init(&bebob->lock); init_waitqueue_head(&bebob->hwdep_wait);
- err = name_device(bebob, entry->vendor_id); + err = name_device(bebob); if (err < 0) goto error;
In former commit, 'struct device_info' is obsoleted, whereas private structure still keeps a pointer to it.
This commit remove the member.
d6ce6bbd7d83('ALSA: oxfw: rename a structure so that it means backward compatibility to old drivers')
Signed-off-by: Takashi Sakamoto o-takashi@sakamocchi.jp --- sound/firewire/oxfw/oxfw.h | 1 - 1 file changed, 1 deletion(-)
diff --git a/sound/firewire/oxfw/oxfw.h b/sound/firewire/oxfw/oxfw.h index 9beecc2..2c84714e 100644 --- a/sound/firewire/oxfw/oxfw.h +++ b/sound/firewire/oxfw/oxfw.h @@ -36,7 +36,6 @@ struct snd_oxfw { struct snd_card *card; struct fw_unit *unit; - const struct device_info *device_info; struct mutex mutex; spinlock_t lock;
Currently, model-specific quirks are detected out of information parser, however it's natural to detect it in the parser.
This commit applies the idea.
Signed-off-by: Takashi Sakamoto o-takashi@sakamocchi.jp --- sound/firewire/fireworks/fireworks.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/sound/firewire/fireworks/fireworks.c b/sound/firewire/fireworks/fireworks.c index 8f27b67..8380fb5 100644 --- a/sound/firewire/fireworks/fireworks.c +++ b/sound/firewire/fireworks/fireworks.c @@ -168,6 +168,17 @@ get_hardware_info(struct snd_efw *efw) sizeof(struct snd_efw_phys_grp) * hwinfo->phys_in_grp_count); memcpy(&efw->phys_out_grps, hwinfo->phys_out_grps, sizeof(struct snd_efw_phys_grp) * hwinfo->phys_out_grp_count); + + /* AudioFire8 (since 2009) and AudioFirePre8 */ + if (hwinfo->type == MODEL_ECHO_AUDIOFIRE_9) + efw->is_af9 = true; + /* These models uses the same firmware. */ + if (hwinfo->type == MODEL_ECHO_AUDIOFIRE_2 || + hwinfo->type == MODEL_ECHO_AUDIOFIRE_4 || + hwinfo->type == MODEL_ECHO_AUDIOFIRE_9 || + hwinfo->type == MODEL_GIBSON_RIP || + hwinfo->type == MODEL_GIBSON_GOLDTOP) + efw->is_fireworks3 = true; end: kfree(hwinfo); return err; @@ -248,16 +259,6 @@ efw_probe(struct fw_unit *unit, err = get_hardware_info(efw); if (err < 0) goto error; - /* AudioFire8 (since 2009) and AudioFirePre8 */ - if (entry->model_id == MODEL_ECHO_AUDIOFIRE_9) - efw->is_af9 = true; - /* These models uses the same firmware. */ - if (entry->model_id == MODEL_ECHO_AUDIOFIRE_2 || - entry->model_id == MODEL_ECHO_AUDIOFIRE_4 || - entry->model_id == MODEL_ECHO_AUDIOFIRE_9 || - entry->model_id == MODEL_GIBSON_RIP || - entry->model_id == MODEL_GIBSON_GOLDTOP) - efw->is_fireworks3 = true;
snd_efw_proc_init(efw);
I forgot it.
Fixes: 3e78e1518e12('ALSA: firewire-tascam: add support for FW-1804') Signed-off-by: Takashi Sakamoto o-takashi@sakamocchi.jp --- sound/firewire/Kconfig | 1 + 1 file changed, 1 insertion(+)
diff --git a/sound/firewire/Kconfig b/sound/firewire/Kconfig index 2a779c2..ab894ed 100644 --- a/sound/firewire/Kconfig +++ b/sound/firewire/Kconfig @@ -134,6 +134,7 @@ config SND_FIREWIRE_TASCAM Say Y here to include support for TASCAM. * FW-1884 * FW-1082 + * FW-1804
To compile this driver as a module, choose M here: the module will be called snd-firewire-tascam.
On Sun, 27 Mar 2016 09:09:05 +0200, Takashi Sakamoto wrote:
Hi,
This patchset includes some trivial fixes for ALSA firewire stack. I don't mind to postpone them to 4.7 instead of 4.6-rc2.
As these are all minor code cleanups, I queued them to for-next branch now.
thanks,
Takashi
Regards
Takashi Sakamoto (4): ALSA: bebob: remove needless argument from local function ALSA: oxfw: remove needless member from private structure ALSA: fireworks: move model quirk detection code to information parser ALSA: firewire-tascam: add Kconfig entry for TASCAM FW-1804
sound/firewire/Kconfig | 1 + sound/firewire/bebob/bebob.c | 4 ++-- sound/firewire/fireworks/fireworks.c | 21 +++++++++++---------- sound/firewire/oxfw/oxfw.h | 1 - 4 files changed, 14 insertions(+), 13 deletions(-)
-- 2.7.3
participants (2)
-
Takashi Iwai -
Takashi Sakamoto