V4L/DVB (8477): v4l: remove obsolete audiochip.h

Converted the last users of audiochip.h to the v4l2-chip-ident.h header
and remove the now unused audiochip.h header.

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

9 files changed, 65 insertions, 88 deletions

diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index fa6d398e97b9..de199a206a15 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -1348,7 +1348,7 @@ static const struct cx88_board cx88_boards[] = {
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .tda9887_conf   = TDA9887_PRESENT,
-                .audio_chip     = AUDIO_CHIP_WM8775,
+                .audio_chip     = V4L2_IDENT_WM8775,
                 .input          = {{
                         .type   = CX88_VMUX_TELEVISION,
                         .vmux   = 0,
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index d08c11eb8a75..f8cc55db9f42 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -448,7 +448,7 @@ int cx88_video_mux(struct cx88_core *core, unsigned int input)
                    the initialization. Some boards may use different
                    routes for different inputs. HVR-1300 surely does */
                 if (core->board.audio_chip &&
-                    core->board.audio_chip == AUDIO_CHIP_WM8775) {
+                    core->board.audio_chip == V4L2_IDENT_WM8775) {
                         struct v4l2_routing route;
 
                         route.input = INPUT(input).audioroute;
@@ -1867,7 +1867,7 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
 
         /* load and configure helper modules */
 
-        if (core->board.audio_chip == AUDIO_CHIP_WM8775)
+        if (core->board.audio_chip == V4L2_IDENT_WM8775)
                 request_module("wm8775");
 
         switch (core->boardnr) {
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index 14ac173f4071..54fe65094711 100644
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
@@ -29,8 +29,8 @@
 #include <media/tuner.h>
 #include <media/tveeprom.h>
 #include <media/videobuf-dma-sg.h>
+#include <media/v4l2-chip-ident.h>
 #include <media/cx2341x.h>
-#include <media/audiochip.h>
 #if defined(CONFIG_VIDEO_CX88_DVB) || defined(CONFIG_VIDEO_CX88_DVB_MODULE)
 #include <media/videobuf-dvb.h>
 #endif
@@ -252,7 +252,7 @@ struct cx88_board {
         struct cx88_input       input[MAX_CX88_INPUT];
         struct cx88_input       radio;
         enum cx88_board_type    mpeg;
-        enum audiochip          audio_chip;
+        unsigned int            audio_chip;
 };
 
 struct cx88_subid {
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 05f0d5a15058..6e0eb950ab81 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -32,8 +32,8 @@
 #include <media/saa7115.h>
 #include <media/tvp5150.h>
 #include <media/tveeprom.h>
-#include <media/audiochip.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-chip-ident.h>
 
 #include "em28xx.h"
 
@@ -836,7 +836,7 @@ void em28xx_card_setup(struct em28xx *dev)
 
                 dev->tuner_type = tv.tuner_type;
 
-                if (tv.audio_processor == AUDIO_CHIP_MSP34XX) {
+                if (tv.audio_processor == V4L2_IDENT_MSPX4XX) {
                         dev->i2s_speed = 2048000;
                         dev->has_msp34xx = 1;
                 }
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index 9da0e1807ffb..93954c143237 100644
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -40,7 +40,7 @@
 #include <media/tuner.h>
 #include <media/tveeprom.h>
 #include <media/v4l2-common.h>
-#include <media/audiochip.h>
+#include <media/v4l2-chip-ident.h>
 
 MODULE_DESCRIPTION("i2c Hauppauge eeprom decoder driver");
 MODULE_AUTHOR("John Klar");
@@ -261,70 +261,72 @@ hauppauge_tuner[] =
         { TUNER_ABSENT,                 "MaxLinear MXL5005_v2"},
         { TUNER_PHILIPS_TDA8290,        "Philips 18271_8295"},
         /* 150-159 */
-        { TUNER_ABSENT,        "Xceive XC5000"},
+        { TUNER_ABSENT,                 "Xceive XC5000"},
 };
 
+/* Use V4L2_IDENT_AMBIGUOUS for those audio 'chips' that are
+ * internal to a video chip, i.e. not a separate audio chip. */
 static struct HAUPPAUGE_AUDIOIC
 {
-        enum audiochip  id;
+        u32   id;
         char *name;
 }
 audioIC[] =
 {
         /* 0-4 */
-        {AUDIO_CHIP_NONE,     "None"},
-        {AUDIO_CHIP_TEA6300,  "TEA6300"},
-        {AUDIO_CHIP_TEA6300,  "TEA6320"},
-        {AUDIO_CHIP_TDA985X,  "TDA9850"},
-        {AUDIO_CHIP_MSP34XX,  "MSP3400C"},
+        { V4L2_IDENT_NONE,      "None"      },
+        { V4L2_IDENT_UNKNOWN,   "TEA6300"   },
+        { V4L2_IDENT_UNKNOWN,   "TEA6320"   },
+        { V4L2_IDENT_UNKNOWN,   "TDA9850"   },
+        { V4L2_IDENT_MSPX4XX,   "MSP3400C"  },
         /* 5-9 */
-        {AUDIO_CHIP_MSP34XX,  "MSP3410D"},
-        {AUDIO_CHIP_MSP34XX,  "MSP3415"},
-        {AUDIO_CHIP_MSP34XX,  "MSP3430"},
-        {AUDIO_CHIP_MSP34XX,  "MSP3438"},
-        {AUDIO_CHIP_UNKNOWN,  "CS5331"},
+        { V4L2_IDENT_MSPX4XX,   "MSP3410D"  },
+        { V4L2_IDENT_MSPX4XX,   "MSP3415"   },
+        { V4L2_IDENT_MSPX4XX,   "MSP3430"   },
+        { V4L2_IDENT_MSPX4XX,   "MSP3438"   },
+        { V4L2_IDENT_UNKNOWN,   "CS5331"    },
         /* 10-14 */
-        {AUDIO_CHIP_MSP34XX,  "MSP3435"},
-        {AUDIO_CHIP_MSP34XX,  "MSP3440"},
-        {AUDIO_CHIP_MSP34XX,  "MSP3445"},
-        {AUDIO_CHIP_MSP34XX,  "MSP3411"},
-        {AUDIO_CHIP_MSP34XX,  "MSP3416"},
+        { V4L2_IDENT_MSPX4XX,   "MSP3435"   },
+        { V4L2_IDENT_MSPX4XX,   "MSP3440"   },
+        { V4L2_IDENT_MSPX4XX,   "MSP3445"   },
+        { V4L2_IDENT_MSPX4XX,   "MSP3411"   },
+        { V4L2_IDENT_MSPX4XX,   "MSP3416"   },
         /* 15-19 */
-        {AUDIO_CHIP_MSP34XX,  "MSP3425"},
-        {AUDIO_CHIP_MSP34XX,  "MSP3451"},
-        {AUDIO_CHIP_MSP34XX,  "MSP3418"},
-        {AUDIO_CHIP_UNKNOWN,  "Type 0x12"},
-        {AUDIO_CHIP_UNKNOWN,  "OKI7716"},
+        { V4L2_IDENT_MSPX4XX,   "MSP3425"   },
+        { V4L2_IDENT_MSPX4XX,   "MSP3451"   },
+        { V4L2_IDENT_MSPX4XX,   "MSP3418"   },
+        { V4L2_IDENT_UNKNOWN,   "Type 0x12" },
+        { V4L2_IDENT_UNKNOWN,   "OKI7716"   },
         /* 20-24 */
-        {AUDIO_CHIP_MSP34XX,  "MSP4410"},
-        {AUDIO_CHIP_MSP34XX,  "MSP4420"},
-        {AUDIO_CHIP_MSP34XX,  "MSP4440"},
-        {AUDIO_CHIP_MSP34XX,  "MSP4450"},
-        {AUDIO_CHIP_MSP34XX,  "MSP4408"},
+        { V4L2_IDENT_MSPX4XX,   "MSP4410"   },
+        { V4L2_IDENT_MSPX4XX,   "MSP4420"   },
+        { V4L2_IDENT_MSPX4XX,   "MSP4440"   },
+        { V4L2_IDENT_MSPX4XX,   "MSP4450"   },
+        { V4L2_IDENT_MSPX4XX,   "MSP4408"   },
         /* 25-29 */
-        {AUDIO_CHIP_MSP34XX,  "MSP4418"},
-        {AUDIO_CHIP_MSP34XX,  "MSP4428"},
-        {AUDIO_CHIP_MSP34XX,  "MSP4448"},
-        {AUDIO_CHIP_MSP34XX,  "MSP4458"},
-        {AUDIO_CHIP_MSP34XX,  "Type 0x1d"},
+        { V4L2_IDENT_MSPX4XX,   "MSP4418"   },
+        { V4L2_IDENT_MSPX4XX,   "MSP4428"   },
+        { V4L2_IDENT_MSPX4XX,   "MSP4448"   },
+        { V4L2_IDENT_MSPX4XX,   "MSP4458"   },
+        { V4L2_IDENT_MSPX4XX,   "Type 0x1d" },
         /* 30-34 */
-        {AUDIO_CHIP_INTERNAL, "CX880"},
-        {AUDIO_CHIP_INTERNAL, "CX881"},
-        {AUDIO_CHIP_INTERNAL, "CX883"},
-        {AUDIO_CHIP_INTERNAL, "CX882"},
-        {AUDIO_CHIP_INTERNAL, "CX25840"},
+        { V4L2_IDENT_AMBIGUOUS, "CX880"     },
+        { V4L2_IDENT_AMBIGUOUS, "CX881"     },
+        { V4L2_IDENT_AMBIGUOUS, "CX883"     },
+        { V4L2_IDENT_AMBIGUOUS, "CX882"     },
+        { V4L2_IDENT_AMBIGUOUS, "CX25840"   },
         /* 35-39 */
-        {AUDIO_CHIP_INTERNAL, "CX25841"},
-        {AUDIO_CHIP_INTERNAL, "CX25842"},
-        {AUDIO_CHIP_INTERNAL, "CX25843"},
-        {AUDIO_CHIP_INTERNAL, "CX23418"},
-        {AUDIO_CHIP_INTERNAL, "CX23885"},
+        { V4L2_IDENT_AMBIGUOUS, "CX25841"   },
+        { V4L2_IDENT_AMBIGUOUS, "CX25842"   },
+        { V4L2_IDENT_AMBIGUOUS, "CX25843"   },
+        { V4L2_IDENT_AMBIGUOUS, "CX23418"   },
+        { V4L2_IDENT_AMBIGUOUS, "CX23885"   },
         /* 40-44 */
-        {AUDIO_CHIP_INTERNAL, "CX23888"},
-        {AUDIO_CHIP_INTERNAL, "SAA7131"},
-        {AUDIO_CHIP_INTERNAL, "CX23887"},
-        {AUDIO_CHIP_INTERNAL, "SAA7164"},
-        {AUDIO_CHIP_INTERNAL, "AU8522"},
+        { V4L2_IDENT_AMBIGUOUS, "CX23888"   },
+        { V4L2_IDENT_AMBIGUOUS, "SAA7131"   },
+        { V4L2_IDENT_AMBIGUOUS, "CX23887"   },
+        { V4L2_IDENT_AMBIGUOUS, "SAA7164"   },
+        { V4L2_IDENT_AMBIGUOUS, "AU8522"    },
 };
 
 /* This list is supplied by Hauppauge. Thanks! */
@@ -509,7 +511,7 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
                         if (audioic < ARRAY_SIZE(audioIC))
                                 tvee->audio_processor = audioIC[audioic].id;
                         else
-                                tvee->audio_processor = AUDIO_CHIP_UNKNOWN;
+                                tvee->audio_processor = V4L2_IDENT_UNKNOWN;
                         break;
 
                 /* case 0x03: tag 'EEInfo' */
@@ -542,7 +544,7 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
                         if (audioic < ARRAY_SIZE(audioIC))
                                 tvee->audio_processor = audioIC[audioic].id;
                         else
-                                tvee->audio_processor = AUDIO_CHIP_UNKNOWN;
+                                tvee->audio_processor = V4L2_IDENT_UNKNOWN;
 
                         break;
 
@@ -690,7 +692,7 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
                         t_fmt_name2[6], t_fmt_name2[7], t_format2);
         if (audioic < 0) {
                 tveeprom_info("audio processor is unknown (no idx)\n");
-                tvee->audio_processor = AUDIO_CHIP_UNKNOWN;
+                tvee->audio_processor = V4L2_IDENT_UNKNOWN;
         } else {
                 if (audioic < ARRAY_SIZE(audioIC))
                         tveeprom_info("audio processor is %s (idx %d)\n",
diff --git a/drivers/media/video/usbvision/usbvision-core.c b/drivers/media/video/usbvision/usbvision-core.c
index abf685464b7c..7d53de531c44 100644
--- a/drivers/media/video/usbvision/usbvision-core.c
+++ b/drivers/media/video/usbvision/usbvision-core.c
@@ -43,7 +43,6 @@
 #include <media/saa7115.h>
 #include <media/v4l2-common.h>
 #include <media/tuner.h>
-#include <media/audiochip.h>
 
 #include <linux/workqueue.h>
 
diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c
index 56cd685d35ea..5984c7562035 100644
--- a/drivers/media/video/usbvision/usbvision-video.c
+++ b/drivers/media/video/usbvision/usbvision-video.c
@@ -67,7 +67,6 @@
 #include <media/v4l2-common.h>
 #include <media/v4l2-ioctl.h>
 #include <media/tuner.h>
-#include <media/audiochip.h>
 
 #include <linux/workqueue.h>
 
diff --git a/include/media/audiochip.h b/include/media/audiochip.h
index db8823d45a7d..e69de29bb2d1 100644
--- a/include/media/audiochip.h
+++ b/include/media/audiochip.h
@@ -1,26 +0,0 @@
-/*
- */
-
-#ifndef AUDIOCHIP_H
-#define AUDIOCHIP_H
-
-enum audiochip {
-        AUDIO_CHIP_NONE,
-        AUDIO_CHIP_UNKNOWN,
-        /* Provided by video chip */
-        AUDIO_CHIP_INTERNAL,
-        /* Provided by tvaudio.c */
-        AUDIO_CHIP_TDA8425,
-        AUDIO_CHIP_TEA6300,
-        AUDIO_CHIP_TEA6420,
-        AUDIO_CHIP_TDA9840,
-        AUDIO_CHIP_TDA985X,
-        AUDIO_CHIP_TDA9874,
-        AUDIO_CHIP_PIC16C54,
-        /* Provided by msp3400.c */
-        AUDIO_CHIP_MSP34XX,
-        /* Provided by wm8775.c */
-        AUDIO_CHIP_WM8775
-};
-
-#endif /* AUDIOCHIP_H */
diff --git a/include/media/v4l2-chip-ident.h b/include/media/v4l2-chip-ident.h
index 2a527742701a..41b509babf3f 100644
--- a/include/media/v4l2-chip-ident.h
+++ b/include/media/v4l2-chip-ident.h
@@ -90,7 +90,10 @@ enum {
         /* module m52790: just ident 52790 */
         V4L2_IDENT_M52790 = 52790,
 
-        /* module msp34xx: reserved range 34000-34999 */
+        /* module msp3400: reserved range 34000-34999 and 44000-44999 */
+        V4L2_IDENT_MSPX4XX  = 34000, /* generic MSPX4XX identifier, only
+                                        use internally (tveeprom.c). */
+
         V4L2_IDENT_MSP3400B = 34002,
         V4L2_IDENT_MSP3410B = 34102,
 
@@ -142,7 +145,7 @@ enum {
         V4L2_IDENT_MSP3457G = 34577,
         V4L2_IDENT_MSP3467G = 34677,
 
-        /* module msp44xx: reserved range 44000-44999 */
+        /* module msp3400: reserved range 34000-34999 and 44000-44999 */
         V4L2_IDENT_MSP4400G = 44007,
         V4L2_IDENT_MSP4410G = 44107,
         V4L2_IDENT_MSP4420G = 44207,