Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b3e4d47 authored by Chris Rorvick's avatar Chris Rorvick Committed by Takashi Iwai
Browse files

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: default avatarChris Rorvick <chris@rorvick.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 4d947546

drivers/staging/line6/driver.c

+36 −18
Original line number Diff line number Diff line
@@ -61,17 +61,23 @@ 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",
@@ -86,17 +92,23 @@ static const struct line6_properties line6_properties_table[] = { 
	[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",
@@ -116,17 +128,23 @@ static const struct line6_properties line6_properties_table[] = { 
	[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",

drivers/staging/line6/usbdefs.h

+0 −4
Original line number Diff line number Diff line
@@ -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