media: dvb-frontends: delete jump targets

* Return directly after a call of the function "kzalloc" failed
  at the beginning.

* Move a bit of exception handling code into an if branch.

* Delete jump targets which became unnecessary with this refactoring.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Hans Verkuil <hansverk@cisco.com>

diff --git a/drivers/media/dvb-frontends/cx24113.c b/drivers/media/dvb-frontends/cx24113.c
index 2c5502cab5e1fe2429f4ff883156e1dc8d5ea77a..ee1f704f81f2d6e4288fcdd5d0a47f1cb24458ab 100644 (file)
--- a/drivers/media/dvb-frontends/cx24113.c
+++ b/drivers/media/dvb-frontends/cx24113.c
@@ -556,7 +556,7 @@ struct dvb_frontend *cx24113_attach(struct dvb_frontend *fe,
        int rc;
 
        if (!state)
-               goto error;
+               return NULL;
 
        /* setup the state */
        state->config = config;

diff --git a/drivers/media/dvb-frontends/cx24116.c b/drivers/media/dvb-frontends/cx24116.c
index 531c5861a27e072652cb964e9a0c7fb16a8b68e9..8fb3f095e21cc8f38dd683e14218c1d57beacf54 100644 (file)
--- a/drivers/media/dvb-frontends/cx24116.c
+++ b/drivers/media/dvb-frontends/cx24116.c
@@ -226,10 +226,8 @@ static int cx24116_writeregN(struct cx24116_state *state, int reg,
        u8 *buf;
 
        buf = kmalloc(len + 1, GFP_KERNEL);
-       if (buf == NULL) {
-               ret = -ENOMEM;
-               goto error;
-       }
+       if (!buf)
+               return -ENOMEM;
 
        *(buf) = reg;
        memcpy(buf + 1, data, len);
@@ -250,7 +248,6 @@ static int cx24116_writeregN(struct cx24116_state *state, int reg,
                ret = -EREMOTEIO;
        }
 
-error:
        kfree(buf);
 
        return ret;
@@ -1128,7 +1125,7 @@ struct dvb_frontend *cx24116_attach(const struct cx24116_config *config,
        /* allocate memory for the internal state */
        state = kzalloc(sizeof(*state), GFP_KERNEL);
        if (state == NULL)
-               goto error1;
+               return NULL;
 
        state->config = config;
        state->i2c = i2c;
@@ -1137,8 +1134,9 @@ struct dvb_frontend *cx24116_attach(const struct cx24116_config *config,
        ret = (cx24116_readreg(state, 0xFF) << 8) |
                cx24116_readreg(state, 0xFE);
        if (ret != 0x0501) {
+               kfree(state);
                printk(KERN_INFO "Invalid probe, probably not a CX24116 device\n");
-               goto error2;
+               return NULL;
        }
 
        /* create dvb_frontend */
@@ -1146,9 +1144,6 @@ struct dvb_frontend *cx24116_attach(const struct cx24116_config *config,
                sizeof(struct dvb_frontend_ops));
        state->frontend.demodulator_priv = state;
        return &state->frontend;
-
-error2: kfree(state);
-error1: return NULL;
 }
 EXPORT_SYMBOL(cx24116_attach);
 

diff --git a/drivers/media/dvb-frontends/ds3000.c b/drivers/media/dvb-frontends/ds3000.c
index 3e347d03acb3abd4a7838e4c313e09aa6c741434..bd4f8278c90660076235e44cdc1bd5ca8e8f48ec 100644 (file)
--- a/drivers/media/dvb-frontends/ds3000.c
+++ b/drivers/media/dvb-frontends/ds3000.c
@@ -841,7 +841,7 @@ struct dvb_frontend *ds3000_attach(const struct ds3000_config *config,
        /* allocate memory for the internal state */
        state = kzalloc(sizeof(*state), GFP_KERNEL);
        if (!state)
-               goto error2;
+               return NULL;
 
        state->config = config;
        state->i2c = i2c;
@@ -850,8 +850,9 @@ struct dvb_frontend *ds3000_attach(const struct ds3000_config *config,
        /* check if the demod is present */
        ret = ds3000_readreg(state, 0x00) & 0xfe;
        if (ret != 0xe0) {
+               kfree(state);
                printk(KERN_ERR "Invalid probe, probably not a DS3000\n");
-               goto error3;
+               return NULL;
        }
 
        printk(KERN_INFO "DS3000 chip version: %d.%d attached.\n",
@@ -869,11 +870,6 @@ struct dvb_frontend *ds3000_attach(const struct ds3000_config *config,
         */
        ds3000_set_voltage(&state->frontend, SEC_VOLTAGE_OFF);
        return &state->frontend;
-
-error3:
-       kfree(state);
-error2:
-       return NULL;
 }
 EXPORT_SYMBOL(ds3000_attach);
 

diff --git a/drivers/media/dvb-frontends/mb86a20s.c b/drivers/media/dvb-frontends/mb86a20s.c
index ba7a433dd42476bc4dba2e2d67cada3bbb13ca62..bdaf9d235fed0b245ef6fa828104dec41f1fd1ae 100644 (file)
--- a/drivers/media/dvb-frontends/mb86a20s.c
+++ b/drivers/media/dvb-frontends/mb86a20s.c
@@ -2073,7 +2073,7 @@ struct dvb_frontend *mb86a20s_attach(const struct mb86a20s_config *config,
        /* allocate memory for the internal state */
        state = kzalloc(sizeof(*state), GFP_KERNEL);
        if (!state)
-               goto error;
+               return NULL;
 
        /* setup the state */
        state->config = config;
@@ -2086,22 +2086,16 @@ struct dvb_frontend *mb86a20s_attach(const struct mb86a20s_config *config,
 
        /* Check if it is a mb86a20s frontend */
        rev = mb86a20s_readreg(state, 0);
-
-       if (rev == 0x13) {
-               dev_info(&i2c->dev,
-                        "Detected a Fujitsu mb86a20s frontend\n");
-       } else {
+       if (rev != 0x13) {
+               kfree(state);
                dev_dbg(&i2c->dev,
                        "Frontend revision %d is unknown - aborting.\n",
                       rev);
-               goto error;
+               return NULL;
        }
 
+       dev_info(&i2c->dev, "Detected a Fujitsu mb86a20s frontend\n");
        return &state->frontend;
-
-error:
-       kfree(state);
-       return NULL;
 }
 EXPORT_SYMBOL(mb86a20s_attach);