[media] staging: as102: Remove ENTER/LEAVE debugging macros

[~andy/linux] / drivers / staging / media / as102 / as102_fe.c

diff --git a/drivers/staging/media/as102/as102_fe.c b/drivers/staging/media/as102/as102_fe.c
index 9ce8c9daa2e7a6862bc904b99e23d9b83902a575..72b2c4813430cdce6e912c79767186c6ae0316fd 100644 (file)
--- a/drivers/staging/media/as102/as102_fe.c
+++ b/drivers/staging/media/as102/as102_fe.c
@@ -34,8 +34,6 @@ static int as102_fe_set_frontend(struct dvb_frontend *fe)
        struct as102_dev_t *dev;
        struct as10x_tune_args tune_args = { 0 };
 
-       ENTER();
-
        dev = (struct as102_dev_t *) fe->tuner_priv;
        if (dev == NULL)
                return -ENODEV;
@@ -52,7 +50,6 @@ static int as102_fe_set_frontend(struct dvb_frontend *fe)
 
        mutex_unlock(&dev->bus_adap.lock);
 
-       LEAVE();
        return (ret < 0) ? -EINVAL : 0;
 }
 
@@ -63,8 +60,6 @@ static int as102_fe_get_frontend(struct dvb_frontend *fe)
        struct as102_dev_t *dev;
        struct as10x_tps tps = { 0 };
 
-       ENTER();
-
        dev = (struct as102_dev_t *) fe->tuner_priv;
        if (dev == NULL)
                return -EINVAL;
@@ -80,13 +75,11 @@ static int as102_fe_get_frontend(struct dvb_frontend *fe)
 
        mutex_unlock(&dev->bus_adap.lock);
 
-       LEAVE();
        return (ret < 0) ? -EINVAL : 0;
 }
 
 static int as102_fe_get_tune_settings(struct dvb_frontend *fe,
                        struct dvb_frontend_tune_settings *settings) {
-       ENTER();
 
 #if 0
        dprintk(debug, "step_size    = %d\n", settings->step_size);
@@ -97,7 +90,6 @@ static int as102_fe_get_tune_settings(struct dvb_frontend *fe,
 
        settings->min_delay_ms = 1000;
 
-       LEAVE();
        return 0;
 }
 
@@ -108,8 +100,6 @@ static int as102_fe_read_status(struct dvb_frontend *fe, fe_status_t *status)
        struct as102_dev_t *dev;
        struct as10x_tune_status tstate = { 0 };
 
-       ENTER();
-
        dev = (struct as102_dev_t *) fe->tuner_priv;
        if (dev == NULL)
                return -ENODEV;
@@ -168,7 +158,6 @@ static int as102_fe_read_status(struct dvb_frontend *fe, fe_status_t *status)
 
 out:
        mutex_unlock(&dev->bus_adap.lock);
-       LEAVE();
        return ret;
 }
 
@@ -183,15 +172,12 @@ static int as102_fe_read_snr(struct dvb_frontend *fe, u16 *snr)
 {
        struct as102_dev_t *dev;
 
-       ENTER();
-
        dev = (struct as102_dev_t *) fe->tuner_priv;
        if (dev == NULL)
                return -ENODEV;
 
        *snr = dev->demod_stats.mer;
 
-       LEAVE();
        return 0;
 }
 
@@ -199,15 +185,12 @@ static int as102_fe_read_ber(struct dvb_frontend *fe, u32 *ber)
 {
        struct as102_dev_t *dev;
 
-       ENTER();
-
        dev = (struct as102_dev_t *) fe->tuner_priv;
        if (dev == NULL)
                return -ENODEV;
 
        *ber = dev->ber;
 
-       LEAVE();
        return 0;
 }
 
@@ -216,15 +199,12 @@ static int as102_fe_read_signal_strength(struct dvb_frontend *fe,
 {
        struct as102_dev_t *dev;
 
-       ENTER();
-
        dev = (struct as102_dev_t *) fe->tuner_priv;
        if (dev == NULL)
                return -ENODEV;
 
        *strength = (((0xffff * 400) * dev->signal_strength + 41000) * 2);
 
-       LEAVE();
        return 0;
 }
 
@@ -232,8 +212,6 @@ static int as102_fe_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)
 {
        struct as102_dev_t *dev;
 
-       ENTER();
-
        dev = (struct as102_dev_t *) fe->tuner_priv;
        if (dev == NULL)
                return -ENODEV;
@@ -243,7 +221,6 @@ static int as102_fe_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)
        else
                *ucblocks = 0;
 
-       LEAVE();
        return 0;
 }
 
@@ -252,8 +229,6 @@ static int as102_fe_ts_bus_ctrl(struct dvb_frontend *fe, int acquire)
        struct as102_dev_t *dev;
        int ret;
 
-       ENTER();
-
        dev = (struct as102_dev_t *) fe->tuner_priv;
        if (dev == NULL)
                return -ENODEV;
@@ -272,7 +247,6 @@ static int as102_fe_ts_bus_ctrl(struct dvb_frontend *fe, int acquire)
 
        mutex_unlock(&dev->bus_adap.lock);
 
-       LEAVE();
        return ret;
 }