This is an automatic generated email to let you know that the following patch 
were queued at the 
http://git.linuxtv.org/media_tree.git tree:

Subject: [media] media: drx39xyj - use drxj_set_lna_state() and remove 
duplicate LNA code
Author:  Shuah Khan <[email protected]>
Date:    Thu Jul 24 17:29:28 2014 -0300

drx39xxj_set_lna() and drx39xxj_set_frontend() set LNA. Instead of
duplicating LNA configure code, change to use drxj_set_lna_state()
which sets LNA to the caller requested state (on or off).

Signed-off-by: Shuah Khan <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>

 drivers/media/dvb-frontends/drx39xyj/drxj.c |   29 +-------------------------
 1 files changed, 2 insertions(+), 27 deletions(-)

---

http://git.linuxtv.org/media_tree.git?a=commitdiff;h=b601fe5688ae285693c64e833003c14acb38378a

diff --git a/drivers/media/dvb-frontends/drx39xyj/drxj.c 
b/drivers/media/dvb-frontends/drx39xyj/drxj.c
index bcf0a23..200554d 100644
--- a/drivers/media/dvb-frontends/drx39xyj/drxj.c
+++ b/drivers/media/dvb-frontends/drx39xyj/drxj.c
@@ -12154,13 +12154,7 @@ static int drx39xxj_set_frontend(struct dvb_frontend 
*fe)
                return -EINVAL;
        }
        /* Just for giggles, let's shut off the LNA again.... */
-       uio_data.uio = DRX_UIO1;
-       uio_data.value = false;
-       result = ctrl_uio_write(demod, &uio_data);
-       if (result != 0) {
-               pr_err("Failed to disable LNA!\n");
-               return 0;
-       }
+       drxj_set_lna_state(demod, false);
 
        /* After set_frontend, except for strength, stats aren't available */
        p->strength.stat[0].scale = FE_SCALE_RELATIVE;
@@ -12243,26 +12237,7 @@ static int drx39xxj_set_lna(struct dvb_frontend *fe)
                }
        }
 
-       /* Turn off the LNA */
-       uio_cfg.uio = DRX_UIO1;
-       uio_cfg.mode = DRX_UIO_MODE_READWRITE;
-       /* Configure user-I/O #3: enable read/write */
-       result = ctrl_set_uio_cfg(demod, &uio_cfg);
-       if (result) {
-               pr_err("Failed to setup LNA GPIO!\n");
-               return result;
-       }
-
-       uio_data.uio = DRX_UIO1;
-       uio_data.value = c->lna;
-       result = ctrl_uio_write(demod, &uio_data);
-       if (result != 0) {
-               pr_err("Failed to %sable LNA!\n",
-                      c->lna ? "en" : "dis");
-               return result;
-       }
-
-       return 0;
+       return drxj_set_lna_state(demod, c->lna);
 }
 
 static int drx39xxj_get_tune_settings(struct dvb_frontend *fe,

_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits

Reply via email to