summaryrefslogtreecommitdiffstats
path: root/sound/core
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-01-29 15:13:33 +0100
committerTakashi Iwai <tiwai@suse.de>2014-02-14 08:20:24 +0100
commit9ce5054363c6ec7e38d0c6c39bd116ec4f7d6480 (patch)
tree59373036dbcc458c5016a36af771ed05b0dde7be /sound/core
parent483eb0627683b840d8f74fc0bb75be9132e76cd2 (diff)
downloadlinux-9ce5054363c6ec7e38d0c6c39bd116ec4f7d6480.tar.gz
linux-9ce5054363c6ec7e38d0c6c39bd116ec4f7d6480.tar.bz2
linux-9ce5054363c6ec7e38d0c6c39bd116ec4f7d6480.zip
ALSA: Drop __bitwise and typedefs for snd_device attributes
Using __bitwise and typedefs for the attributes of snd_device struct isn't so useful, and rather it worsens the readability. Let's drop them and use the straightforward enum. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core')
-rw-r--r--sound/core/device.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/core/device.c b/sound/core/device.c
index ad9869dfa10c..856bfdc79cee 100644
--- a/sound/core/device.c
+++ b/sound/core/device.c
@@ -41,7 +41,7 @@
*
* Return: Zero if successful, or a negative error code on failure.
*/
-int snd_device_new(struct snd_card *card, snd_device_type_t type,
+int snd_device_new(struct snd_card *card, enum snd_device_type type,
void *device_data, struct snd_device_ops *ops)
{
struct snd_device *dev;
@@ -223,7 +223,7 @@ 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, snd_device_cmd_t cmd)
+int snd_device_free_all(struct snd_card *card, enum snd_device_cmd cmd)
{
struct snd_device *dev;
int err;
@@ -231,11 +231,11 @@ int snd_device_free_all(struct snd_card *card, snd_device_cmd_t cmd)
if (snd_BUG_ON(!card))
return -ENXIO;
- range_low = (__force unsigned int)cmd * SNDRV_DEV_TYPE_RANGE_SIZE;
+ range_low = (unsigned int)cmd * SNDRV_DEV_TYPE_RANGE_SIZE;
range_high = range_low + SNDRV_DEV_TYPE_RANGE_SIZE - 1;
__again:
list_for_each_entry(dev, &card->devices, list) {
- type = (__force unsigned int)dev->type;
+ type = (unsigned int)dev->type;
if (type >= range_low && type <= range_high) {
if ((err = snd_device_free(card, dev->device_data)) < 0)
return err;