[media] saa7134: swap ts_init_encoder and ts_reset_encoder
authorHans Verkuil <hans.verkuil@cisco.com>
Thu, 17 Apr 2014 07:23:07 +0000 (04:23 -0300)
committerMauro Carvalho Chehab <m.chehab@samsung.com>
Tue, 13 May 2014 16:26:44 +0000 (13:26 -0300)
This will make the next patch a bit easier to read.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
drivers/media/pci/saa7134/saa7134-empress.c

index 07bd06ccc5f52da14edb9f352b16a4203bcee2bb..393c9f18d12dc5a39f8ef16f2010d678f18da1fa 100644 (file)
@@ -48,17 +48,7 @@ MODULE_PARM_DESC(debug,"enable debug messages");
 
 /* ------------------------------------------------------------------ */
 
-static void ts_reset_encoder(struct saa7134_dev* dev)
-{
-       if (!dev->empress_started)
-               return;
-
-       saa_writeb(SAA7134_SPECIAL_MODE, 0x00);
-       msleep(10);
-       saa_writeb(SAA7134_SPECIAL_MODE, 0x01);
-       msleep(100);
-       dev->empress_started = 0;
-}
+static void ts_reset_encoder(struct saa7134_dev* dev);
 
 static int ts_init_encoder(struct saa7134_dev* dev)
 {
@@ -79,6 +69,18 @@ static int ts_init_encoder(struct saa7134_dev* dev)
        return 0;
 }
 
+static void ts_reset_encoder(struct saa7134_dev* dev)
+{
+       if (!dev->empress_started)
+               return;
+
+       saa_writeb(SAA7134_SPECIAL_MODE, 0x00);
+       msleep(10);
+       saa_writeb(SAA7134_SPECIAL_MODE, 0x01);
+       msleep(100);
+       dev->empress_started = 0;
+}
+
 /* ------------------------------------------------------------------ */
 
 static int ts_open(struct file *file)