From: Michael Krufky <mkrufky@linuxtv.org>
Date: Tue, 5 Dec 2006 04:38:58 +0000 (-0300)
Subject: V4L/DVB (4946): Cx88: Move cx88_dvb_bus_ctrl out of the card-specific area
X-Git-Tag: v2.6.20-rc1~145^2~5^2~5
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22f3f17dd705c476d2c8a2d879ddacaa8f9237e3;p=linux-2.6

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>
---

diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index d9907ce8ad..694002a7df 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)
 {