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>

diff --git a/sound/usb/line6/capture.c b/sound/usb/line6/capture.c
index 4183c5f5edc25653583aa0723922c616c0edb11c..f518fbbe88de2efb884332b91a1ab91b895c2b3f 100644 (file)
--- 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)
 
        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;
 }
 

diff --git a/sound/usb/line6/pcm.h b/sound/usb/line6/pcm.h
index 3a3cfba40ec73f4d03decb4d20fa0f899421e5bc..508410adbd517e9017d1c2db7ec251f216794c9a 100644 (file)
--- a/sound/usb/line6/pcm.h
+++ b/sound/usb/line6/pcm.h
@@ -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;
 };
 

diff --git a/sound/usb/line6/playback.c b/sound/usb/line6/playback.c
index ae41124c351e21bab04965279fd5797ab9787549..05dee690f4876167ace542fe500bb077bec26762 100644 (file)
--- 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)
        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 *
-           (USB_INTERVALS_PER_SECOND / LINE6_ISO_INTERVAL);
+               line6pcm->properties->rates.rats[0].den *
+               (USB_INTERVALS_PER_SECOND / LINE6_ISO_INTERVAL);
        struct urb *urb_out;
 
        index =
@@ -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;
 }
 

diff --git a/sound/usb/line6/pod.c b/sound/usb/line6/pod.c
index 3f7ff661b3ddfc1a7ef764ae1f3e84d2c8c5ebc0..61aadd7d4b7f0a15b4c65bf1fefbae2491fd81ab 100644 (file)
--- a/sound/usb/line6/pod.c
+++ b/sound/usb/line6/pod.c
@@ -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

diff --git a/sound/usb/line6/podhd.c b/sound/usb/line6/podhd.c
index 4ebe6ef43073d8eabf6167d3a0ea57b46d23d2ac..9c3c7441fd115c25bbb1121a4c3977d51e54668f 100644 (file)
--- a/sound/usb/line6/podhd.c
+++ b/sound/usb/line6/podhd.c
@@ -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

diff --git a/sound/usb/line6/toneport.c b/sound/usb/line6/toneport.c
index cffcd7f83bfd90ed66088f5c494d876da2a4be1f..b107cf4818191ebd24e0d6d8e304ab8f02f0937f 100644 (file)
--- a/sound/usb/line6/toneport.c
+++ b/sound/usb/line6/toneport.c
@@ -76,7 +76,7 @@ static struct snd_ratden toneport_ratden = {
 };
 
 static struct line6_pcm_properties toneport_pcm_properties = {
-       .snd_line6_playback_hw = {
+       .playback_hw = {
                                  .info = (SNDRV_PCM_INFO_MMAP |
                                           SNDRV_PCM_INFO_INTERLEAVED |
                                           SNDRV_PCM_INFO_BLOCK_TRANSFER |
@@ -94,7 +94,7 @@ static struct line6_pcm_properties toneport_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 |
@@ -111,7 +111,7 @@ static struct line6_pcm_properties toneport_pcm_properties = {
                                 .period_bytes_max = 8192,
                                 .periods_min = 1,
                                 .periods_max = 1024},
-       .snd_line6_rates = {
+       .rates = {
                            .nrats = 1,
                            .rats = &toneport_ratden},
        .bytes_per_frame = 4