[PATCH 3/3] [media] mb86a20s: Delete a jump target in mb86a20s_attach()

[SF Markus Elfring]

From: Markus Elfring <elfr...@users.sourceforge.net>
Date: Thu, 31 Aug 2017 21:34:58 +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.

* Adjust a condition check.

* Delete the jump target "error" which became unnecessary
  with this refactoring.

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

diff --git a/drivers/media/dvb-frontends/mb86a20s.c 
b/drivers/media/dvb-frontends/mb86a20s.c
index ba7a433dd424..bdaf9d235fed 100644
--- 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);
 
-- 
2.14.1