[media] rename most media/video usb drivers to media/usb

Rename all USB drivers with their own directory under
drivers/media/video into drivers/media/usb and update the
building system.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

11 files changed, 0 insertions, 4118 deletions

diff --git a/drivers/media/video/au0828/Kconfig b/drivers/media/video/au0828/Kconfig
deleted file mode 100644
index 23f7fd22f0e..00000000000
--- a/drivers/media/video/au0828/Kconfig
+++ /dev/null
@@ -1,18 +0,0 @@
-
-config VIDEO_AU0828
-	tristate "Auvitek AU0828 support"
-	depends on I2C && INPUT && DVB_CORE && USB && VIDEO_V4L2
-	depends on DVB_CAPTURE_DRIVERS
-	select I2C_ALGOBIT
-	select VIDEO_TVEEPROM
-	select VIDEOBUF_VMALLOC
-	select DVB_AU8522_DTV if !DVB_FE_CUSTOMISE
-	select DVB_AU8522_V4L if !DVB_FE_CUSTOMISE
-	select MEDIA_TUNER_XC5000 if !MEDIA_TUNER_CUSTOMISE
-	select MEDIA_TUNER_MXL5007T if !MEDIA_TUNER_CUSTOMISE
-	select MEDIA_TUNER_TDA18271 if !MEDIA_TUNER_CUSTOMISE
-	---help---
-	  This is a video4linux driver for Auvitek's USB device.
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called au0828
diff --git a/drivers/media/video/au0828/Makefile b/drivers/media/video/au0828/Makefile
deleted file mode 100644
index 98cc20cc0ff..00000000000
--- a/drivers/media/video/au0828/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-au0828-objs	:= au0828-core.o au0828-i2c.o au0828-cards.o au0828-dvb.o au0828-video.o au0828-vbi.o
-
-obj-$(CONFIG_VIDEO_AU0828) += au0828.o
-
-ccflags-y += -Idrivers/media/tuners
-ccflags-y += -Idrivers/media/dvb-core
-ccflags-y += -Idrivers/media/dvb-frontends
-
-ccflags-y += $(extra-cflags-y) $(extra-cflags-m)
diff --git a/drivers/media/video/au0828/au0828-cards.c b/drivers/media/video/au0828/au0828-cards.c
deleted file mode 100644
index 448361c6a13..00000000000
--- a/drivers/media/video/au0828/au0828-cards.c
+++ /dev/null
@@ -1,339 +0,0 @@
-/*
- *  Driver for the Auvitek USB bridge
- *
- *  Copyright (c) 2008 Steven Toth <stoth@linuxtv.org>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "au0828.h"
-#include "au0828-cards.h"
-#include "au8522.h"
-#include "media/tuner.h"
-#include "media/v4l2-common.h"
-
-void hvr950q_cs5340_audio(void *priv, int enable)
-{
-	/* Because the HVR-950q shares an i2s bus between the cs5340 and the
-	   au8522, we need to hold cs5340 in reset when using the au8522 */
-	struct au0828_dev *dev = priv;
-	if (enable == 1)
-		au0828_set(dev, REG_000, 0x10);
-	else
-		au0828_clear(dev, REG_000, 0x10);
-}
-
-struct au0828_board au0828_boards[] = {
-	[AU0828_BOARD_UNKNOWN] = {
-		.name	= "Unknown board",
-		.tuner_type = UNSET,
-		.tuner_addr = ADDR_UNSET,
-	},
-	[AU0828_BOARD_HAUPPAUGE_HVR850] = {
-		.name	= "Hauppauge HVR850",
-		.tuner_type = TUNER_XC5000,
-		.tuner_addr = 0x61,
-		.i2c_clk_divider = AU0828_I2C_CLK_20KHZ,
-		.input = {
-			{
-				.type = AU0828_VMUX_TELEVISION,
-				.vmux = AU8522_COMPOSITE_CH4_SIF,
-				.amux = AU8522_AUDIO_SIF,
-			},
-			{
-				.type = AU0828_VMUX_COMPOSITE,
-				.vmux = AU8522_COMPOSITE_CH1,
-				.amux = AU8522_AUDIO_NONE,
-				.audio_setup = hvr950q_cs5340_audio,
-			},
-			{
-				.type = AU0828_VMUX_SVIDEO,
-				.vmux = AU8522_SVIDEO_CH13,
-				.amux = AU8522_AUDIO_NONE,
-				.audio_setup = hvr950q_cs5340_audio,
-			},
-		},
-	},
-	[AU0828_BOARD_HAUPPAUGE_HVR950Q] = {
-		.name	= "Hauppauge HVR950Q",
-		.tuner_type = TUNER_XC5000,
-		.tuner_addr = 0x61,
-		/* The au0828 hardware i2c implementation does not properly
-		   support the xc5000's i2c clock stretching.  So we need to
-		   lower the clock frequency enough where the 15us clock
-		   stretch fits inside of a normal clock cycle, or else the
-		   au0828 fails to set the STOP bit.  A 30 KHz clock puts the
-		   clock pulse width at 18us */
-		.i2c_clk_divider = AU0828_I2C_CLK_20KHZ,
-		.input = {
-			{
-				.type = AU0828_VMUX_TELEVISION,
-				.vmux = AU8522_COMPOSITE_CH4_SIF,
-				.amux = AU8522_AUDIO_SIF,
-			},
-			{
-				.type = AU0828_VMUX_COMPOSITE,
-				.vmux = AU8522_COMPOSITE_CH1,
-				.amux = AU8522_AUDIO_NONE,
-				.audio_setup = hvr950q_cs5340_audio,
-			},
-			{
-				.type = AU0828_VMUX_SVIDEO,
-				.vmux = AU8522_SVIDEO_CH13,
-				.amux = AU8522_AUDIO_NONE,
-				.audio_setup = hvr950q_cs5340_audio,
-			},
-		},
-	},
-	[AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL] = {
-		.name	= "Hauppauge HVR950Q rev xxF8",
-		.tuner_type = UNSET,
-		.tuner_addr = ADDR_UNSET,
-		.i2c_clk_divider = AU0828_I2C_CLK_250KHZ,
-	},
-	[AU0828_BOARD_DVICO_FUSIONHDTV7] = {
-		.name	= "DViCO FusionHDTV USB",
-		.tuner_type = UNSET,
-		.tuner_addr = ADDR_UNSET,
-		.i2c_clk_divider = AU0828_I2C_CLK_250KHZ,
-	},
-	[AU0828_BOARD_HAUPPAUGE_WOODBURY] = {
-		.name = "Hauppauge Woodbury",
-		.tuner_type = UNSET,
-		.tuner_addr = ADDR_UNSET,
-		.i2c_clk_divider = AU0828_I2C_CLK_250KHZ,
-	},
-};
-
-/* Tuner callback function for au0828 boards. Currently only needed
- * for HVR1500Q, which has an xc5000 tuner.
- */
-int au0828_tuner_callback(void *priv, int component, int command, int arg)
-{
-	struct au0828_dev *dev = priv;
-
-	dprintk(1, "%s()\n", __func__);
-
-	switch (dev->boardnr) {
-	case AU0828_BOARD_HAUPPAUGE_HVR850:
-	case AU0828_BOARD_HAUPPAUGE_HVR950Q:
-	case AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL:
-	case AU0828_BOARD_DVICO_FUSIONHDTV7:
-		if (command == 0) {
-			/* Tuner Reset Command from xc5000 */
-			/* Drive the tuner into reset and out */
-			au0828_clear(dev, REG_001, 2);
-			mdelay(10);
-			au0828_set(dev, REG_001, 2);
-			mdelay(10);
-			return 0;
-		} else {
-			printk(KERN_ERR
-				"%s(): Unknown command.\n", __func__);
-			return -EINVAL;
-		}
-		break;
-	}
-
-	return 0; /* Should never be here */
-}
-
-static void hauppauge_eeprom(struct au0828_dev *dev, u8 *eeprom_data)
-{
-	struct tveeprom tv;
-
-	tveeprom_hauppauge_analog(&dev->i2c_client, &tv, eeprom_data);
-	dev->board.tuner_type = tv.tuner_type;
-
-	/* Make sure we support the board model */
-	switch (tv.model) {
-	case 72000: /* WinTV-HVR950q (Retail, IR, ATSC/QAM */
-	case 72001: /* WinTV-HVR950q (Retail, IR, ATSC/QAM and analog video */
-	case 72101: /* WinTV-HVR950q (Retail, IR, ATSC/QAM and analog video */
-	case 72201: /* WinTV-HVR950q (OEM, IR, ATSC/QAM and analog video */
-	case 72211: /* WinTV-HVR950q (OEM, IR, ATSC/QAM and analog video */
-	case 72221: /* WinTV-HVR950q (OEM, IR, ATSC/QAM and analog video */
-	case 72231: /* WinTV-HVR950q (OEM, IR, ATSC/QAM and analog video */
-	case 72241: /* WinTV-HVR950q (OEM, No IR, ATSC/QAM and analog video */
-	case 72251: /* WinTV-HVR950q (Retail, IR, ATSC/QAM and analog video */
-	case 72261: /* WinTV-HVR950q (OEM, IR, ATSC/QAM and analog video */
-	case 72301: /* WinTV-HVR850 (Retail, IR, ATSC and analog video */
-	case 72500: /* WinTV-HVR950q (OEM, No IR, ATSC/QAM */
-		break;
-	default:
-		printk(KERN_WARNING "%s: warning: "
-		       "unknown hauppauge model #%d\n", __func__, tv.model);
-		break;
-	}
-
-	printk(KERN_INFO "%s: hauppauge eeprom: model=%d\n",
-	       __func__, tv.model);
-}
-
-void au0828_card_setup(struct au0828_dev *dev)
-{
-	static u8 eeprom[256];
-	struct tuner_setup tun_setup;
-	struct v4l2_subdev *sd;
-	unsigned int mode_mask = T_ANALOG_TV;
-
-	dprintk(1, "%s()\n", __func__);
-
-	memcpy(&dev->board, &au0828_boards[dev->boardnr], sizeof(dev->board));
-
-	if (dev->i2c_rc == 0) {
-		dev->i2c_client.addr = 0xa0 >> 1;
-		tveeprom_read(&dev->i2c_client, eeprom, sizeof(eeprom));
-	}
-
-	switch (dev->boardnr) {
-	case AU0828_BOARD_HAUPPAUGE_HVR850:
-	case AU0828_BOARD_HAUPPAUGE_HVR950Q:
-	case AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL:
-	case AU0828_BOARD_HAUPPAUGE_WOODBURY:
-		if (dev->i2c_rc == 0)
-			hauppauge_eeprom(dev, eeprom+0xa0);
-		break;
-	}
-
-	if (AUVI_INPUT(0).type != AU0828_VMUX_UNDEFINED) {
-		/* Load the analog demodulator driver (note this would need to
-		   be abstracted out if we ever need to support a different
-		   demod) */
-		sd = v4l2_i2c_new_subdev(&dev->v4l2_dev, &dev->i2c_adap,
-				"au8522", 0x8e >> 1, NULL);
-		if (sd == NULL)
-			printk(KERN_ERR "analog subdev registration failed\n");
-	}
-
-	/* Setup tuners */
-	if (dev->board.tuner_type != TUNER_ABSENT) {
-		/* Load the tuner module, which does the attach */
-		sd = v4l2_i2c_new_subdev(&dev->v4l2_dev, &dev->i2c_adap,
-				"tuner", dev->board.tuner_addr, NULL);
-		if (sd == NULL)
-			printk(KERN_ERR "tuner subdev registration fail\n");
-
-		tun_setup.mode_mask      = mode_mask;
-		tun_setup.type           = dev->board.tuner_type;
-		tun_setup.addr           = dev->board.tuner_addr;
-		tun_setup.tuner_callback = au0828_tuner_callback;
-		v4l2_device_call_all(&dev->v4l2_dev, 0, tuner, s_type_addr,
-				     &tun_setup);
-	}
-}
-
-/*
- * The bridge has between 8 and 12 gpios.
- * Regs 1 and 0 deal with output enables.
- * Regs 3 and 2 deal with direction.
- */
-void au0828_gpio_setup(struct au0828_dev *dev)
-{
-	dprintk(1, "%s()\n", __func__);
-
-	switch (dev->boardnr) {
-	case AU0828_BOARD_HAUPPAUGE_HVR850:
-	case AU0828_BOARD_HAUPPAUGE_HVR950Q:
-	case AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL:
-	case AU0828_BOARD_HAUPPAUGE_WOODBURY:
-		/* GPIO's
-		 * 4 - CS5340
-		 * 5 - AU8522 Demodulator
-		 * 6 - eeprom W/P
-		 * 7 - power supply
-		 * 9 - XC5000 Tuner
-		 */
-
-		/* Into reset */
-		au0828_write(dev, REG_003, 0x02);
-		au0828_write(dev, REG_002, 0x80 | 0x20 | 0x10);
-		au0828_write(dev, REG_001, 0x0);
-		au0828_write(dev, REG_000, 0x0);
-		msleep(100);
-
-		/* Out of reset (leave the cs5340 in reset until needed) */
-		au0828_write(dev, REG_003, 0x02);
-		au0828_write(dev, REG_001, 0x02);
-		au0828_write(dev, REG_002, 0x80 | 0x20 | 0x10);
-		au0828_write(dev, REG_000, 0x80 | 0x40 | 0x20);
-
-		msleep(250);
-		break;
-	case AU0828_BOARD_DVICO_FUSIONHDTV7:
-		/* GPIO's
-		 * 6 - ?
-		 * 8 - AU8522 Demodulator
-		 * 9 - XC5000 Tuner
-		 */
-
-		/* Into reset */
-		au0828_write(dev, REG_003, 0x02);
-		au0828_write(dev, REG_002, 0xa0);
-		au0828_write(dev, REG_001, 0x0);
-		au0828_write(dev, REG_000, 0x0);
-		msleep(100);
-
-		/* Out of reset */
-		au0828_write(dev, REG_003, 0x02);
-		au0828_write(dev, REG_002, 0xa0);
-		au0828_write(dev, REG_001, 0x02);
-		au0828_write(dev, REG_000, 0xa0);
-		msleep(250);
-		break;
-	}
-}
-
-/* table of devices that work with this driver */
-struct usb_device_id au0828_usb_id_table[] = {
-	{ USB_DEVICE(0x2040, 0x7200),
-		.driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q },
-	{ USB_DEVICE(0x2040, 0x7240),
-		.driver_info = AU0828_BOARD_HAUPPAUGE_HVR850 },
-	{ USB_DEVICE(0x0fe9, 0xd620),
-		.driver_info = AU0828_BOARD_DVICO_FUSIONHDTV7 },
-	{ USB_DEVICE(0x2040, 0x7210),
-		.driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q },
-	{ USB_DEVICE(0x2040, 0x7217),
-		.driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q },
-	{ USB_DEVICE(0x2040, 0x721b),
-		.driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q },
-	{ USB_DEVICE(0x2040, 0x721e),
-		.driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q },
-	{ USB_DEVICE(0x2040, 0x721f),
-		.driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q },
-	{ USB_DEVICE(0x2040, 0x7280),
-		.driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q },
-	{ USB_DEVICE(0x0fd9, 0x0008),
-		.driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q },
-	{ USB_DEVICE(0x2040, 0x7201),
-		.driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL },
-	{ USB_DEVICE(0x2040, 0x7211),
-		.driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL },
-	{ USB_DEVICE(0x2040, 0x7281),
-		.driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL },
-	{ USB_DEVICE(0x05e1, 0x0480),
-		.driver_info = AU0828_BOARD_HAUPPAUGE_WOODBURY },
-	{ USB_DEVICE(0x2040, 0x8200),
-		.driver_info = AU0828_BOARD_HAUPPAUGE_WOODBURY },
-	{ USB_DEVICE(0x2040, 0x7260),
-		.driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q },
-	{ USB_DEVICE(0x2040, 0x7213),
-		.driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q },
-	{ },
-};
-
-MODULE_DEVICE_TABLE(usb, au0828_usb_id_table);
diff --git a/drivers/media/video/au0828/au0828-cards.h b/drivers/media/video/au0828/au0828-cards.h
deleted file mode 100644
index 48a1882c2b6..00000000000
--- a/drivers/media/video/au0828/au0828-cards.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- *  Driver for the Auvitek USB bridge
- *
- *  Copyright (c) 2008 Steven Toth <stoth@linuxtv.org>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#define AU0828_BOARD_UNKNOWN		0
-#define AU0828_BOARD_HAUPPAUGE_HVR950Q	1
-#define AU0828_BOARD_HAUPPAUGE_HVR850 	2
-#define AU0828_BOARD_DVICO_FUSIONHDTV7	3
-#define AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL	4
-#define AU0828_BOARD_HAUPPAUGE_WOODBURY	5
diff --git a/drivers/media/video/au0828/au0828-core.c b/drivers/media/video/au0828/au0828-core.c
deleted file mode 100644
index 745a80a798c..00000000000
--- a/drivers/media/video/au0828/au0828-core.c
+++ /dev/null
@@ -1,282 +0,0 @@
-/*
- *  Driver for the Auvitek USB bridge
- *
- *  Copyright (c) 2008 Steven Toth <stoth@linuxtv.org>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/videodev2.h>
-#include <media/v4l2-common.h>
-#include <linux/mutex.h>
-
-#include "au0828.h"
-
-/*
- * 1 = General debug messages
- * 2 = USB handling
- * 4 = I2C related
- * 8 = Bridge related
- */
-int au0828_debug;
-module_param_named(debug, au0828_debug, int, 0644);
-MODULE_PARM_DESC(debug, "enable debug messages");
-
-static unsigned int disable_usb_speed_check;
-module_param(disable_usb_speed_check, int, 0444);
-MODULE_PARM_DESC(disable_usb_speed_check,
-		 "override min bandwidth requirement of 480M bps");
-
-#define _AU0828_BULKPIPE 0x03
-#define _BULKPIPESIZE 0xffff
-
-static int send_control_msg(struct au0828_dev *dev, u16 request, u32 value,
-			    u16 index);
-static int recv_control_msg(struct au0828_dev *dev, u16 request, u32 value,
-	u16 index, unsigned char *cp, u16 size);
-
-/* USB Direction */
-#define CMD_REQUEST_IN		0x00
-#define CMD_REQUEST_OUT		0x01
-
-u32 au0828_readreg(struct au0828_dev *dev, u16 reg)
-{
-	u8 result = 0;
-
-	recv_control_msg(dev, CMD_REQUEST_IN, 0, reg, &result, 1);
-	dprintk(8, "%s(0x%04x) = 0x%02x\n", __func__, reg, result);
-
-	return result;
-}
-
-u32 au0828_writereg(struct au0828_dev *dev, u16 reg, u32 val)
-{
-	dprintk(8, "%s(0x%04x, 0x%02x)\n", __func__, reg, val);
-	return send_control_msg(dev, CMD_REQUEST_OUT, val, reg);
-}
-
-static int send_control_msg(struct au0828_dev *dev, u16 request, u32 value,
-	u16 index)
-{
-	int status = -ENODEV;
-
-	if (dev->usbdev) {
-
-		/* cp must be memory that has been allocated by kmalloc */
-		status = usb_control_msg(dev->usbdev,
-				usb_sndctrlpipe(dev->usbdev, 0),
-				request,
-				USB_DIR_OUT | USB_TYPE_VENDOR |
-					USB_RECIP_DEVICE,
-				value, index, NULL, 0, 1000);
-
-		status = min(status, 0);
-
-		if (status < 0) {
-			printk(KERN_ERR "%s() Failed sending control message, error %d.\n",
-				__func__, status);
-		}
-
-	}
-
-	return status;
-}
-
-static int recv_control_msg(struct au0828_dev *dev, u16 request, u32 value,
-	u16 index, unsigned char *cp, u16 size)
-{
-	int status = -ENODEV;
-	mutex_lock(&dev->mutex);
-	if (dev->usbdev) {
-		status = usb_control_msg(dev->usbdev,
-				usb_rcvctrlpipe(dev->usbdev, 0),
-				request,
-				USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
-				value, index,
-				dev->ctrlmsg, size, 1000);
-
-		status = min(status, 0);
-
-		if (status < 0) {
-			printk(KERN_ERR "%s() Failed receiving control message, error %d.\n",
-				__func__, status);
-		}
-
-		/* the host controller requires heap allocated memory, which
-		   is why we didn't just pass "cp" into usb_control_msg */
-		memcpy(cp, dev->ctrlmsg, size);
-	}
-	mutex_unlock(&dev->mutex);
-	return status;
-}
-
-static void au0828_usb_disconnect(struct usb_interface *interface)
-{
-	struct au0828_dev *dev = usb_get_intfdata(interface);
-
-	dprintk(1, "%s()\n", __func__);
-
-	/* Digital TV */
-	au0828_dvb_unregister(dev);
-
-	if (AUVI_INPUT(0).type != AU0828_VMUX_UNDEFINED)
-		au0828_analog_unregister(dev);
-
-	/* I2C */
-	au0828_i2c_unregister(dev);
-
-	v4l2_device_unregister(&dev->v4l2_dev);
-
-	usb_set_intfdata(interface, NULL);
-
-	mutex_lock(&dev->mutex);
-	dev->usbdev = NULL;
-	mutex_unlock(&dev->mutex);
-
-	kfree(dev);
-
-}
-
-static int au0828_usb_probe(struct usb_interface *interface,
-	const struct usb_device_id *id)
-{
-	int ifnum, retval;
-	struct au0828_dev *dev;
-	struct usb_device *usbdev = interface_to_usbdev(interface);
-
-	ifnum = interface->altsetting->desc.bInterfaceNumber;
-
-	if (ifnum != 0)
-		return -ENODEV;
-
-	dprintk(1, "%s() vendor id 0x%x device id 0x%x ifnum:%d\n", __func__,
-		le16_to_cpu(usbdev->descriptor.idVendor),
-		le16_to_cpu(usbdev->descriptor.idProduct),
-		ifnum);
-
-	/*
-	 * Make sure we have 480 Mbps of bandwidth, otherwise things like
-	 * video stream wouldn't likely work, since 12 Mbps is generally
-	 * not enough even for most Digital TV streams.
-	 */
-	if (usbdev->speed != USB_SPEED_HIGH && disable_usb_speed_check == 0) {
-		printk(KERN_ERR "au0828: Device initialization failed.\n");
-		printk(KERN_ERR "au0828: Device must be connected to a "
-		       "high-speed USB 2.0 port.\n");
-		return -ENODEV;
-	}
-
-	dev = kzalloc(sizeof(*dev), GFP_KERNEL);
-	if (dev == NULL) {
-		printk(KERN_ERR "%s() Unable to allocate memory\n", __func__);
-		return -ENOMEM;
-	}
-
-	mutex_init(&dev->lock);
-	mutex_lock(&dev->lock);
-	mutex_init(&dev->mutex);
-	mutex_init(&dev->dvb.lock);
-	dev->usbdev = usbdev;
-	dev->boardnr = id->driver_info;
-
-	/* Create the v4l2_device */
-	retval = v4l2_device_register(&interface->dev, &dev->v4l2_dev);
-	if (retval) {
-		printk(KERN_ERR "%s() v4l2_device_register failed\n",
-		       __func__);
-		mutex_unlock(&dev->lock);
-		kfree(dev);
-		return -EIO;
-	}
-
-	/* Power Up the bridge */
-	au0828_write(dev, REG_600, 1 << 4);
-
-	/* Bring up the GPIO's and supporting devices */
-	au0828_gpio_setup(dev);
-
-	/* I2C */
-	au0828_i2c_register(dev);
-
-	/* Setup */
-	au0828_card_setup(dev);
-
-	/* Analog TV */
-	if (AUVI_INPUT(0).type != AU0828_VMUX_UNDEFINED)
-		au0828_analog_register(dev, interface);
-
-	/* Digital TV */
-	au0828_dvb_register(dev);
-
-	/* Store the pointer to the au0828_dev so it can be accessed in
-	   au0828_usb_disconnect */
-	usb_set_intfdata(interface, dev);
-
-	printk(KERN_INFO "Registered device AU0828 [%s]\n",
-		dev->board.name == NULL ? "Unset" : dev->board.name);
-
-	mutex_unlock(&dev->lock);
-
-	return 0;
-}
-
-static struct usb_driver au0828_usb_driver = {
-	.name		= DRIVER_NAME,
-	.probe		= au0828_usb_probe,
-	.disconnect	= au0828_usb_disconnect,
-	.id_table	= au0828_usb_id_table,
-};
-
-static int __init au0828_init(void)
-{
-	int ret;
-
-	if (au0828_debug & 1)
-		printk(KERN_INFO "%s() Debugging is enabled\n", __func__);
-
-	if (au0828_debug & 2)
-		printk(KERN_INFO "%s() USB Debugging is enabled\n", __func__);
-
-	if (au0828_debug & 4)
-		printk(KERN_INFO "%s() I2C Debugging is enabled\n", __func__);
-
-	if (au0828_debug & 8)
-		printk(KERN_INFO "%s() Bridge Debugging is enabled\n",
-		       __func__);
-
-	printk(KERN_INFO "au0828 driver loaded\n");
-
-	ret = usb_register(&au0828_usb_driver);
-	if (ret)
-		printk(KERN_ERR "usb_register failed, error = %d\n", ret);
-
-	return ret;
-}
-
-static void __exit au0828_exit(void)
-{
-	usb_deregister(&au0828_usb_driver);
-}
-
-module_init(au0828_init);
-module_exit(au0828_exit);
-
-MODULE_DESCRIPTION("Driver for Auvitek AU0828 based products");
-MODULE_AUTHOR("Steven Toth <stoth@linuxtv.org>");
-MODULE_LICENSE("GPL");
-MODULE_VERSION("0.0.2");
diff --git a/drivers/media/video/au0828/au0828-dvb.c b/drivers/media/video/au0828/au0828-dvb.c
deleted file mode 100644
index b328f6550d0..00000000000
--- a/drivers/media/video/au0828/au0828-dvb.c
+++ /dev/null
@@ -1,500 +0,0 @@
-/*
- *  Driver for the Auvitek USB bridge
- *
- *  Copyright (c) 2008 Steven Toth <stoth@linuxtv.org>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/init.h>
-#include <linux/device.h>
-#include <linux/suspend.h>
-#include <media/v4l2-common.h>
-#include <media/tuner.h>
-
-#include "au0828.h"
-#include "au8522.h"
-#include "xc5000.h"
-#include "mxl5007t.h"
-#include "tda18271.h"
-
-DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
-
-#define _AU0828_BULKPIPE 0x83
-#define _BULKPIPESIZE 0xe522
-
-static u8 hauppauge_hvr950q_led_states[] = {
-	0x00, /* off */
-	0x02, /* yellow */
-	0x04, /* green */
-};
-
-static struct au8522_led_config hauppauge_hvr950q_led_cfg = {
-	.gpio_output = 0x00e0,
-	.gpio_output_enable  = 0x6006,
-	.gpio_output_disable = 0x0660,
-
-	.gpio_leds = 0x00e2,
-	.led_states  = hauppauge_hvr950q_led_states,
-	.num_led_states = sizeof(hauppauge_hvr950q_led_states),
-
-	.vsb8_strong   = 20 /* dB */ * 10,
-	.qam64_strong  = 25 /* dB */ * 10,
-	.qam256_strong = 32 /* dB */ * 10,
-};
-
-static struct au8522_config hauppauge_hvr950q_config = {
-	.demod_address = 0x8e >> 1,
-	.status_mode   = AU8522_DEMODLOCKING,
-	.qam_if        = AU8522_IF_6MHZ,
-	.vsb_if        = AU8522_IF_6MHZ,
-	.led_cfg       = &hauppauge_hvr950q_led_cfg,
-};
-
-static struct au8522_config fusionhdtv7usb_config = {
-	.demod_address = 0x8e >> 1,
-	.status_mode   = AU8522_DEMODLOCKING,
-	.qam_if        = AU8522_IF_6MHZ,
-	.vsb_if        = AU8522_IF_6MHZ,
-};
-
-static struct au8522_config hauppauge_woodbury_config = {
-	.demod_address = 0x8e >> 1,
-	.status_mode   = AU8522_DEMODLOCKING,
-	.qam_if        = AU8522_IF_4MHZ,
-	.vsb_if        = AU8522_IF_3_25MHZ,
-};
-
-static struct xc5000_config hauppauge_xc5000a_config = {
-	.i2c_address      = 0x61,
-	.if_khz           = 6000,
-	.chip_id          = XC5000A,
-};
-
-static struct xc5000_config hauppauge_xc5000c_config = {
-	.i2c_address      = 0x61,
-	.if_khz           = 6000,
-	.chip_id          = XC5000C,
-};
-
-static struct mxl5007t_config mxl5007t_hvr950q_config = {
-	.xtal_freq_hz = MxL_XTAL_24_MHZ,
-	.if_freq_hz = MxL_IF_6_MHZ,
-};
-
-static struct tda18271_config hauppauge_woodbury_tunerconfig = {
-	.gate    = TDA18271_GATE_DIGITAL,
-};
-
-static void au0828_restart_dvb_streaming(struct work_struct *work);
-
-/*-------------------------------------------------------------------*/
-static void urb_completion(struct urb *purb)
-{
-	struct au0828_dev *dev = purb->context;
-	int ptype = usb_pipetype(purb->pipe);
-	unsigned char *ptr;
-
-	dprintk(2, "%s()\n", __func__);
-
-	if (!dev)
-		return;
-
-	if (dev->urb_streaming == 0)
-		return;
-
-	if (ptype != PIPE_BULK) {
-		printk(KERN_ERR "%s() Unsupported URB type %d\n",
-		       __func__, ptype);
-		return;
-	}
-
-	/* See if the stream is corrupted (to work around a hardware
-	   bug where the stream gets misaligned */
-	ptr = purb->transfer_buffer;
-	if (purb->actual_length > 0 && ptr[0] != 0x47) {
-		dprintk(1, "Need to restart streaming %02x len=%d!\n",
-			ptr[0], purb->actual_length);
-		schedule_work(&dev->restart_streaming);
-		return;
-	}
-
-	/* Feed the transport payload into the kernel demux */
-	dvb_dmx_swfilter_packets(&dev->dvb.demux,
-		purb->transfer_buffer, purb->actual_length / 188);
-
-	/* Clean the buffer before we requeue */
-	memset(purb->transfer_buffer, 0, URB_BUFSIZE);
-
-	/* Requeue URB */
-	usb_submit_urb(purb, GFP_ATOMIC);
-}
-
-static int stop_urb_transfer(struct au0828_dev *dev)
-{
-	int i;
-
-	dprintk(2, "%s()\n", __func__);
-
-	dev->urb_streaming = 0;
-	for (i = 0; i < URB_COUNT; i++) {
-		usb_kill_urb(dev->urbs[i]);
-		kfree(dev->urbs[i]->transfer_buffer);
-		usb_free_urb(dev->urbs[i]);
-	}
-
-	return 0;
-}
-
-static int start_urb_transfer(struct au0828_dev *dev)
-{
-	struct urb *purb;
-	int i, ret = -ENOMEM;
-
-	dprintk(2, "%s()\n", __func__);
-
-	if (dev->urb_streaming) {
-		dprintk(2, "%s: bulk xfer already running!\n", __func__);
-		return 0;
-	}
-
-	for (i = 0; i < URB_COUNT; i++) {
-
-		dev->urbs[i] = usb_alloc_urb(0, GFP_KERNEL);
-		if (!dev->urbs[i])
-			goto err;
-
-		purb = dev->urbs[i];
-
-		purb->transfer_buffer = kzalloc(URB_BUFSIZE, GFP_KERNEL);
-		if (!purb->transfer_buffer) {
-			usb_free_urb(purb);
-			dev->urbs[i] = NULL;
-			goto err;
-		}
-
-		purb->status = -EINPROGRESS;
-		usb_fill_bulk_urb(purb,
-				  dev->usbdev,
-				  usb_rcvbulkpipe(dev->usbdev,
-					_AU0828_BULKPIPE),
-				  purb->transfer_buffer,
-				  URB_BUFSIZE,
-				  urb_completion,
-				  dev);
-
-	}
-
-	for (i = 0; i < URB_COUNT; i++) {
-		ret = usb_submit_urb(dev->urbs[i], GFP_ATOMIC);
-		if (ret != 0) {
-			stop_urb_transfer(dev);
-			printk(KERN_ERR "%s: failed urb submission, "
-			       "err = %d\n", __func__, ret);
-			return ret;
-		}
-	}
-
-	dev->urb_streaming = 1;
-	ret = 0;
-
-err:
-	return ret;
-}
-
-static int au0828_dvb_start_feed(struct dvb_demux_feed *feed)
-{
-	struct dvb_demux *demux = feed->demux;
-	struct au0828_dev *dev = (struct au0828_dev *) demux->priv;
-	struct au0828_dvb *dvb = &dev->dvb;
-	int ret = 0;
-
-	dprintk(1, "%s()\n", __func__);
-
-	if (!demux->dmx.frontend)
-		return -EINVAL;
-
-	if (dvb) {
-		mutex_lock(&dvb->lock);
-		if (dvb->feeding++ == 0) {
-			/* Start transport */
-			au0828_write(dev, 0x608, 0x90);
-			au0828_write(dev, 0x609, 0x72);
-			au0828_write(dev, 0x60a, 0x71);
-			au0828_write(dev, 0x60b, 0x01);
-			ret = start_urb_transfer(dev);
-		}
-		mutex_unlock(&dvb->lock);
-	}
-
-	return ret;
-}
-
-static int au0828_dvb_stop_feed(struct dvb_demux_feed *feed)
-{
-	struct dvb_demux *demux = feed->demux;
-	struct au0828_dev *dev = (struct au0828_dev *) demux->priv;
-	struct au0828_dvb *dvb = &dev->dvb;
-	int ret = 0;
-
-	dprintk(1, "%s()\n", __func__);
-
-	if (dvb) {
-		mutex_lock(&dvb->lock);
-		if (--dvb->feeding == 0) {
-			/* Stop transport */
-			ret = stop_urb_transfer(dev);
-			au0828_write(dev, 0x60b, 0x00);
-		}
-		mutex_unlock(&dvb->lock);
-	}
-
-	return ret;
-}
-
-static void au0828_restart_dvb_streaming(struct work_struct *work)
-{
-	struct au0828_dev *dev = container_of(work, struct au0828_dev,
-					      restart_streaming);
-	struct au0828_dvb *dvb = &dev->dvb;
-	int ret;
-
-	if (dev->urb_streaming == 0)
-		return;
-
-	dprintk(1, "Restarting streaming...!\n");
-
-	mutex_lock(&dvb->lock);
-
-	/* Stop transport */
-	ret = stop_urb_transfer(dev);
-	au0828_write(dev, 0x608, 0x00);
-	au0828_write(dev, 0x609, 0x00);
-	au0828_write(dev, 0x60a, 0x00);
-	au0828_write(dev, 0x60b, 0x00);
-
-	/* Start transport */
-	au0828_write(dev, 0x608, 0x90);
-	au0828_write(dev, 0x609, 0x72);
-	au0828_write(dev, 0x60a, 0x71);
-	au0828_write(dev, 0x60b, 0x01);
-	ret = start_urb_transfer(dev);
-
-	mutex_unlock(&dvb->lock);
-}
-
-static int dvb_register(struct au0828_dev *dev)
-{
-	struct au0828_dvb *dvb = &dev->dvb;
-	int result;
-
-	dprintk(1, "%s()\n", __func__);
-
-	INIT_WORK(&dev->restart_streaming, au0828_restart_dvb_streaming);
-
-	/* register adapter */
-	result = dvb_register_adapter(&dvb->adapter, DRIVER_NAME, THIS_MODULE,
-				      &dev->usbdev->dev, adapter_nr);
-	if (result < 0) {
-		printk(KERN_ERR "%s: dvb_register_adapter failed "
-		       "(errno = %d)\n", DRIVER_NAME, result);
-		goto fail_adapter;
-	}
-	dvb->adapter.priv = dev;
-
-	/* register frontend */
-	result = dvb_register_frontend(&dvb->adapter, dvb->frontend);
-	if (result < 0) {
-		printk(KERN_ERR "%s: dvb_register_frontend failed "
-		       "(errno = %d)\n", DRIVER_NAME, result);
-		goto fail_frontend;
-	}
-
-	/* register demux stuff */
-	dvb->demux.dmx.capabilities =
-		DMX_TS_FILTERING | DMX_SECTION_FILTERING |
-		DMX_MEMORY_BASED_FILTERING;
-	dvb->demux.priv       = dev;
-	dvb->demux.filternum  = 256;
-	dvb->demux.feednum    = 256;
-	dvb->demux.start_feed = au0828_dvb_start_feed;
-	dvb->demux.stop_feed  = au0828_dvb_stop_feed;
-	result = dvb_dmx_init(