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

Commit baa081f1 authored by Stefan Hajnoczi's avatar Stefan Hajnoczi Committed by Greg Kroah-Hartman
Browse files

staging: line6: drop tuner param filtering 



The pod_set_system_param_int() helper function is only used to set the
monitor level.  Previously it was also used to control the tuner and has
special checks.  These checks can now be dropped, along with the tuner
constants.

Signed-off-by: default avatarStefan Hajnoczi <stefanha@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e6202528

drivers/staging/line6/pod.c

+0 −21
Original line number Original line Diff line number Diff line
@@ -40,10 +40,6 @@ enum { 




enum {

enum {

	POD_monitor_level  = 0x04,

	POD_monitor_level  = 0x04,

	POD_tuner_mute     = 0x13,

	POD_tuner_freq     = 0x15,

	POD_tuner_note     = 0x16,

	POD_tuner_pitch    = 0x17,

	POD_system_invalid = 0x10000

	POD_system_invalid = 0x10000

};

};
@@ -297,20 +293,8 @@ void line6_pod_transmit_parameter(struct usb_line6_pod *pod, int param, 
		line6_invalidate_current(&pod->dumpreq);

		line6_invalidate_current(&pod->dumpreq);

}

}





/*

	Identify system parameters related to the tuner.

*/

static bool pod_is_tuner(int code)

{

	return

	    (code == POD_tuner_mute) ||

	    (code == POD_tuner_freq) ||

	    (code == POD_tuner_note) || (code == POD_tuner_pitch);

}



/*

/*

	Send system parameter (from integer).

	Send system parameter (from integer).

	@param tuner non-zero, if code refers to a tuner parameter

*/

*/

static int pod_set_system_param_int(struct usb_line6_pod *pod, int value,

static int pod_set_system_param_int(struct usb_line6_pod *pod, int value,

				    int code)

				    int code)
@@ -318,11 +302,6 @@ static int pod_set_system_param_int(struct usb_line6_pod *pod, int value, 
	char *sysex;

	char *sysex;

	static const int size = 5;

	static const int size = 5;





	if (((pod->prog_data.control[POD_tuner] & 0x40) == 0)

	    && pod_is_tuner(code))

		return -EINVAL;



	/* send value to tuner: */

	sysex = pod_alloc_sysex_buffer(pod, POD_SYSEX_SYSTEM, size);

	sysex = pod_alloc_sysex_buffer(pod, POD_SYSEX_SYSTEM, size);

	if (!sysex)

	if (!sysex)

		return -ENOMEM;

		return -ENOMEM;