From: Chris Rorvick <chris@rorvick.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "Chris Rorvick" <chris@rorvick.com>,
"Alexey Khoroshilov" <khoroshilov@ispras.ru>,
"Davide Berardi" <berardi.dav@gmail.com>,
devel@driverdev.osuosl.org,
"Fabian Mewes" <architekt@coding4coffee.org>,
"Gulsah Kose" <gulsah.1004@gmail.com>,
"Himangi Saraogi" <himangi774@gmail.com>,
"Jerry Snitselaar" <dev@snitselaar.org>,
"L. Alberto Giménez" <agimenez@sysvalve.es>,
linux-kernel@vger.kernel.org,
"Mikhail Boiko" <mm.boiko@yandex.ru>,
"Monam Agarwal" <monamagarwal123@gmail.com>,
"Peter P Waskiewicz Jr" <peter.p.waskiewicz.jr@intel.com>,
"Stefan Hajnoczi" <stefanha@gmail.com>,
"Takashi Iwai" <tiwai@suse.de>
Subject: [PATCH 12/25] staging: line6: List out capabilities individually
Date: Fri, 9 Jan 2015 23:35:58 -0600 [thread overview]
Message-ID: <1420868171-2031-13-git-send-email-chris@rorvick.com> (raw)
In-Reply-To: <1420868171-2031-1-git-send-email-chris@rorvick.com>
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>
---
drivers/staging/line6/driver.c | 54 +++++++++++++++++++++++++++--------------
drivers/staging/line6/usbdefs.h | 4 ---
2 files changed, 36 insertions(+), 22 deletions(-)
diff --git a/drivers/staging/line6/driver.c b/drivers/staging/line6/driver.c
index c988b78..6fecc1b 100644
--- 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 d6e46ee..f4d080e 100644
--- 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
--
2.1.0
next prev parent reply other threads:[~2015-01-10 5:40 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-10 5:35 [PATCH 00/25] line6usb cleanup Chris Rorvick
2015-01-10 5:35 ` [PATCH 01/25] staging: line6: Remove `device_bit' from properties Chris Rorvick
2015-01-10 5:35 ` [PATCH 02/25] staging: line6: Remove line6_pod_transmit_paramter() Chris Rorvick
2015-01-10 5:35 ` [PATCH 03/25] staging: line6: Remove unsupported X3 devices Chris Rorvick
2015-01-10 5:35 ` [PATCH 04/25] staging: line6: Cleanup device table Chris Rorvick
2015-01-10 5:35 ` [PATCH 05/25] staging: line6: Define a device type enum Chris Rorvick
2015-01-10 5:35 ` [PATCH 06/25] staging: line6: Index properties array with device type Chris Rorvick
2015-01-10 5:35 ` [PATCH 07/25] staging: line6: Key off of " Chris Rorvick
2015-01-10 5:35 ` [PATCH 08/25] staging: line6: Remove idVendor and idProduct macros Chris Rorvick
2015-01-10 5:35 ` [PATCH 09/25] staging: line6: Remove useless comments Chris Rorvick
2015-01-10 5:35 ` [PATCH 10/25] staging: line6: Rename capability macros Chris Rorvick
2015-01-10 5:35 ` [PATCH 11/25] staging: line6: Use explicit indexes when defining properties Chris Rorvick
2015-01-10 5:35 ` Chris Rorvick [this message]
2015-01-10 5:35 ` [PATCH 13/25] staging: line6: Split out PODxt Live interfaces Chris Rorvick
2015-01-10 5:36 ` [PATCH 14/25] staging: line6: Split out POD HD500 interfaces Chris Rorvick
2015-01-10 5:36 ` [PATCH 15/25] staging: line6: Filter on Pocket POD interface Chris Rorvick
2015-01-10 5:36 ` [PATCH 16/25] staging: line6: Filter on UX2 interfaces Chris Rorvick
2015-01-10 5:36 ` [PATCH 17/25] staging: line6: Move altsetting to properties Chris Rorvick
2015-01-10 5:36 ` [PATCH 18/25] staging: line6: Move control endpoints " Chris Rorvick
2015-01-10 5:36 ` [PATCH 19/25] staging: line6: Remove stale Pocket POD PCM endpoints Chris Rorvick
2015-01-10 5:36 ` [PATCH 20/25] staging: line6: Move audio endpoints to properties Chris Rorvick
2015-01-10 5:36 ` [PATCH 21/25] staging: line6: Pass *_init() `usb_line6' pointers Chris Rorvick
2015-01-10 5:36 ` [PATCH 22/25] staging: line6: Pass *_process_message() " Chris Rorvick
2015-01-10 5:36 ` [PATCH 23/25] staging: line6: Call *_process_message() via pointer Chris Rorvick
2015-01-10 5:36 ` [PATCH 24/25] staging: line6: Call *_disconnect() " Chris Rorvick
2015-01-10 5:36 ` [PATCH 25/25] staging: line6: Make *_disconnect() functions static Chris Rorvick
2015-01-10 8:48 ` [PATCH 00/25] line6usb cleanup Stefan Hajnoczi
[not found] ` <s5h8uh94nce.wl-tiwai@suse.de>
2015-01-11 11:26 ` Stefan Hajnoczi
2015-01-11 21:04 ` Chris Rorvick
[not found] ` <s5hh9vwj6tm.wl-tiwai@suse.de>
2015-01-12 19:52 ` Greg Kroah-Hartman
2015-01-12 9:23 ` Dan Carpenter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1420868171-2031-13-git-send-email-chris@rorvick.com \
--to=chris@rorvick.com \
--cc=agimenez@sysvalve.es \
--cc=architekt@coding4coffee.org \
--cc=berardi.dav@gmail.com \
--cc=dev@snitselaar.org \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=gulsah.1004@gmail.com \
--cc=himangi774@gmail.com \
--cc=khoroshilov@ispras.ru \
--cc=linux-kernel@vger.kernel.org \
--cc=mm.boiko@yandex.ru \
--cc=monamagarwal123@gmail.com \
--cc=peter.p.waskiewicz.jr@intel.com \
--cc=stefanha@gmail.com \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome