[PATCH 6/6] [media] cx24116: Delete jump targets in cx24116_attach()

[SF Markus Elfring]

From: Markus Elfring <elfr...@users.sourceforge.net>
Date: Wed, 30 Aug 2017 08:44:29 +0200

* 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 two jump targets which became unnecessary with this refactoring.

Signed-off-by: Markus Elfring <elfr...@users.sourceforge.net>
---
 drivers/media/dvb-frontends/cx24116.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/media/dvb-frontends/cx24116.c 
b/drivers/media/dvb-frontends/cx24116.c
index 902a60d2e1b5..8fb3f095e21c 100644
--- a/drivers/media/dvb-frontends/cx24116.c
+++ b/drivers/media/dvb-frontends/cx24116.c
@@ -1125,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;
@@ -1134,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 */
@@ -1143,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);
 
-- 
2.14.1