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

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

staging: line6: Remove unsupported X3 devices 



Support for these devices appears to have never been completed.  Remove
them from the device table along with a minimal amount of supporting
code.

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 c667ee1b

drivers/staging/line6/driver.c

+0 −26
Original line number Diff line number Diff line
@@ -43,8 +43,6 @@ static const struct usb_device_id line6_id_table[] = { 
	{USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_PODSTUDIO_GX)},

	{USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_PODSTUDIO_UX1)},

	{USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_PODSTUDIO_UX2)},

	{USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_PODX3)},

	{USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_PODX3LIVE)},

	{USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_PODXT)},

	{USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_PODXTLIVE)},

	{USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_PODXTPRO)},
@@ -74,8 +72,6 @@ static const struct line6_properties line6_properties_table[] = { 
	L6PROP("PODStudioGX",   "POD Studio GX",    PCM),

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

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

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

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

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

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

	L6PROP("PODxtPro",      "PODxt Pro",        CTRL_PCM_HW),
@@ -673,8 +669,6 @@ static int line6_probe(struct usb_interface *interface, 
		break;



	case LINE6_DEVID_PODHD500:

	case LINE6_DEVID_PODX3:

	case LINE6_DEVID_PODX3LIVE:

		switch (interface_number) {

		case 0:

			alternate = 1;
@@ -765,14 +759,6 @@ static int line6_probe(struct usb_interface *interface, 
		ep_write = 0x02;

		break;



	case LINE6_DEVID_PODX3:

	case LINE6_DEVID_PODX3LIVE:

		/* currently unused! */

		size = sizeof(struct usb_line6_pod);

		ep_read = 0x81;

		ep_write = 0x01;

		break;



	case LINE6_DEVID_PODSTUDIO_GX:

	case LINE6_DEVID_PODSTUDIO_UX1:

	case LINE6_DEVID_PODSTUDIO_UX2:
@@ -898,8 +884,6 @@ static int line6_probe(struct usb_interface *interface, 
	case LINE6_DEVID_BASSPODXTLIVE:

	case LINE6_DEVID_BASSPODXTPRO:

	case LINE6_DEVID_POCKETPOD:

	case LINE6_DEVID_PODX3:

	case LINE6_DEVID_PODX3LIVE:

	case LINE6_DEVID_PODXT:

	case LINE6_DEVID_PODXTPRO:

		ret = line6_pod_init(interface, (struct usb_line6_pod *)line6);
@@ -971,14 +955,6 @@ static int line6_probe(struct usb_interface *interface, 
	dev_info(&interface->dev, "Line6 %s now attached\n",

		 line6->properties->name);



	switch (product) {

	case LINE6_DEVID_PODX3:

	case LINE6_DEVID_PODX3LIVE:

		dev_info(&interface->dev,

			 "NOTE: the Line6 %s is detected, but not yet supported\n",

			 line6->properties->name);

	}



	/* increment reference counters: */

	usb_get_intf(interface);

	usb_get_dev(usbdev);
@@ -1026,8 +1002,6 @@ static void line6_disconnect(struct usb_interface *interface) 
		case LINE6_DEVID_BASSPODXTLIVE:

		case LINE6_DEVID_BASSPODXTPRO:

		case LINE6_DEVID_POCKETPOD:

		case LINE6_DEVID_PODX3:

		case LINE6_DEVID_PODX3LIVE:

		case LINE6_DEVID_PODXT:

		case LINE6_DEVID_PODXTPRO:

			line6_pod_disconnect(interface);

drivers/staging/line6/pcm.c

+0 −2
Original line number Diff line number Diff line
@@ -442,8 +442,6 @@ int line6_init_pcm(struct usb_line6 *line6, 
		break;



	case LINE6_DEVID_PODHD500:

	case LINE6_DEVID_PODX3:

	case LINE6_DEVID_PODX3LIVE:

		ep_read = 0x86;

		ep_write = 0x02;

		break;

drivers/staging/line6/usbdefs.h

+0 −2
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ 
#define LINE6_DEVID_PODSTUDIO_GX  0x4153

#define LINE6_DEVID_PODSTUDIO_UX1 0x4150

#define LINE6_DEVID_PODSTUDIO_UX2 0x4151

#define LINE6_DEVID_PODX3         0x414a

#define LINE6_DEVID_PODX3LIVE     0x414b

#define LINE6_DEVID_PODXT         0x5044

#define LINE6_DEVID_PODXTLIVE     0x4650

#define LINE6_DEVID_PODXTPRO      0x5050