staging: line6: List out capabilities individually

The `LINE6_CAP_CTRL_PCM_HW' macro combines three capabilities to save
horizontal space when defining the properties entries.  Now that these
are no longer limited to single lines this is not such a concern.
Specify capabilities individually when defining each property for
better clarity.

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 c988b7882869d1d87902ad17498a3398b53032d6..6fecc1b94e5ccd5f02f5b30e73c23d8c0321b371 100644 (file)
--- a/drivers/staging/line6/driver.c
+++ b/drivers/staging/line6/driver.c
@@ -61,92 +61,110 @@ static const struct line6_properties line6_properties_table[] = {
        [LINE6_BASSPODXT] = {
                .id = "BassPODxt",
                .name = "BassPODxt",
-               .capabilities = LINE6_CAP_CTRL_PCM_HW,
+               .capabilities   = LINE6_CAP_CONTROL
+                               | LINE6_CAP_PCM
+                               | LINE6_CAP_HWMON,
        },
        [LINE6_BASSPODXTLIVE] = {
                .id = "BassPODxtLive",
                .name = "BassPODxt Live",
-               .capabilities = LINE6_CAP_CTRL_PCM_HW,
+               .capabilities   = LINE6_CAP_CONTROL
+                               | LINE6_CAP_PCM
+                               | LINE6_CAP_HWMON,
        },
        [LINE6_BASSPODXTPRO] = {
                .id = "BassPODxtPro",
                .name = "BassPODxt Pro",
-               .capabilities = LINE6_CAP_CTRL_PCM_HW,
+               .capabilities   = LINE6_CAP_CONTROL
+                               | LINE6_CAP_PCM
+                               | LINE6_CAP_HWMON,
        },
        [LINE6_GUITARPORT] = {
                .id = "GuitarPort",
                .name = "GuitarPort",
-               .capabilities = LINE6_CAP_PCM,
+               .capabilities   = LINE6_CAP_PCM,
        },
        [LINE6_POCKETPOD] = {
                .id = "PocketPOD",
                .name = "Pocket POD",
-               .capabilities = LINE6_CAP_CONTROL,
+               .capabilities   = LINE6_CAP_CONTROL,
        },
        [LINE6_PODHD300] = {
                .id = "PODHD300",
                .name = "POD HD300",
-               .capabilities = LINE6_CAP_CTRL_PCM_HW,
+               .capabilities   = LINE6_CAP_CONTROL
+                               | LINE6_CAP_PCM
+                               | LINE6_CAP_HWMON,
        },
        [LINE6_PODHD400] = {
                .id = "PODHD400",
                .name = "POD HD400",
-               .capabilities = LINE6_CAP_CTRL_PCM_HW,
+               .capabilities   = LINE6_CAP_CONTROL
+                               | LINE6_CAP_PCM
+                               | LINE6_CAP_HWMON,
        },
        [LINE6_PODHD500] = {
                .id = "PODHD500",
                .name = "POD HD500",
-               .capabilities = LINE6_CAP_CTRL_PCM_HW,
+               .capabilities   = LINE6_CAP_CONTROL
+                               | LINE6_CAP_PCM
+                               | LINE6_CAP_HWMON,
        },
        [LINE6_PODSTUDIO_GX] = {
                .id = "PODStudioGX",
                .name = "POD Studio GX",
-               .capabilities = LINE6_CAP_PCM,
+               .capabilities   = LINE6_CAP_PCM,
        },
        [LINE6_PODSTUDIO_UX1] = {
                .id = "PODStudioUX1",
                .name = "POD Studio UX1",
-               .capabilities = LINE6_CAP_PCM,
+               .capabilities   = LINE6_CAP_PCM,
        },
        [LINE6_PODSTUDIO_UX2] = {
                .id = "PODStudioUX2",
                .name = "POD Studio UX2",
-               .capabilities = LINE6_CAP_PCM,
+               .capabilities   = LINE6_CAP_PCM,
        },
        [LINE6_PODXT] = {
                .id = "PODxt",
                .name = "PODxt",
-               .capabilities = LINE6_CAP_CTRL_PCM_HW,
+               .capabilities   = LINE6_CAP_CONTROL
+                               | LINE6_CAP_PCM
+                               | LINE6_CAP_HWMON,
        },
        [LINE6_PODXTLIVE] = {
                .id = "PODxtLive",
                .name = "PODxt Live",
-               .capabilities = LINE6_CAP_CTRL_PCM_HW,
+               .capabilities   = LINE6_CAP_CONTROL
+                               | LINE6_CAP_PCM
+                               | LINE6_CAP_HWMON,
        },
        [LINE6_PODXTPRO] = {
                .id = "PODxtPro",
                .name = "PODxt Pro",
-               .capabilities = LINE6_CAP_CTRL_PCM_HW,
+               .capabilities   = LINE6_CAP_CONTROL
+                               | LINE6_CAP_PCM
+                               | LINE6_CAP_HWMON,
        },
        [LINE6_TONEPORT_GX] = {
                .id = "TonePortGX",
                .name = "TonePort GX",
-               .capabilities = LINE6_CAP_PCM,
+               .capabilities   = LINE6_CAP_PCM,
        },
        [LINE6_TONEPORT_UX1] = {
                .id = "TonePortUX1",
                .name = "TonePort UX1",
-               .capabilities = LINE6_CAP_PCM,
+               .capabilities   = LINE6_CAP_PCM,
        },
        [LINE6_TONEPORT_UX2] = {
                .id = "TonePortUX2",
                .name = "TonePort UX2",
-               .capabilities = LINE6_CAP_PCM,
+               .capabilities   = LINE6_CAP_PCM,
        },
        [LINE6_VARIAX] = {
                .id = "Variax",
                .name = "Variax Workbench",
-               .capabilities = LINE6_CAP_CONTROL,
+               .capabilities   = LINE6_CAP_CONTROL,
        }
 };
 

diff --git a/drivers/staging/line6/usbdefs.h b/drivers/staging/line6/usbdefs.h
index d6e46ee8fa02219b256bf414bcd1dfdc263d78f6..f4d080e69abc0cac5065f091bc6e28a086a45a20 100644 (file)
--- a/drivers/staging/line6/usbdefs.h
+++ b/drivers/staging/line6/usbdefs.h
@@ -21,10 +21,6 @@
 /* device support hardware monitoring */
 #define LINE6_CAP_HWMON (1 << 2)
 
-#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