aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/broadcom/tg3.c
diff options
context:
space:
mode:
authorNithin Sujir <nsujir@broadcom.com>2013-05-23 07:11:25 -0400
committerDavid S. Miller <davem@davemloft.net>2013-05-25 01:23:29 -0400
commit4a5f46f2fef13ecfc1f396d0caf75031a7a15422 (patch)
treef1cda3ea9c99dc3e6516815eb9f3dc988baabfd1 /drivers/net/ethernet/broadcom/tg3.c
parent328947ff2609989fefe6dfd1143cc0787a5ec862 (diff)
tg3: Use descriptive label names in tg3_start
Signed-off-by: Nithin Nayak Sujir <nsujir@broadcom.com> Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/tg3.c')
-rw-r--r--drivers/net/ethernet/broadcom/tg3.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index 693c5f23c3ea..6ab02d6a0eb3 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -11244,7 +11244,7 @@ static int tg3_start(struct tg3 *tp, bool reset_phy, bool test_irq,
11244 */ 11244 */
11245 err = tg3_alloc_consistent(tp); 11245 err = tg3_alloc_consistent(tp);
11246 if (err) 11246 if (err)
11247 goto err_out1; 11247 goto out_ints_fini;
11248 11248
11249 tg3_napi_init(tp); 11249 tg3_napi_init(tp);
11250 11250
@@ -11258,7 +11258,7 @@ static int tg3_start(struct tg3 *tp, bool reset_phy, bool test_irq,
11258 tnapi = &tp->napi[i]; 11258 tnapi = &tp->napi[i];
11259 free_irq(tnapi->irq_vec, tnapi); 11259 free_irq(tnapi->irq_vec, tnapi);
11260 } 11260 }
11261 goto err_out2; 11261 goto out_napi_fini;
11262 } 11262 }
11263 } 11263 }
11264 11264
@@ -11276,7 +11276,7 @@ static int tg3_start(struct tg3 *tp, bool reset_phy, bool test_irq,
11276 tg3_full_unlock(tp); 11276 tg3_full_unlock(tp);
11277 11277
11278 if (err) 11278 if (err)
11279 goto err_out3; 11279 goto out_free_irq;
11280 11280
11281 if (test_irq && tg3_flag(tp, USING_MSI)) { 11281 if (test_irq && tg3_flag(tp, USING_MSI)) {
11282 err = tg3_test_msi(tp); 11282 err = tg3_test_msi(tp);
@@ -11287,7 +11287,7 @@ static int tg3_start(struct tg3 *tp, bool reset_phy, bool test_irq,
11287 tg3_free_rings(tp); 11287 tg3_free_rings(tp);
11288 tg3_full_unlock(tp); 11288 tg3_full_unlock(tp);
11289 11289
11290 goto err_out2; 11290 goto out_napi_fini;
11291 } 11291 }
11292 11292
11293 if (!tg3_flag(tp, 57765_PLUS) && tg3_flag(tp, USING_MSI)) { 11293 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 11327
11328 return 0; 11328 return 0;
11329 11329
11330err_out3: 11330out_free_irq:
11331 for (i = tp->irq_cnt - 1; i >= 0; i--) { 11331 for (i = tp->irq_cnt - 1; i >= 0; i--) {
11332 struct tg3_napi *tnapi = &tp->napi[i]; 11332 struct tg3_napi *tnapi = &tp->napi[i];
11333 free_irq(tnapi->irq_vec, tnapi); 11333 free_irq(tnapi->irq_vec, tnapi);
11334 } 11334 }
11335 11335
11336err_out2: 11336out_napi_fini:
11337 tg3_napi_disable(tp); 11337 tg3_napi_disable(tp);
11338 tg3_napi_fini(tp); 11338 tg3_napi_fini(tp);
11339 tg3_free_consistent(tp); 11339 tg3_free_consistent(tp);
11340 11340
11341err_out1: 11341out_ints_fini:
11342 tg3_ints_fini(tp); 11342 tg3_ints_fini(tp);
11343 11343
11344 return err; 11344 return err;