aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-01-28 09:08:59 -0500
committerTakashi Iwai <tiwai@suse.de>2015-01-28 14:54:47 -0500
commit1263f61179821df60cca4bccdb69e2f71fdebaa7 (patch)
tree7f21fcf086b2cb1c8719a5251e929deb1ed9dcbf
parent72f18d00757e182c1adeb747ea39a66f1b54698b (diff)
ALSA: line6: Remove snd_line6_ prefix of pcm property fields
It's just superfluous and doesn't give any better readability. Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/usb/line6/capture.c5
-rw-r--r--sound/usb/line6/pcm.h4
-rw-r--r--sound/usb/line6/playback.c11
-rw-r--r--sound/usb/line6/pod.c6
-rw-r--r--sound/usb/line6/podhd.c6
-rw-r--r--sound/usb/line6/toneport.c6
6 files changed, 18 insertions, 20 deletions
diff --git a/sound/usb/line6/capture.c b/sound/usb/line6/capture.c
index 4183c5f5edc2..f518fbbe88de 100644
--- a/sound/usb/line6/capture.c
+++ b/sound/usb/line6/capture.c
@@ -216,12 +216,11 @@ static int snd_line6_capture_open(struct snd_pcm_substream *substream)
216 216
217 err = snd_pcm_hw_constraint_ratdens(runtime, 0, 217 err = snd_pcm_hw_constraint_ratdens(runtime, 0,
218 SNDRV_PCM_HW_PARAM_RATE, 218 SNDRV_PCM_HW_PARAM_RATE,
219 (&line6pcm-> 219 &line6pcm->properties->rates);
220 properties->snd_line6_rates));
221 if (err < 0) 220 if (err < 0)
222 return err; 221 return err;
223 222
224 runtime->hw = line6pcm->properties->snd_line6_capture_hw; 223 runtime->hw = line6pcm->properties->capture_hw;
225 return 0; 224 return 0;
226} 225}
227 226
diff --git a/sound/usb/line6/pcm.h b/sound/usb/line6/pcm.h
index 3a3cfba40ec7..508410adbd51 100644
--- a/sound/usb/line6/pcm.h
+++ b/sound/usb/line6/pcm.h
@@ -83,8 +83,8 @@ enum {
83}; 83};
84 84
85struct line6_pcm_properties { 85struct line6_pcm_properties {
86 struct snd_pcm_hardware snd_line6_playback_hw, snd_line6_capture_hw; 86 struct snd_pcm_hardware playback_hw, capture_hw;
87 struct snd_pcm_hw_constraint_ratdens snd_line6_rates; 87 struct snd_pcm_hw_constraint_ratdens rates;
88 int bytes_per_frame; 88 int bytes_per_frame;
89}; 89};
90 90
diff --git a/sound/usb/line6/playback.c b/sound/usb/line6/playback.c
index ae41124c351e..05dee690f487 100644
--- a/sound/usb/line6/playback.c
+++ b/sound/usb/line6/playback.c
@@ -148,10 +148,10 @@ static int submit_audio_out_urb(struct snd_line6_pcm *line6pcm)
148 int ret; 148 int ret;
149 const int bytes_per_frame = line6pcm->properties->bytes_per_frame; 149 const int bytes_per_frame = line6pcm->properties->bytes_per_frame;
150 const int frame_increment = 150 const int frame_increment =
151 line6pcm->properties->snd_line6_rates.rats[0].num_min; 151 line6pcm->properties->rates.rats[0].num_min;
152 const int frame_factor = 152 const int frame_factor =
153 line6pcm->properties->snd_line6_rates.rats[0].den * 153 line6pcm->properties->rates.rats[0].den *
154 (USB_INTERVALS_PER_SECOND / LINE6_ISO_INTERVAL); 154 (USB_INTERVALS_PER_SECOND / LINE6_ISO_INTERVAL);
155 struct urb *urb_out; 155 struct urb *urb_out;
156 156
157 index = 157 index =
@@ -370,12 +370,11 @@ static int snd_line6_playback_open(struct snd_pcm_substream *substream)
370 struct snd_line6_pcm *line6pcm = snd_pcm_substream_chip(substream); 370 struct snd_line6_pcm *line6pcm = snd_pcm_substream_chip(substream);
371 371
372 err = snd_pcm_hw_constraint_ratdens(runtime, 0, SNDRV_PCM_HW_PARAM_RATE, 372 err = snd_pcm_hw_constraint_ratdens(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
373 (&line6pcm-> 373 &line6pcm->properties->rates);
374 properties->snd_line6_rates));
375 if (err < 0) 374 if (err < 0)
376 return err; 375 return err;
377 376
378 runtime->hw = line6pcm->properties->snd_line6_playback_hw; 377 runtime->hw = line6pcm->properties->playback_hw;
379 return 0; 378 return 0;
380} 379}
381 380
diff --git a/sound/usb/line6/pod.c b/sound/usb/line6/pod.c
index 3f7ff661b3dd..61aadd7d4b7f 100644
--- a/sound/usb/line6/pod.c
+++ b/sound/usb/line6/pod.c
@@ -129,7 +129,7 @@ static struct snd_ratden pod_ratden = {
129}; 129};
130 130
131static struct line6_pcm_properties pod_pcm_properties = { 131static struct line6_pcm_properties pod_pcm_properties = {
132 .snd_line6_playback_hw = { 132 .playback_hw = {
133 .info = (SNDRV_PCM_INFO_MMAP | 133 .info = (SNDRV_PCM_INFO_MMAP |
134 SNDRV_PCM_INFO_INTERLEAVED | 134 SNDRV_PCM_INFO_INTERLEAVED |
135 SNDRV_PCM_INFO_BLOCK_TRANSFER | 135 SNDRV_PCM_INFO_BLOCK_TRANSFER |
@@ -147,7 +147,7 @@ static struct line6_pcm_properties pod_pcm_properties = {
147 .period_bytes_max = 8192, 147 .period_bytes_max = 8192,
148 .periods_min = 1, 148 .periods_min = 1,
149 .periods_max = 1024}, 149 .periods_max = 1024},
150 .snd_line6_capture_hw = { 150 .capture_hw = {
151 .info = (SNDRV_PCM_INFO_MMAP | 151 .info = (SNDRV_PCM_INFO_MMAP |
152 SNDRV_PCM_INFO_INTERLEAVED | 152 SNDRV_PCM_INFO_INTERLEAVED |
153 SNDRV_PCM_INFO_BLOCK_TRANSFER | 153 SNDRV_PCM_INFO_BLOCK_TRANSFER |
@@ -164,7 +164,7 @@ static struct line6_pcm_properties pod_pcm_properties = {
164 .period_bytes_max = 8192, 164 .period_bytes_max = 8192,
165 .periods_min = 1, 165 .periods_min = 1,
166 .periods_max = 1024}, 166 .periods_max = 1024},
167 .snd_line6_rates = { 167 .rates = {
168 .nrats = 1, 168 .nrats = 1,
169 .rats = &pod_ratden}, 169 .rats = &pod_ratden},
170 .bytes_per_frame = POD_BYTES_PER_FRAME 170 .bytes_per_frame = POD_BYTES_PER_FRAME
diff --git a/sound/usb/line6/podhd.c b/sound/usb/line6/podhd.c
index 4ebe6ef43073..9c3c7441fd11 100644
--- a/sound/usb/line6/podhd.c
+++ b/sound/usb/line6/podhd.c
@@ -35,7 +35,7 @@ static struct snd_ratden podhd_ratden = {
35}; 35};
36 36
37static struct line6_pcm_properties podhd_pcm_properties = { 37static struct line6_pcm_properties podhd_pcm_properties = {
38 .snd_line6_playback_hw = { 38 .playback_hw = {
39 .info = (SNDRV_PCM_INFO_MMAP | 39 .info = (SNDRV_PCM_INFO_MMAP |
40 SNDRV_PCM_INFO_INTERLEAVED | 40 SNDRV_PCM_INFO_INTERLEAVED |
41 SNDRV_PCM_INFO_BLOCK_TRANSFER | 41 SNDRV_PCM_INFO_BLOCK_TRANSFER |
@@ -53,7 +53,7 @@ static struct line6_pcm_properties podhd_pcm_properties = {
53 .period_bytes_max = 8192, 53 .period_bytes_max = 8192,
54 .periods_min = 1, 54 .periods_min = 1,
55 .periods_max = 1024}, 55 .periods_max = 1024},
56 .snd_line6_capture_hw = { 56 .capture_hw = {
57 .info = (SNDRV_PCM_INFO_MMAP | 57 .info = (SNDRV_PCM_INFO_MMAP |
58 SNDRV_PCM_INFO_INTERLEAVED | 58 SNDRV_PCM_INFO_INTERLEAVED |
59 SNDRV_PCM_INFO_BLOCK_TRANSFER | 59 SNDRV_PCM_INFO_BLOCK_TRANSFER |
@@ -70,7 +70,7 @@ static struct line6_pcm_properties podhd_pcm_properties = {
70 .period_bytes_max = 8192, 70 .period_bytes_max = 8192,
71 .periods_min = 1, 71 .periods_min = 1,
72 .periods_max = 1024}, 72 .periods_max = 1024},
73 .snd_line6_rates = { 73 .rates = {
74 .nrats = 1, 74 .nrats = 1,
75 .rats = &podhd_ratden}, 75 .rats = &podhd_ratden},
76 .bytes_per_frame = PODHD_BYTES_PER_FRAME 76 .bytes_per_frame = PODHD_BYTES_PER_FRAME
diff --git a/sound/usb/line6/toneport.c b/sound/usb/line6/toneport.c
index cffcd7f83bfd..b107cf481819 100644
--- a/sound/usb/line6/toneport.c
+++ b/sound/usb/line6/toneport.c
@@ -76,7 +76,7 @@ static struct snd_ratden toneport_ratden = {
76}; 76};
77 77
78static struct line6_pcm_properties toneport_pcm_properties = { 78static struct line6_pcm_properties toneport_pcm_properties = {
79 .snd_line6_playback_hw = { 79 .playback_hw = {
80 .info = (SNDRV_PCM_INFO_MMAP | 80 .info = (SNDRV_PCM_INFO_MMAP |
81 SNDRV_PCM_INFO_INTERLEAVED | 81 SNDRV_PCM_INFO_INTERLEAVED |
82 SNDRV_PCM_INFO_BLOCK_TRANSFER | 82 SNDRV_PCM_INFO_BLOCK_TRANSFER |
@@ -94,7 +94,7 @@ static struct line6_pcm_properties toneport_pcm_properties = {
94 .period_bytes_max = 8192, 94 .period_bytes_max = 8192,
95 .periods_min = 1, 95 .periods_min = 1,
96 .periods_max = 1024}, 96 .periods_max = 1024},
97 .snd_line6_capture_hw = { 97 .capture_hw = {
98 .info = (SNDRV_PCM_INFO_MMAP | 98 .info = (SNDRV_PCM_INFO_MMAP |
99 SNDRV_PCM_INFO_INTERLEAVED | 99 SNDRV_PCM_INFO_INTERLEAVED |
100 SNDRV_PCM_INFO_BLOCK_TRANSFER | 100 SNDRV_PCM_INFO_BLOCK_TRANSFER |
@@ -111,7 +111,7 @@ static struct line6_pcm_properties toneport_pcm_properties = {
111 .period_bytes_max = 8192, 111 .period_bytes_max = 8192,
112 .periods_min = 1, 112 .periods_min = 1,
113 .periods_max = 1024}, 113 .periods_max = 1024},
114 .snd_line6_rates = { 114 .rates = {
115 .nrats = 1, 115 .nrats = 1,
116 .rats = &toneport_ratden}, 116 .rats = &toneport_ratden},
117 .bytes_per_frame = 4 117 .bytes_per_frame = 4