hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ALSA: usb-audio: Replace probing flag with active refcount 

We can use active refcount for preventing autopm during probe.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2015-08-26 10:20:59 +02:00
parent 47ab154593
commit a6da499b76
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sound/usb/card.c
View File

@ -371,7 +371,7 @@ static int snd_usb_audio_create(struct usb_interface *intf,
chip->card = card; chip->card = card;
chip->setup = device_setup[idx]; chip->setup = device_setup[idx];
chip->autoclock = autoclock; chip->autoclock = autoclock;
chip->probing = 1; atomic_set(&chip->active, 1); /* avoid autopm during probing */
atomic_set(&chip->usage_count, 0); atomic_set(&chip->usage_count, 0);
atomic_set(&chip->shutdown, 0); atomic_set(&chip->shutdown, 0);
@ -503,7 +503,7 @@ static int usb_audio_probe(struct usb_interface *intf,
goto __error; goto __error;
} }
chip = usb_chip[i]; chip = usb_chip[i];
chip->probing = 1; atomic_inc(&chip->active); /* avoid autopm */
break; break;
} }
} }
@ -563,8 +563,8 @@ static int usb_audio_probe(struct usb_interface *intf,
usb_chip[chip->index] = chip; usb_chip[chip->index] = chip;
chip->num_interfaces++; chip->num_interfaces++;
chip->probing = 0;
usb_set_intfdata(intf, chip); usb_set_intfdata(intf, chip);
atomic_dec(&chip->active);
mutex_unlock(&register_mutex); mutex_unlock(&register_mutex);
return 0; return 0;
@ -572,7 +572,7 @@ static int usb_audio_probe(struct usb_interface *intf,
if (chip) { if (chip) {
if (!chip->num_interfaces) if (!chip->num_interfaces)
snd_card_free(chip->card); snd_card_free(chip->card);
chip->probing = 0; atomic_dec(&chip->active);
} }
mutex_unlock(&register_mutex); mutex_unlock(&register_mutex);
return err; return err;
@ -668,8 +668,6 @@ int snd_usb_autoresume(struct snd_usb_audio *chip)
{ {
if (atomic_read(&chip->shutdown)) if (atomic_read(&chip->shutdown))
return -EIO; return -EIO;
if (chip->probing)
return 0;
if (atomic_inc_return(&chip->active) == 1) if (atomic_inc_return(&chip->active) == 1)
return usb_autopm_get_interface(chip->pm_intf); return usb_autopm_get_interface(chip->pm_intf);
return 0; return 0;
@ -677,8 +675,6 @@ int snd_usb_autoresume(struct snd_usb_audio *chip)
void snd_usb_autosuspend(struct snd_usb_audio *chip) void snd_usb_autosuspend(struct snd_usb_audio *chip)
{ {
if (chip->probing)
return;
if (atomic_dec_and_test(&chip->active)) if (atomic_dec_and_test(&chip->active))
usb_autopm_put_interface(chip->pm_intf); usb_autopm_put_interface(chip->pm_intf);
} }

1
sound/usb/usbaudio.h
View File

@ -37,7 +37,6 @@ struct snd_usb_audio {
struct usb_interface *pm_intf; struct usb_interface *pm_intf;
u32 usb_id; u32 usb_id;
struct mutex mutex; struct mutex mutex;
unsigned int probing:1;
unsigned int autosuspended:1; unsigned int autosuspended:1;
atomic_t active; atomic_t active;
atomic_t shutdown; atomic_t shutdown;