Skip to content

Commit

Permalink
ALSA: Clean up snd_device_*() codes
Browse files Browse the repository at this point in the history 
A few code cleanups and optimizations.  In addition, drop
snd_device_disconnect() that isn't used at all, and drop the return
values from snd_device_free*().

Another slight difference by this change is that now the device state
will become always SNDRV_DEV_REGISTERED no matter whether dev_register
ops is present or not.  It's for better consistency.  There should be
no impact for the current tree, as the state isn't checked.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Takashi Iwai committed Feb 25, 2014
1 parent 289ca02 commit 72620d6
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 86 deletions.
5 changes: 2 additions & 3 deletions include/sound/core.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -309,10 +309,9 @@ int snd_device_new(struct snd_card *card, enum snd_device_type type,
void *device_data, struct snd_device_ops *ops);
int snd_device_register(struct snd_card *card, void *device_data);
int snd_device_register_all(struct snd_card *card);
int snd_device_disconnect(struct snd_card *card, void *device_data);
int snd_device_disconnect_all(struct snd_card *card);
int snd_device_free(struct snd_card *card, void *device_data);
int snd_device_free_all(struct snd_card *card);
void snd_device_free(struct snd_card *card, void *device_data);
void snd_device_free_all(struct snd_card *card);

/* isadma.c */

Expand Down
128 changes: 49 additions & 79 deletions sound/core/device.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,30 @@ int snd_device_new(struct snd_card *card, enum snd_device_type type,
}
EXPORT_SYMBOL(snd_device_new);

static int __snd_device_disconnect(struct snd_device *dev)
{
if (dev->state == SNDRV_DEV_REGISTERED) {
if (dev->ops->dev_disconnect &&
dev->ops->dev_disconnect(dev))
dev_err(dev->card->dev, "device disconnect failure\n");
dev->state = SNDRV_DEV_DISCONNECTED;
}
return 0;
}

static void __snd_device_free(struct snd_device *dev)
{
/* unlink */
list_del(&dev->list);

__snd_device_disconnect(dev);
if (dev->ops->dev_free) {
if (dev->ops->dev_free(dev))
dev_err(dev->card->dev, "device free failure\n");
}
kfree(dev);
}

