staging: line6: Rename capability macros

Including "BIT" in the macro name is pointless.  Replace with "CAP" to
provide some context for what its value represents.

Signed-off-by: Chris Rorvick <chris@rorvick.com>
Reviewed-by: Stefan Hajnoczi <stefanha@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/drivers/staging/line6/driver.c b/drivers/staging/line6/driver.c
index acde205a62ba834cbf8b1168a14cdf5ba114da99..4ec87a37ace47e3c35d0a663bc70e858cfe7ab29 100644 (file)
--- a/drivers/staging/line6/driver.c
+++ b/drivers/staging/line6/driver.c
@@ -59,7 +59,7 @@ MODULE_DEVICE_TABLE(usb, line6_id_table);
 
 #define L6PROP(dev_id, dev_name, dev_cap)\
        {.id = dev_id,\
-        .name = dev_name, .capabilities = LINE6_BIT_##dev_cap}
+        .name = dev_name, .capabilities = LINE6_CAP_##dev_cap}
 
 static const struct line6_properties line6_properties_table[] = {
        L6PROP("BassPODxt",     "BassPODxt",        CTRL_PCM_HW),
@@ -830,7 +830,7 @@ static int line6_probe(struct usb_interface *interface,
 
        usb_set_intfdata(interface, line6);
 
-       if (properties->capabilities & LINE6_BIT_CONTROL) {
+       if (properties->capabilities & LINE6_CAP_CONTROL) {
                /* initialize USB buffers: */
                line6->buffer_listen =
                    kmalloc(LINE6_BUFSIZE_LISTEN, GFP_KERNEL);
@@ -1052,7 +1052,7 @@ static int line6_suspend(struct usb_interface *interface, pm_message_t message)
 
        snd_power_change_state(line6->card, SNDRV_CTL_POWER_D3hot);
 
-       if (line6->properties->capabilities & LINE6_BIT_CONTROL)
+       if (line6->properties->capabilities & LINE6_CAP_CONTROL)
                line6_stop_listen(line6);
 
        if (line6pcm != NULL) {
@@ -1071,7 +1071,7 @@ static int line6_resume(struct usb_interface *interface)
 {
        struct usb_line6 *line6 = usb_get_intfdata(interface);
 
-       if (line6->properties->capabilities & LINE6_BIT_CONTROL)
+       if (line6->properties->capabilities & LINE6_CAP_CONTROL)
                line6_start_listen(line6);
 
        snd_power_change_state(line6->card, SNDRV_CTL_POWER_D0);

diff --git a/drivers/staging/line6/midi.c b/drivers/staging/line6/midi.c
index 1ac343b649c12fece6e21b90f250d9f8f508260a..c453485065a39bdb1d87dc14935dd7a23f9f9fca 100644 (file)
--- a/drivers/staging/line6/midi.c
+++ b/drivers/staging/line6/midi.c
@@ -279,7 +279,7 @@ int line6_init_midi(struct usb_line6 *line6)
        int err;
        struct snd_line6_midi *line6midi;
 
-       if (!(line6->properties->capabilities & LINE6_BIT_CONTROL)) {
+       if (!(line6->properties->capabilities & LINE6_CAP_CONTROL)) {
                /* skip MIDI initialization and report success */
                return 0;
        }

diff --git a/drivers/staging/line6/pcm.c b/drivers/staging/line6/pcm.c
index 86c7bcba7ad68358354080b1057449feba9b7906..e09772f609b8791655630cb89ad17742781a14eb 100644 (file)
--- a/drivers/staging/line6/pcm.c
+++ b/drivers/staging/line6/pcm.c
@@ -424,7 +424,7 @@ int line6_init_pcm(struct usb_line6 *line6,
        int ep_read = 0, ep_write = 0;
        struct snd_line6_pcm *line6pcm;
 
-       if (!(line6->properties->capabilities & LINE6_BIT_PCM))
+       if (!(line6->properties->capabilities & LINE6_CAP_PCM))
                return 0;       /* skip PCM initialization and report success */
 
        /* initialize PCM subsystem based on device: */

diff --git a/drivers/staging/line6/playback.c b/drivers/staging/line6/playback.c
index 2ca8900e68c340f6a5a55daa9ee7ce6319bc9478..54b7f60624f83fbed309c2fc2807f22826446bd9 100644 (file)
--- a/drivers/staging/line6/playback.c
+++ b/drivers/staging/line6/playback.c
@@ -261,7 +261,7 @@ static int submit_audio_out_urb(struct snd_line6_pcm *line6pcm)
 #endif
                        if (!
                            (line6pcm->line6->
-                            properties->capabilities & LINE6_BIT_HWMON)
+                            properties->capabilities & LINE6_CAP_HWMON)
                            && (line6pcm->flags & LINE6_BITS_PLAYBACK_STREAM)
                            && (line6pcm->flags & LINE6_BITS_CAPTURE_STREAM))
                                add_monitor_signal(urb_out, line6pcm->prev_fbuf,

diff --git a/drivers/staging/line6/pod.c b/drivers/staging/line6/pod.c
index 7b4ec92fe020fda17fcdb4e30809c4967dba1e95..0fb17884818243349d7fb4ae02f5ddf0b5718f35 100644 (file)
--- a/drivers/staging/line6/pod.c
+++ b/drivers/staging/line6/pod.c
@@ -396,7 +396,7 @@ static int pod_try_init(struct usb_interface *interface,
           handler.
         */
 
-       if (pod->line6.properties->capabilities & LINE6_BIT_CONTROL) {
+       if (pod->line6.properties->capabilities & LINE6_CAP_CONTROL) {
                pod->monitor_level = POD_SYSTEM_INVALID;
 
                /* initiate startup procedure: */

diff --git a/drivers/staging/line6/usbdefs.h b/drivers/staging/line6/usbdefs.h
index c897dba67a3b69d1ca88b985a3acf5366af02695..d6e46ee8fa02219b256bf414bcd1dfdc263d78f6 100644 (file)
--- a/drivers/staging/line6/usbdefs.h
+++ b/drivers/staging/line6/usbdefs.h
@@ -15,15 +15,15 @@
 #define USB_INTERVALS_PER_SECOND 1000
 
 /* device supports settings parameter via USB */
-#define LINE6_BIT_CONTROL (1 << 0)
+#define LINE6_CAP_CONTROL (1 << 0)
 /* device supports PCM input/output via USB */
-#define LINE6_BIT_PCM (1 << 1)
+#define LINE6_CAP_PCM (1 << 1)
 /* device support hardware monitoring */
-#define LINE6_BIT_HWMON (1 << 2)
+#define LINE6_CAP_HWMON (1 << 2)
 
-#define LINE6_BIT_CTRL_PCM_HW  (LINE6_BIT_CONTROL |    \
-                                        LINE6_BIT_PCM |        \
-                                        LINE6_BIT_HWMON)
+#define LINE6_CAP_CTRL_PCM_HW  (LINE6_CAP_CONTROL |    \
+                                        LINE6_CAP_PCM |        \
+                                        LINE6_CAP_HWMON)
 
 #define LINE6_FALLBACK_INTERVAL 10
 #define LINE6_FALLBACK_MAXPACKETSIZE 16