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

Commit 1263f611 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: line6: Remove snd_line6_ prefix of pcm property fields 



It's just superfluous and doesn't give any better readability.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 72f18d00

sound/usb/line6/capture.c

+2 −3
Original line number Diff line number Diff line
@@ -216,12 +216,11 @@ static int snd_line6_capture_open(struct snd_pcm_substream *substream) 


	err = snd_pcm_hw_constraint_ratdens(runtime, 0,

					    SNDRV_PCM_HW_PARAM_RATE,

					    (&line6pcm->

					     properties->snd_line6_rates));

					    &line6pcm->properties->rates);

	if (err < 0)

		return err;



	runtime->hw = line6pcm->properties->snd_line6_capture_hw;

	runtime->hw = line6pcm->properties->capture_hw;

	return 0;

}

sound/usb/line6/pcm.h

+2 −2
Original line number Diff line number Diff line
@@ -83,8 +83,8 @@ enum { 
};



struct line6_pcm_properties {

	struct snd_pcm_hardware snd_line6_playback_hw, snd_line6_capture_hw;

	struct snd_pcm_hw_constraint_ratdens snd_line6_rates;

	struct snd_pcm_hardware playback_hw, capture_hw;

	struct snd_pcm_hw_constraint_ratdens rates;

	int bytes_per_frame;

};

sound/usb/line6/playback.c

+5 −6
Original line number Diff line number Diff line
@@ -148,9 +148,9 @@ static int submit_audio_out_urb(struct snd_line6_pcm *line6pcm) 
	int ret;

	const int bytes_per_frame = line6pcm->properties->bytes_per_frame;

	const int frame_increment =

	    line6pcm->properties->snd_line6_rates.rats[0].num_min;

		line6pcm->properties->rates.rats[0].num_min;

	const int frame_factor =

	    line6pcm->properties->snd_line6_rates.rats[0].den *

		line6pcm->properties->rates.rats[0].den *

		(USB_INTERVALS_PER_SECOND / LINE6_ISO_INTERVAL);

	struct urb *urb_out;
@@ -370,12 +370,11 @@ static int snd_line6_playback_open(struct snd_pcm_substream *substream) 
	struct snd_line6_pcm *line6pcm = snd_pcm_substream_chip(substream);



	err = snd_pcm_hw_constraint_ratdens(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,

					    (&line6pcm->

					     properties->snd_line6_rates));

					    &line6pcm->properties->rates);

	if (err < 0)

		return err;



	runtime->hw = line6pcm->properties->snd_line6_playback_hw;

	runtime->hw = line6pcm->properties->playback_hw;

	return 0;

}

sound/usb/line6/pod.c

+3 −3
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ static struct snd_ratden pod_ratden = { 
};



static struct line6_pcm_properties pod_pcm_properties = {

	.snd_line6_playback_hw = {

	.playback_hw = {

				  .info = (SNDRV_PCM_INFO_MMAP |

					   SNDRV_PCM_INFO_INTERLEAVED |

					   SNDRV_PCM_INFO_BLOCK_TRANSFER |
@@ -147,7 +147,7 @@ static struct line6_pcm_properties pod_pcm_properties = { 
				  .period_bytes_max = 8192,

				  .periods_min = 1,

				  .periods_max = 1024},

	.snd_line6_capture_hw = {

	.capture_hw = {

				 .info = (SNDRV_PCM_INFO_MMAP |

					  SNDRV_PCM_INFO_INTERLEAVED |

					  SNDRV_PCM_INFO_BLOCK_TRANSFER |
@@ -164,7 +164,7 @@ static struct line6_pcm_properties pod_pcm_properties = { 
				 .period_bytes_max = 8192,

				 .periods_min = 1,

				 .periods_max = 1024},

	.snd_line6_rates = {

	.rates = {

			    .nrats = 1,

			    .rats = &pod_ratden},

	.bytes_per_frame = POD_BYTES_PER_FRAME

sound/usb/line6/podhd.c

+3 −3
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ static struct snd_ratden podhd_ratden = { 
};



static struct line6_pcm_properties podhd_pcm_properties = {

	.snd_line6_playback_hw = {

	.playback_hw = {

				  .info = (SNDRV_PCM_INFO_MMAP |

					   SNDRV_PCM_INFO_INTERLEAVED |

					   SNDRV_PCM_INFO_BLOCK_TRANSFER |
@@ -53,7 +53,7 @@ static struct line6_pcm_properties podhd_pcm_properties = { 
				  .period_bytes_max = 8192,

				  .periods_min = 1,

				  .periods_max = 1024},

	.snd_line6_capture_hw = {

	.capture_hw = {

				 .info = (SNDRV_PCM_INFO_MMAP |

					  SNDRV_PCM_INFO_INTERLEAVED |

					  SNDRV_PCM_INFO_BLOCK_TRANSFER |
@@ -70,7 +70,7 @@ static struct line6_pcm_properties podhd_pcm_properties = { 
				 .period_bytes_max = 8192,

				 .periods_min = 1,

				 .periods_max = 1024},

	.snd_line6_rates = {

	.rates = {

			    .nrats = 1,

			    .rats = &podhd_ratden},

	.bytes_per_frame = PODHD_BYTES_PER_FRAME