static struct snd_device *look_for_dev(struct snd_card *card, void *device_data)
{
struct snd_device *dev;
Expand All @@ -92,71 +116,33 @@ static struct snd_device *look_for_dev(struct snd_card *card, void *device_data)
* Removes the device from the list on the card and invokes the
* callbacks, dev_disconnect and dev_free, corresponding to the state.
* Then release the device.
*
* Return: Zero if successful, or a negative error code on failure or if the
* device not found.
*/
int snd_device_free(struct snd_card *card, void *device_data)
void snd_device_free(struct snd_card *card, void *device_data)
{
struct snd_device *dev;

if (snd_BUG_ON(!card || !device_data))
return -ENXIO;
return;
dev = look_for_dev(card, device_data);
if (dev) {
/* unlink */
list_del(&dev->list);
if (dev->state == SNDRV_DEV_REGISTERED &&
dev->ops->dev_disconnect)
if (dev->ops->dev_disconnect(dev))
dev_err(card->dev,
"device disconnect failure\n");
if (dev->ops->dev_free) {
if (dev->ops->dev_free(dev))
dev_err(card->dev, "device free failure\n");
}
kfree(dev);
return 0;
}
dev_dbg(card->dev, "device free %p (from %pF), not found\n",
device_data, __builtin_return_address(0));
return -ENXIO;
if (dev)
__snd_device_free(dev);
else
dev_dbg(card->dev, "device free %p (from %pF), not found\n",
device_data, __builtin_return_address(0));
}
EXPORT_SYMBOL(snd_device_free);

/**
* snd_device_disconnect - disconnect the device
* @card: the card instance
* @device_data: the data pointer to disconnect
*
* Turns the device into the disconnection state, invoking
* dev_disconnect callback, if the device was already registered.
*
* Usually called from snd_card_disconnect().
*
* Return: Zero if successful, or a negative error code on failure or if the
* device not found.
*/
int snd_device_disconnect(struct snd_card *card, void *device_data)
static int __snd_device_register(struct snd_device *dev)
{
struct snd_device *dev;

if (snd_BUG_ON(!card || !device_data))
return -ENXIO;
dev = look_for_dev(card, device_data);
if (dev) {
if (dev->state == SNDRV_DEV_REGISTERED &&
dev->ops->dev_disconnect) {
if (dev->ops->dev_disconnect(dev))
dev_err(card->dev,
"device disconnect failure\n");
dev->state = SNDRV_DEV_DISCONNECTED;
if (dev->state == SNDRV_DEV_BUILD) {
if (dev->ops->dev_register) {
int err = dev->ops->dev_register(dev);
if (err < 0)
return err;
}
return 0;
dev->state = SNDRV_DEV_REGISTERED;
}
dev_dbg(card->dev, "device disconnect %p (from %pF), not found\n",
device_data, __builtin_return_address(0));
return -ENXIO;
return 0;
}

/**
Expand All @@ -175,21 +161,12 @@ int snd_device_disconnect(struct snd_card *card, void *device_data)
int snd_device_register(struct snd_card *card, void *device_data)
{
struct snd_device *dev;
int err;

if (snd_BUG_ON(!card || !device_data))
return -ENXIO;
dev = look_for_dev(card, device_data);
if (dev) {
if (dev->state == SNDRV_DEV_BUILD && dev->ops->dev_register) {
if ((err = dev->ops->dev_register(dev)) < 0)
return err;
dev->state = SNDRV_DEV_REGISTERED;
return 0;
}
dev_dbg(card->dev, "snd_device_register busy\n");
return -EBUSY;
}
if (dev)
return __snd_device_register(dev);
snd_BUG();
return -ENXIO;
}
Expand All @@ -207,11 +184,9 @@ int snd_device_register_all(struct snd_card *card)
if (snd_BUG_ON(!card))
return -ENXIO;
list_for_each_entry(dev, &card->devices, list) {
if (dev->state == SNDRV_DEV_BUILD && dev->ops->dev_register) {
if ((err = dev->ops->dev_register(dev)) < 0)
return err;
dev->state = SNDRV_DEV_REGISTERED;
}
err = __snd_device_register(dev);
if (err < 0)
return err;
}
return 0;
}
Expand All @@ -228,7 +203,7 @@ int snd_device_disconnect_all(struct snd_card *card)
if (snd_BUG_ON(!card))
return -ENXIO;
list_for_each_entry_reverse(dev, &card->devices, list) {
if (snd_device_disconnect(card, dev->device_data) < 0)
if (__snd_device_disconnect(dev) < 0)
err = -ENXIO;
}
return err;
Expand All @@ -238,17 +213,12 @@ int snd_device_disconnect_all(struct snd_card *card)
* release all the devices on the card.
* called from init.c
*/
int snd_device_free_all(struct snd_card *card)
void snd_device_free_all(struct snd_card *card)
{
struct snd_device *dev, *next;
int ret = 0;

if (snd_BUG_ON(!card))
return -ENXIO;
list_for_each_entry_safe_reverse(dev, next, &card->devices, list) {
int err = snd_device_free(card, dev->device_data);
if (err < 0)
ret = err;
}
return ret;
return;
list_for_each_entry_safe_reverse(dev, next, &card->devices, list)
__snd_device_free(dev);
}
5 changes: 1 addition & 4 deletions sound/core/init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -454,10 +454,7 @@ static int snd_card_do_free(struct snd_card *card)
if (snd_mixer_oss_notify_callback)
snd_mixer_oss_notify_callback(card, SND_MIXER_OSS_NOTIFY_FREE);
#endif
if (snd_device_free_all(card) < 0) {
dev_err(card->dev, "unable to free all devices\n");
/* Fatal, but this situation should never occur */
}
snd_device_free_all(card);
if (card->private_free)
card->private_free(card);
snd_info_free_entry(card->proc_id);
Expand Down

0 comments on commit 72620d6

Please sign in to comment.