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

Commit 38f9d308 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

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: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent d417f711

drivers/media/video/cx88/cx88-cards.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

drivers/media/video/cx88/cx88-video.c

+2 −2
Original line number Diff line number Diff line
@@ -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) {

drivers/media/video/cx88/cx88.h

+2 −2
Original line number Diff line number Diff line
@@ -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 {

drivers/media/video/em28xx/em28xx-cards.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

		}

drivers/media/video/tveeprom.c

+53 −51
Original line number Diff line number Diff line
@@ -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");
@@ -264,67 +264,69 @@ hauppauge_tuner[] = 
	{ 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",