[media] rtl28xxu: convert to new DVB USB

Tested-by: Hin-Tak Leung <htl10@users.sourceforge.net>
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

6 files changed, 260 insertions, 405 deletions

diff --git a/drivers/media/dvb/dvb-usb-v2/Kconfig b/drivers/media/dvb/dvb-usb-v2/Kconfig
index 14a635b97b0b..ed87935dc8d4 100644
--- a/drivers/media/dvb/dvb-usb-v2/Kconfig
+++ b/drivers/media/dvb/dvb-usb-v2/Kconfig
@@ -124,3 +124,16 @@ config DVB_USB_MXL111SF
         help
           Say Y here to support the MxL111SF USB2.0 DTV receiver.
 
+config DVB_USB_RTL28XXU
+        tristate "Realtek RTL28xxU DVB USB support"
+        depends on DVB_USB_V2 && EXPERIMENTAL
+        select DVB_RTL2830
+        select DVB_RTL2832
+        select MEDIA_TUNER_QT1010 if !MEDIA_TUNER_CUSTOMISE
+        select MEDIA_TUNER_MT2060 if !MEDIA_TUNER_CUSTOMISE
+        select MEDIA_TUNER_MXL5005S if !MEDIA_TUNER_CUSTOMISE
+        select MEDIA_TUNER_FC0012 if !MEDIA_TUNER_CUSTOMISE
+        select MEDIA_TUNER_FC0013 if !MEDIA_TUNER_CUSTOMISE
+        help
+          Say Y here to support the Realtek RTL28xxU DVB USB receiver.
+
diff --git a/drivers/media/dvb/dvb-usb-v2/Makefile b/drivers/media/dvb/dvb-usb-v2/Makefile
index 26659bc7fa60..002e88883827 100644
--- a/drivers/media/dvb/dvb-usb-v2/Makefile
+++ b/drivers/media/dvb/dvb-usb-v2/Makefile
@@ -36,6 +36,9 @@ obj-$(CONFIG_DVB_USB_MXL111SF) += dvb-usb-mxl111sf.o
 obj-$(CONFIG_DVB_USB_MXL111SF) += mxl111sf-demod.o
 obj-$(CONFIG_DVB_USB_MXL111SF) += mxl111sf-tuner.o
 
+dvb-usb-rtl28xxu-objs = rtl28xxu.o
+obj-$(CONFIG_DVB_USB_RTL28XXU) += dvb-usb-rtl28xxu.o
+
 ccflags-y += -I$(srctree)/drivers/media/dvb/dvb-core
 ccflags-y += -I$(srctree)/drivers/media/dvb/frontends/
 ccflags-y += -I$(srctree)/drivers/media/common/tuners
diff --git a/drivers/media/dvb/dvb-usb/rtl28xxu.c b/drivers/media/dvb/dvb-usb-v2/rtl28xxu.c
index 6bd0bd792437..493d531109af 100644
--- a/drivers/media/dvb/dvb-usb/rtl28xxu.c
+++ b/drivers/media/dvb/dvb-usb-v2/rtl28xxu.c
@@ -31,10 +31,6 @@
 #include "fc0012.h"
 #include "fc0013.h"
 
-/* debug */
-static int dvb_usb_rtl28xxu_debug;
-module_param_named(debug, dvb_usb_rtl28xxu_debug, int, 0644);
-MODULE_PARM_DESC(debug, "set debugging level" DVB_USB_DEBUG_STATUS);
 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 
 static int rtl28xxu_ctrl_msg(struct dvb_usb_device *d, struct rtl28xxu_req *req)
@@ -66,8 +62,7 @@ static int rtl28xxu_ctrl_msg(struct dvb_usb_device *d, struct rtl28xxu_req *req)
         if (ret > 0)
                 ret = 0;
 
-        deb_dump(0, requesttype, req->value, req->index, buf, req->size,
-                        deb_xfer);
+        deb_dump(0, requesttype, req->value, req->index, buf, req->size);
 
         /* read request, copy returned data to return buf */
         if (!ret && requesttype == (USB_TYPE_VENDOR | USB_DIR_IN))
@@ -80,7 +75,7 @@ static int rtl28xxu_ctrl_msg(struct dvb_usb_device *d, struct rtl28xxu_req *req)
 
         return ret;
 err:
