Commit 4a5f46f2 authored by Nithin Sujir's avatar Nithin Sujir Committed by David S. Miller

tg3: Use descriptive label names in tg3_start

Signed-off-by: default avatarNithin Nayak Sujir <nsujir@broadcom.com>
Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 328947ff
...@@ -11244,7 +11244,7 @@ static int tg3_start(struct tg3 *tp, bool reset_phy, bool test_irq, ...@@ -11244,7 +11244,7 @@ static int tg3_start(struct tg3 *tp, bool reset_phy, bool test_irq,
*/ */
err = tg3_alloc_consistent(tp); err = tg3_alloc_consistent(tp);
if (err) if (err)
goto err_out1; goto out_ints_fini;
tg3_napi_init(tp); tg3_napi_init(tp);
...@@ -11258,7 +11258,7 @@ static int tg3_start(struct tg3 *tp, bool reset_phy, bool test_irq, ...@@ -11258,7 +11258,7 @@ static int tg3_start(struct tg3 *tp, bool reset_phy, bool test_irq,
tnapi = &tp->napi[i]; tnapi = &tp->napi[i];
free_irq(tnapi->irq_vec, tnapi); free_irq(tnapi->irq_vec, tnapi);
} }
goto err_out2; goto out_napi_fini;
} }
} }
...@@ -11276,7 +11276,7 @@ static int tg3_start(struct tg3 *tp, bool reset_phy, bool test_irq, ...@@ -11276,7 +11276,7 @@ static int tg3_start(struct tg3 *tp, bool reset_phy, bool test_irq,
tg3_full_unlock(tp); tg3_full_unlock(tp);
if (err) if (err)
goto err_out3; goto out_free_irq;
if (test_irq && tg3_flag(tp, USING_MSI)) { if (test_irq && tg3_flag(tp, USING_MSI)) {
err = tg3_test_msi(tp); err = tg3_test_msi(tp);
...@@ -11287,7 +11287,7 @@ static int tg3_start(struct tg3 *tp, bool reset_phy, bool test_irq, ...@@ -11287,7 +11287,7 @@ static int tg3_start(struct tg3 *tp, bool reset_phy, bool test_irq,
tg3_free_rings(tp); tg3_free_rings(tp);
tg3_full_unlock(tp); tg3_full_unlock(tp);
goto err_out2; goto out_napi_fini;
} }
if (!tg3_flag(tp, 57765_PLUS) && tg3_flag(tp, USING_MSI)) { if (!tg3_flag(tp, 57765_PLUS) && tg3_flag(tp, USING_MSI)) {
...@@ -11327,18 +11327,18 @@ static int tg3_start(struct tg3 *tp, bool reset_phy, bool test_irq, ...@@ -11327,18 +11327,18 @@ static int tg3_start(struct tg3 *tp, bool reset_phy, bool test_irq,
return 0; return 0;
err_out3: out_free_irq:
for (i = tp->irq_cnt - 1; i >= 0; i--) { for (i = tp->irq_cnt - 1; i >= 0; i--) {
struct tg3_napi *tnapi = &tp->napi[i]; struct tg3_napi *tnapi = &tp->napi[i];
free_irq(tnapi->irq_vec, tnapi); free_irq(tnapi->irq_vec, tnapi);
} }
err_out2: out_napi_fini:
tg3_napi_disable(tp); tg3_napi_disable(tp);
tg3_napi_fini(tp); tg3_napi_fini(tp);
tg3_free_consistent(tp); tg3_free_consistent(tp);
err_out1: out_ints_fini:
tg3_ints_fini(tp); tg3_ints_fini(tp);
return err; return err;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment