V4L/DVB (3702): Make msp3400 routing defines more consistent

Renamed various msp3400 routing defines to be more consistent and less
confusing. Esp. the MSP_DSP_OUT defines were confusing since it is really
a DSP input.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

4 files changed, 11 insertions, 11 deletions

diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index 692dc69f691d..423e954948be 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -973,12 +973,12 @@ audio_mux(struct bttv *btv, int input, int mute)
                    For now this is sufficient. */
                 switch (input) {
                 case TVAUDIO_INPUT_RADIO:
-                        route.input = MSP_INPUT(MSP_IN_SCART_2, MSP_IN_TUNER_1,
-                                    MSP_DSP_OUT_SCART, MSP_DSP_OUT_SCART);
+                        route.input = MSP_INPUT(MSP_IN_SCART2, MSP_IN_TUNER1,
+                                    MSP_DSP_IN_SCART, MSP_DSP_IN_SCART);
                         break;
                 case TVAUDIO_INPUT_EXTERN:
-                        route.input = MSP_INPUT(MSP_IN_SCART_1, MSP_IN_TUNER_1,
-                                    MSP_DSP_OUT_SCART, MSP_DSP_OUT_SCART);
+                        route.input = MSP_INPUT(MSP_IN_SCART1, MSP_IN_TUNER1,
+                                    MSP_DSP_IN_SCART, MSP_DSP_IN_SCART);
                         break;
                 case TVAUDIO_INPUT_INTERN:
                         /* Yes, this is the same input as for RADIO. I doubt
@@ -986,8 +986,8 @@ audio_mux(struct bttv *btv, int input, int mute)
                            input is the BTTV_BOARD_AVERMEDIA98. I wonder how
                            that was tested. My guess is that the whole INTERN
                            input does not work. */
-                        route.input = MSP_INPUT(MSP_IN_SCART_2, MSP_IN_TUNER_1,
-                                    MSP_DSP_OUT_SCART, MSP_DSP_OUT_SCART);
+                        route.input = MSP_INPUT(MSP_IN_SCART2, MSP_IN_TUNER1,
+                                    MSP_DSP_IN_SCART, MSP_DSP_IN_SCART);
                         break;
                 case TVAUDIO_INPUT_TUNER:
                 default:
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index f62fd706b45a..3ba3439db580 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -151,8 +151,8 @@ struct em28xx_board em28xx_boards[] = {
                 },{
                         .type     = EM28XX_VMUX_SVIDEO,
                         .vmux     = 2,
-                        .amux     = MSP_INPUT(MSP_IN_SCART_1, MSP_IN_TUNER_1,
-                                        MSP_DSP_OUT_SCART, MSP_DSP_OUT_SCART),
+                        .amux     = MSP_INPUT(MSP_IN_SCART1, MSP_IN_TUNER1,
+                                        MSP_DSP_IN_SCART, MSP_DSP_IN_SCART),
                 }},
         },
         [EM2820_BOARD_MSI_VOX_USB_2] = {
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index daa2ac2e6b90..ddc92cbb5276 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -222,7 +222,7 @@ static void video_mux(struct em28xx *dev, int index)
                 if (dev->i2s_speed)
                         em28xx_i2c_call_clients(dev, VIDIOC_INT_I2S_CLOCK_FREQ, &dev->i2s_speed);
                 route.input = dev->ctl_ainput;
-                route.output = MSP_OUTPUT(MSP_OUT_SCART1_DA);
+                route.output = MSP_OUTPUT(MSP_SC_IN_DSP_SCART1);
                 /* Note: this is msp3400 specific */
                 em28xx_i2c_call_clients(dev, VIDIOC_INT_S_AUDIO_ROUTING, &route);
                 ainput = EM28XX_AUDIO_SRC_TUNER;
diff --git a/drivers/media/video/msp3400-kthreads.c b/drivers/media/video/msp3400-kthreads.c
index b41ee9afbd96..633a10213789 100644
--- a/drivers/media/video/msp3400-kthreads.c
+++ b/drivers/media/video/msp3400-kthreads.c
@@ -856,11 +856,11 @@ static void msp34xxg_set_source(struct i2c_client *client, u16 reg, int in)
                 break;
         }
 
-        if (in == MSP_DSP_OUT_TUNER)
+        if (in == MSP_DSP_IN_TUNER)
                 source = (source << 8) | 0x20;
         /* the msp34x2g puts the MAIN_AVC, MAIN and AUX sources in 12, 13, 14
            instead of 11, 12, 13. So we add one for that msp version. */
-        else if (in >= MSP_DSP_OUT_MAIN_AVC && state->has_dolby_pro_logic)
+        else if (in >= MSP_DSP_IN_MAIN_AVC && state->has_dolby_pro_logic)
                 source = ((in + 1) << 8) | matrix;
         else
                 source = (in << 8) | matrix;