- Removed preinit() from saa7146 probe()/attach() logic, it's not used

  at all
- fixed most obvious flaws in budget.c, it's partially tested
  (ie. module loads/unloads ok)
- added the "video part" to budget-av.c, it's partially tested
  (ie. module loads/unloads ok, xawtv can access the video inputs)

1 files changed, 0 insertions, 14 deletions

diff --git a/linux/drivers/media/video/mxb.c b/linux/drivers/media/video/mxb.c
index 6fff101af..38538a0fb 100644
--- a/linux/drivers/media/video/mxb.c
+++ b/linux/drivers/media/video/mxb.c
@@ -201,18 +201,6 @@ static int mxb_vbi_bypass(struct saa7146_dev* dev)
 	return 0;
 }
 
-/* this function gets called very early in the registration process of
-   the extension. it has been reported that some devices need to enable
-   the i2c-bus explicitly for example -- this can be done here. please
-   note, that you cannot be sure that the device is really the hardware
-   you expect, so you should do as little as possible in here, in order
-   to avoid confusing the hardware.
-*/
-static int mxb_preinit(struct saa7146_dev* dev)
-{
-	return 0;
-}
-
 static int mxb_probe(struct saa7146_dev* dev, unsigned int subvendor, unsigned int subdevice)
 {
 	struct mxb* mxb = 0;
@@ -1021,7 +1009,6 @@ static struct saa7146_sub_info sub_data[] = {
 static
 struct saa7146_ext_vv vv_data = {
 	.inputs		= MXB_INPUTS,
-	.audios 	= MXB_AUDIOS,
 	.capabilities	= V4L2_CAP_TUNER | V4L2_CAP_VBI_CAPTURE,
 	.flags		= 0,
 	.stds		= &standard[0],
@@ -1043,7 +1030,6 @@ struct saa7146_extension extension = {
 	.dec_use	= mxb_dec_use,
 #endif
 	
-	.preinit	= mxb_preinit,
 	.probe		= mxb_probe,
 	.attach		= mxb_attach,
 	.detach		= mxb_detach,