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>

diff --git a/include/sound/core.h b/include/sound/core.h
index 4519dac98363e8f3bacc3445ebade7f97034a73c..a3e3e89b63b659425fff834892e7db86e667f67d 100644 (file)
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -48,32 +48,35 @@ struct completion;
 
 #define SNDRV_DEV_TYPE_RANGE_SIZE              0x1000
 
-typedef int __bitwise snd_device_type_t;
-#define        SNDRV_DEV_TOPLEVEL      ((__force snd_device_type_t) 0)
-#define        SNDRV_DEV_CONTROL       ((__force snd_device_type_t) 1)
-#define        SNDRV_DEV_LOWLEVEL_PRE  ((__force snd_device_type_t) 2)
-#define        SNDRV_DEV_LOWLEVEL_NORMAL ((__force snd_device_type_t) 0x1000)
-#define        SNDRV_DEV_PCM           ((__force snd_device_type_t) 0x1001)
-#define        SNDRV_DEV_RAWMIDI       ((__force snd_device_type_t) 0x1002)
-#define        SNDRV_DEV_TIMER         ((__force snd_device_type_t) 0x1003)
-#define        SNDRV_DEV_SEQUENCER     ((__force snd_device_type_t) 0x1004)
-#define        SNDRV_DEV_HWDEP         ((__force snd_device_type_t) 0x1005)
-#define        SNDRV_DEV_INFO          ((__force snd_device_type_t) 0x1006)
-#define        SNDRV_DEV_BUS           ((__force snd_device_type_t) 0x1007)
-#define        SNDRV_DEV_CODEC         ((__force snd_device_type_t) 0x1008)
-#define        SNDRV_DEV_JACK          ((__force snd_device_type_t) 0x1009)
-#define        SNDRV_DEV_COMPRESS      ((__force snd_device_type_t) 0x100A)
-#define        SNDRV_DEV_LOWLEVEL      ((__force snd_device_type_t) 0x2000)
-
-typedef int __bitwise snd_device_state_t;
-#define        SNDRV_DEV_BUILD         ((__force snd_device_state_t) 0)
-#define        SNDRV_DEV_REGISTERED    ((__force snd_device_state_t) 1)
-#define        SNDRV_DEV_DISCONNECTED  ((__force snd_device_state_t) 2)
-
-typedef int __bitwise snd_device_cmd_t;
-#define        SNDRV_DEV_CMD_PRE       ((__force snd_device_cmd_t) 0)
-#define        SNDRV_DEV_CMD_NORMAL    ((__force snd_device_cmd_t) 1)  
-#define        SNDRV_DEV_CMD_POST      ((__force snd_device_cmd_t) 2)
+enum snd_device_type {
+       SNDRV_DEV_TOPLEVEL      = 0,
+       SNDRV_DEV_CONTROL       = 1,
+       SNDRV_DEV_LOWLEVEL_PRE  = 2,
+       SNDRV_DEV_LOWLEVEL_NORMAL = 0x1000,
+       SNDRV_DEV_PCM,
+       SNDRV_DEV_RAWMIDI,
+       SNDRV_DEV_TIMER,
+       SNDRV_DEV_SEQUENCER,
+       SNDRV_DEV_HWDEP,
+       SNDRV_DEV_INFO,
+       SNDRV_DEV_BUS,
+       SNDRV_DEV_CODEC,
+       SNDRV_DEV_JACK,
+       SNDRV_DEV_COMPRESS,
+       SNDRV_DEV_LOWLEVEL      = 0x2000,
+};
+
+enum snd_device_state {
+       SNDRV_DEV_BUILD,
+       SNDRV_DEV_REGISTERED,
+       SNDRV_DEV_DISCONNECTED,
+};
+
+enum snd_device_cmd {
+       SNDRV_DEV_CMD_PRE,
+       SNDRV_DEV_CMD_NORMAL,
+       SNDRV_DEV_CMD_POST,
+};
 
 struct snd_device;
 
@@ -86,8 +89,8 @@ struct snd_device_ops {
 struct snd_device {
        struct list_head list;          /* list of registered devices */
        struct snd_card *card;          /* card which holds this device */
-       snd_device_state_t state;       /* state of the device */
-       snd_device_type_t type;         /* device type */
+       enum snd_device_state state;    /* state of the device */
+       enum snd_device_type type;      /* device type */
        void *device_data;              /* device structure */
        struct snd_device_ops *ops;     /* operations */
 };
@@ -311,14 +314,14 @@ int snd_card_file_remove(struct snd_card *card, struct file *file);
 
 /* device.c */
 
-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);
 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, snd_device_cmd_t cmd);
+int snd_device_free_all(struct snd_card *card, enum snd_device_cmd cmd);
 
 /* isadma.c */
 

diff --git a/sound/aoa/aoa.h b/sound/aoa/aoa.h
index e08789484e3001e08e53acd481d97dcc37a7f88f..34c668f2779882f10b278a5e92654511eec90ec6 100644 (file)
--- a/sound/aoa/aoa.h
+++ b/sound/aoa/aoa.h
@@ -116,7 +116,7 @@ struct aoa_card {
        struct snd_card *alsa_card;
 };
         
-extern int aoa_snd_device_new(snd_device_type_t type,
+extern int aoa_snd_device_new(enum snd_device_type type,
        void * device_data, struct snd_device_ops * ops);
 extern struct snd_card *aoa_get_card(void);
 extern int aoa_snd_ctl_add(struct snd_kcontrol* control);

diff --git a/sound/aoa/core/alsa.c b/sound/aoa/core/alsa.c
index 9913bf222073537aea1ba8b7b9ac42c7cfa1d9e5..4a7e4e6b746fd3712cc596781346259814c2b6d4 100644 (file)
--- a/sound/aoa/core/alsa.c
+++ b/sound/aoa/core/alsa.c
@@ -59,7 +59,7 @@ void aoa_alsa_cleanup(void)
        }
 }
 
-int aoa_snd_device_new(snd_device_type_t type,
+int aoa_snd_device_new(enum snd_device_type type,
                       void * device_data, struct snd_device_ops * ops)
 {
        struct snd_card *card = aoa_get_card();

diff --git a/sound/core/device.c b/sound/core/device.c
index ad9869dfa10c8a1df1b966c58017ccd8f9a2e1a8..856bfdc79cee21a497763496dff6ad12e23fc8da 100644 (file)
--- 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;