Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 22:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

ALSA: firewire-tascam: cease from delayed card registration

Browse Source 
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-7-o-takashi@sakamocchi.jp
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Sakamoto 2021-06-07 17:12:47 +09:00 committed by Takashi Iwai
parent 9067c181c3
commit 7ae2f179a4
2 changed files with 28 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
sound/firewire/tascam/tascam.c
View File

@ -90,19 +90,31 @@ static void tscm_card_free(struct snd_card *card)
snd_tscm_transaction_unregister(tscm);
snd_tscm_stream_destroy_duplex(tscm);
mutex_destroy(&tscm->mutex);
fw_unit_put(tscm->unit);
}
static void do_registration(struct work_struct *work)
static int snd_tscm_probe(struct fw_unit *unit,
const struct ieee1394_device_id *entry)
{
struct snd_tscm *tscm = container_of(work, struct snd_tscm, dwork.work);
struct snd_card *card;
struct snd_tscm *tscm;
int err;
err = snd_card_new(&tscm->unit->device, -1, NULL, THIS_MODULE, 0,
&tscm->card);
err = snd_card_new(&unit->device, -1, NULL, THIS_MODULE, sizeof(*tscm), &card);
if (err < 0)
return;
tscm->card->private_free = tscm_card_free;
tscm->card->private_data = tscm;
return err;
card->private_free = tscm_card_free;
tscm = card->private_data;
tscm->unit = fw_unit_get(unit);
dev_set_drvdata(&unit->device, tscm);
tscm->card = card;
mutex_init(&tscm->mutex);
spin_lock_init(&tscm->lock);
init_waitqueue_head(&tscm->hwdep_wait);
err = identify_model(tscm);
if (err < 0)
@ -130,81 +142,33 @@ static void do_registration(struct work_struct *work)
if (err < 0)
goto error;
err = snd_card_register(tscm->card);
err = snd_card_register(card);
if (err < 0)
goto error;
tscm->registered = true;
return;
error:
snd_card_free(tscm->card);
dev_info(&tscm->unit->device,
"Sound card registration failed: %d\n", err);
}
static int snd_tscm_probe(struct fw_unit *unit,
const struct ieee1394_device_id *entry)
{
struct snd_tscm *tscm;
/* Allocate this independent of sound card instance. */
tscm = devm_kzalloc(&unit->device, sizeof(struct snd_tscm), GFP_KERNEL);
if (!tscm)
return -ENOMEM;
tscm->unit = fw_unit_get(unit);
dev_set_drvdata(&unit->device, tscm);
mutex_init(&tscm->mutex);
spin_lock_init(&tscm->lock);
init_waitqueue_head(&tscm->hwdep_wait);
/* Allocate and register this sound card later. */
INIT_DEFERRABLE_WORK(&tscm->dwork, do_registration);
snd_fw_schedule_registration(unit, &tscm->dwork);
return 0;
error:
snd_card_free(card);
return err;
}
static void snd_tscm_update(struct fw_unit *unit)
{
struct snd_tscm *tscm = dev_get_drvdata(&unit->device);
/* Postpone a workqueue for deferred registration. */
if (!tscm->registered)
snd_fw_schedule_registration(unit, &tscm->dwork);
snd_tscm_transaction_reregister(tscm);
/*
* After registration, userspace can start packet streaming, then this
* code block works fine.
*/
if (tscm->registered) {
mutex_lock(&tscm->mutex);
snd_tscm_stream_update_duplex(tscm);
mutex_unlock(&tscm->mutex);
}
mutex_lock(&tscm->mutex);
snd_tscm_stream_update_duplex(tscm);
mutex_unlock(&tscm->mutex);
}
static void snd_tscm_remove(struct fw_unit *unit)
{
struct snd_tscm *tscm = dev_get_drvdata(&unit->device);
/*
* Confirm to stop the work for registration before the sound card is
* going to be released. The work is not scheduled again because bus
* reset handler is not called anymore.
*/
cancel_delayed_work_sync(&tscm->dwork);
if (tscm->registered) {
// Block till all of ALSA character devices are released.
snd_card_free(tscm->card);
}
mutex_destroy(&tscm->mutex);
fw_unit_put(tscm->unit);
// Block till all of ALSA character devices are released.
snd_card_free(tscm->card);
}
static const struct ieee1394_device_id snd_tscm_id_table[] = {

2
sound/firewire/tascam/tascam.h
View File

@ -70,8 +70,6 @@ struct snd_tscm {
struct mutex mutex;
spinlock_t lock;
bool registered;
struct delayed_work dwork;
const struct snd_tscm_spec *spec;
struct fw_iso_resources tx_resources;