-        deb_info("%s: failed=%d\n", __func__, ret);
+        dev_dbg(&d->udev->dev, "%s: failed=%d\n", __func__, ret);
         return ret;
 }
 
@@ -291,7 +286,8 @@ static struct rtl2830_config rtl28xxu_rtl2830_mxl5005s_config = {
 static int rtl2831u_frontend_attach(struct dvb_usb_adapter *adap)
 {
         int ret;
-        struct rtl28xxu_priv *priv = adap->dev->priv;
+        struct dvb_usb_device *d = adap_to_d(adap);
+        struct rtl28xxu_priv *priv = d_to_priv(d);
         u8 buf[1];
         struct rtl2830_config *rtl2830_config;
         /* open RTL2831U/RTL2830 I2C gate */
@@ -301,7 +297,7 @@ static int rtl2831u_frontend_attach(struct dvb_usb_adapter *adap)
         /* for QT1010 tuner probe */
         struct rtl28xxu_req req_qt1010 = { 0x0fc4, CMD_I2C_RD, 1, buf };
 
-        deb_info("%s:\n", __func__);
+        dev_dbg(&d->udev->dev, "%s:\n", __func__);
 
         /*
          * RTL2831U GPIOs
@@ -312,12 +308,12 @@ static int rtl2831u_frontend_attach(struct dvb_usb_adapter *adap)
          */
 
         /* GPIO direction */
-        ret = rtl28xx_wr_reg(adap->dev, SYS_GPIO_DIR, 0x0a);
+        ret = rtl28xx_wr_reg(d, SYS_GPIO_DIR, 0x0a);
         if (ret)
                 goto err;
 
         /* enable as output GPIO0, GPIO2, GPIO4 */
-        ret = rtl28xx_wr_reg(adap->dev, SYS_GPIO_OUT_EN, 0x15);
+        ret = rtl28xx_wr_reg(d, SYS_GPIO_OUT_EN, 0x15);
         if (ret)
                 goto err;
 
@@ -330,58 +326,58 @@ static int rtl2831u_frontend_attach(struct dvb_usb_adapter *adap)
         msleep(20);
 
         /* open demod I2C gate */
-        ret = rtl28xxu_ctrl_msg(adap->dev, &req_gate);
+        ret = rtl28xxu_ctrl_msg(d, &req_gate);
         if (ret)
                 goto err;
 
         /* check QT1010 ID(?) register; reg=0f val=2c */
-        ret = rtl28xxu_ctrl_msg(adap->dev, &req_qt1010);
+        ret = rtl28xxu_ctrl_msg(d, &req_qt1010);
         if (ret == 0 && buf[0] == 0x2c) {
                 priv->tuner = TUNER_RTL2830_QT1010;
                 rtl2830_config = &rtl28xxu_rtl2830_qt1010_config;
-                deb_info("%s: QT1010\n", __func__);
+                dev_dbg(&d->udev->dev, "%s: QT1010\n", __func__);
                 goto found;
         } else {
-                deb_info("%s: QT1010 probe failed=%d - %02x\n",
-                        __func__, ret, buf[0]);
+                dev_dbg(&d->udev->dev, "%s: QT1010 probe failed=%d - %02x\n",
+                                __func__, ret, buf[0]);
         }
 
         /* open demod I2C gate */
-        ret = rtl28xxu_ctrl_msg(adap->dev, &req_gate);
+        ret = rtl28xxu_ctrl_msg(d, &req_gate);
         if (ret)
                 goto err;
 
         /* check MT2060 ID register; reg=00 val=63 */
-        ret = rtl28xxu_ctrl_msg(adap->dev, &req_mt2060);
+        ret = rtl28xxu_ctrl_msg(d, &req_mt2060);
         if (ret == 0 && buf[0] == 0x63) {
                 priv->tuner = TUNER_RTL2830_MT2060;
                 rtl2830_config = &rtl28xxu_rtl2830_mt2060_config;
-                deb_info("%s: MT2060\n", __func__);
+                dev_dbg(&d->udev->dev, "%s: MT2060\n", __func__);
                 goto found;
         } else {
-                deb_info("%s: MT2060 probe failed=%d - %02x\n",
-                        __func__, ret, buf[0]);
+                dev_dbg(&d->udev->dev, "%s: MT2060 probe failed=%d - %02x\n",
+                                __func__, ret, buf[0]);
         }