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

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

staging: line6: Rename capability macros 



Including "BIT" in the macro name is pointless.  Replace with "CAP" to
provide some context for what its value represents.

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 5a858474

drivers/staging/line6/driver.c

+4 −4
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ MODULE_DEVICE_TABLE(usb, line6_id_table); 


#define L6PROP(dev_id, dev_name, dev_cap)\

	{.id = dev_id,\

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

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



static const struct line6_properties line6_properties_table[] = {

	L6PROP("BassPODxt",     "BassPODxt",        CTRL_PCM_HW),
@@ -830,7 +830,7 @@ static int line6_probe(struct usb_interface *interface, 


	usb_set_intfdata(interface, line6);



	if (properties->capabilities & LINE6_BIT_CONTROL) {

	if (properties->capabilities & LINE6_CAP_CONTROL) {

		/* initialize USB buffers: */

		line6->buffer_listen =

		    kmalloc(LINE6_BUFSIZE_LISTEN, GFP_KERNEL);
@@ -1052,7 +1052,7 @@ static int line6_suspend(struct usb_interface *interface, pm_message_t message) 


	snd_power_change_state(line6->card, SNDRV_CTL_POWER_D3hot);



	if (line6->properties->capabilities & LINE6_BIT_CONTROL)

	if (line6->properties->capabilities & LINE6_CAP_CONTROL)

		line6_stop_listen(line6);



	if (line6pcm != NULL) {
@@ -1071,7 +1071,7 @@ static int line6_resume(struct usb_interface *interface) 
{

	struct usb_line6 *line6 = usb_get_intfdata(interface);



	if (line6->properties->capabilities & LINE6_BIT_CONTROL)

	if (line6->properties->capabilities & LINE6_CAP_CONTROL)

		line6_start_listen(line6);



	snd_power_change_state(line6->card, SNDRV_CTL_POWER_D0);

drivers/staging/line6/midi.c

+1 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ int line6_init_midi(struct usb_line6 *line6) 
	int err;

	struct snd_line6_midi *line6midi;



	if (!(line6->properties->capabilities & LINE6_BIT_CONTROL)) {

	if (!(line6->properties->capabilities & LINE6_CAP_CONTROL)) {

		/* skip MIDI initialization and report success */

		return 0;

	}

drivers/staging/line6/pcm.c

+1 −1
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ int line6_init_pcm(struct usb_line6 *line6, 
	int ep_read = 0, ep_write = 0;

	struct snd_line6_pcm *line6pcm;



	if (!(line6->properties->capabilities & LINE6_BIT_PCM))

	if (!(line6->properties->capabilities & LINE6_CAP_PCM))

		return 0;	/* skip PCM initialization and report success */



	/* initialize PCM subsystem based on device: */

drivers/staging/line6/playback.c

+1 −1
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ static int submit_audio_out_urb(struct snd_line6_pcm *line6pcm) 
#endif

			if (!

			    (line6pcm->line6->

			     properties->capabilities & LINE6_BIT_HWMON)

			     properties->capabilities & LINE6_CAP_HWMON)

			    && (line6pcm->flags & LINE6_BITS_PLAYBACK_STREAM)

			    && (line6pcm->flags & LINE6_BITS_CAPTURE_STREAM))

				add_monitor_signal(urb_out, line6pcm->prev_fbuf,

drivers/staging/line6/pod.c

+1 −1
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ static int pod_try_init(struct usb_interface *interface, 
	   handler.

	 */



	if (pod->line6.properties->capabilities & LINE6_BIT_CONTROL) {

	if (pod->line6.properties->capabilities & LINE6_CAP_CONTROL) {

		pod->monitor_level = POD_SYSTEM_INVALID;



		/* initiate startup procedure: */