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

Commit ba79e52b authored by Davide Berardi's avatar Davide Berardi Committed by Greg Kroah-Hartman
Browse files

staging: line6: long line fixes 



Fixed some line over 80 characters.

Signed-off-by: default avatarDavide Berardi <berardi.dav@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e40bffae

drivers/staging/line6/driver.c

+29 −25
Original line number Diff line number Diff line
@@ -57,28 +57,32 @@ static const struct usb_device_id line6_id_table[] = { 


MODULE_DEVICE_TABLE(usb, line6_id_table);



#define L6PROP(dev_bit, dev_id, dev_name, dev_cap)\

	{.device_bit = LINE6_BIT_##dev_bit, .id = dev_id,\

	 .name = dev_name, .capabilities = LINE6_BIT_##dev_cap}



/* *INDENT-OFF* */

static struct line6_properties line6_properties_table[] = {

	{ LINE6_BIT_BASSPODXT,     "BassPODxt",     "BassPODxt",        LINE6_BIT_CONTROL_PCM_HWMON },

	{ LINE6_BIT_BASSPODXTLIVE, "BassPODxtLive", "BassPODxt Live",   LINE6_BIT_CONTROL_PCM_HWMON },

	{ LINE6_BIT_BASSPODXTPRO,  "BassPODxtPro",  "BassPODxt Pro",    LINE6_BIT_CONTROL_PCM_HWMON },

	{ LINE6_BIT_GUITARPORT,    "GuitarPort",    "GuitarPort",       LINE6_BIT_PCM               },

	{ LINE6_BIT_POCKETPOD,     "PocketPOD",     "Pocket POD",       LINE6_BIT_CONTROL           },

	{ LINE6_BIT_PODHD300,      "PODHD300",      "POD HD300",        LINE6_BIT_CONTROL_PCM_HWMON },

	{ LINE6_BIT_PODHD400,      "PODHD400",      "POD HD400",        LINE6_BIT_CONTROL_PCM_HWMON },

	{ LINE6_BIT_PODHD500,      "PODHD500",      "POD HD500",        LINE6_BIT_CONTROL_PCM_HWMON },

	{ LINE6_BIT_PODSTUDIO_GX,  "PODStudioGX",   "POD Studio GX",    LINE6_BIT_PCM               },

	{ LINE6_BIT_PODSTUDIO_UX1, "PODStudioUX1",  "POD Studio UX1",   LINE6_BIT_PCM               },

	{ LINE6_BIT_PODSTUDIO_UX2, "PODStudioUX2",  "POD Studio UX2",   LINE6_BIT_PCM               },

	{ LINE6_BIT_PODX3,         "PODX3",         "POD X3",           LINE6_BIT_PCM               },

	{ LINE6_BIT_PODX3LIVE,     "PODX3Live",     "POD X3 Live",      LINE6_BIT_PCM               },

	{ LINE6_BIT_PODXT,         "PODxt",         "PODxt",            LINE6_BIT_CONTROL_PCM_HWMON },

	{ LINE6_BIT_PODXTLIVE,     "PODxtLive",     "PODxt Live",       LINE6_BIT_CONTROL_PCM_HWMON },

	{ LINE6_BIT_PODXTPRO,      "PODxtPro",      "PODxt Pro",        LINE6_BIT_CONTROL_PCM_HWMON },

	{ LINE6_BIT_TONEPORT_GX,   "TonePortGX",    "TonePort GX",      LINE6_BIT_PCM               },

	{ LINE6_BIT_TONEPORT_UX1,  "TonePortUX1",   "TonePort UX1",     LINE6_BIT_PCM               },

	{ LINE6_BIT_TONEPORT_UX2,  "TonePortUX2",   "TonePort UX2",     LINE6_BIT_PCM               },

	{ LINE6_BIT_VARIAX,        "Variax",        "Variax Workbench", LINE6_BIT_CONTROL           },

static const struct line6_properties line6_properties_table[] = {

	L6PROP(BASSPODXT,     "BassPODxt",     "BassPODxt",        CTRL_PCM_HW),

	L6PROP(BASSPODXTLIVE, "BassPODxtLive", "BassPODxt Live",   CTRL_PCM_HW),

	L6PROP(BASSPODXTPRO,  "BassPODxtPro",  "BassPODxt Pro",    CTRL_PCM_HW),

	L6PROP(GUITARPORT,    "GuitarPort",    "GuitarPort",       PCM),

	L6PROP(POCKETPOD,     "PocketPOD",     "Pocket POD",       CONTROL),

	L6PROP(PODHD300,      "PODHD300",      "POD HD300",        CTRL_PCM_HW),

	L6PROP(PODHD400,      "PODHD400",      "POD HD400",        CTRL_PCM_HW),

	L6PROP(PODHD500,      "PODHD500",      "POD HD500",        CTRL_PCM_HW),

	L6PROP(PODSTUDIO_GX,  "PODStudioGX",   "POD Studio GX",    PCM),

	L6PROP(PODSTUDIO_UX1, "PODStudioUX1",  "POD Studio UX1",   PCM),

	L6PROP(PODSTUDIO_UX2, "PODStudioUX2",  "POD Studio UX2",   PCM),

	L6PROP(PODX3,         "PODX3",         "POD X3",           PCM),

	L6PROP(PODX3LIVE,     "PODX3Live",     "POD X3 Live",      PCM),

	L6PROP(PODXT,         "PODxt",         "PODxt",            CTRL_PCM_HW),

	L6PROP(PODXTLIVE,     "PODxtLive",     "PODxt Live",       CTRL_PCM_HW),

	L6PROP(PODXTPRO,      "PODxtPro",      "PODxt Pro",        CTRL_PCM_HW),

	L6PROP(TONEPORT_GX,   "TonePortGX",    "TonePort GX",      PCM),

	L6PROP(TONEPORT_UX1,  "TonePortUX1",   "TonePort UX1",     PCM),

	L6PROP(TONEPORT_UX2,  "TonePortUX2",   "TonePort UX2",     PCM),

	L6PROP(VARIAX,        "Variax",        "Variax Workbench", CONTROL),

};

/* *INDENT-ON* */

drivers/staging/line6/usbdefs.h

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ enum { 
/* device support hardware monitoring */

#define LINE6_BIT_HWMON (1 << 2)



#define LINE6_BIT_CONTROL_PCM_HWMON	(LINE6_BIT_CONTROL |	\

#define LINE6_BIT_CTRL_PCM_HW	(LINE6_BIT_CONTROL |	\

					 LINE6_BIT_PCM |	\

					 LINE6_BIT_HWMON)