V4L/DVB (4946): Cx88: Move cx88_dvb_bus_ctrl out of the card-specific area

This function should not be in the card-specific area of the file.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 20 insertions, 18 deletions

diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index d9907ce8ad4b..694002a7dfc2 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -100,6 +100,26 @@ static struct videobuf_queue_ops dvb_qops = {
 };
 
 /* ------------------------------------------------------------------ */
+
+static int cx88_dvb_bus_ctrl(struct dvb_frontend* fe, int acquire)
+{
+        struct cx8802_dev *dev= fe->dvb->priv;
+        struct cx8802_driver *drv = NULL;
+        int ret = 0;
+
+        drv = cx8802_get_driver(dev, CX88_MPEG_DVB);
+        if (drv) {
+                if(acquire)
+                        ret = drv->request_acquire(drv);
+                else
+                        ret = drv->request_release(drv);
+        }
+
+        return ret;
+}
+
+/* ------------------------------------------------------------------ */
+
 static int dvico_fusionhdtv_demod_init(struct dvb_frontend* fe)
 {
         static u8 clock_config []  = { CLOCK_CTL,  0x38, 0x39 };
@@ -287,24 +307,6 @@ static struct cx22702_config hauppauge_hvr_config = {
         .output_mode   = CX22702_SERIAL_OUTPUT,
 };
 
-static int cx88_dvb_bus_ctrl(struct dvb_frontend* fe,
-        int acquire)
-{
-        struct cx8802_dev *dev= fe->dvb->priv;
-        struct cx8802_driver *drv = NULL;
-        int ret = 0;
-
-        drv = cx8802_get_driver(dev, CX88_MPEG_DVB);
-        if (drv) {
-                if(acquire)
-                        ret = drv->request_acquire(drv);
-                else
-                        ret = drv->request_release(drv);
-        }
-
-        return ret;
-}
-
 static int or51132_set_ts_param(struct dvb_frontend* fe,
                                 int is_punctured)
 {