Skip to content

Commit 4a5f46f

Browse files
Nithin Sujirdavem330
authored andcommitted
tg3: Use descriptive label names in tg3_start
Signed-off-by: Nithin Nayak Sujir <[email protected]> Signed-off-by: Michael Chan <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 328947f commit 4a5f46f

File tree

1 file changed

+7
-7
lines changed
  • drivers/net/ethernet/broadcom

1 file changed

+7
-7
lines changed

drivers/net/ethernet/broadcom/tg3.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11244,7 +11244,7 @@ static int tg3_start(struct tg3 *tp, bool reset_phy, bool test_irq,
1124411244
*/
1124511245
err = tg3_alloc_consistent(tp);
1124611246
if (err)
11247-
goto err_out1;
11247+
goto out_ints_fini;
1124811248

1124911249
tg3_napi_init(tp);
1125011250

@@ -11258,7 +11258,7 @@ static int tg3_start(struct tg3 *tp, bool reset_phy, bool test_irq,
1125811258
tnapi = &tp->napi[i];
1125911259
free_irq(tnapi->irq_vec, tnapi);
1126011260
}
11261-
goto err_out2;
11261+
goto out_napi_fini;
1126211262
}
1126311263
}
1126411264

@@ -11276,7 +11276,7 @@ static int tg3_start(struct tg3 *tp, bool reset_phy, bool test_irq,
1127611276
tg3_full_unlock(tp);
1127711277

1127811278
if (err)
11279-
goto err_out3;
11279+
goto out_free_irq;
1128011280

1128111281
if (test_irq && tg3_flag(tp, USING_MSI)) {
1128211282
err = tg3_test_msi(tp);
@@ -11287,7 +11287,7 @@ static int tg3_start(struct tg3 *tp, bool reset_phy, bool test_irq,
1128711287
tg3_free_rings(tp);
1128811288
tg3_full_unlock(tp);
1128911289

11290-
goto err_out2;
11290+
goto out_napi_fini;
1129111291
}
1129211292

1129311293
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,
1132711327

1132811328
return 0;
1132911329

11330-
err_out3:
11330+
out_free_irq:
1133111331
for (i = tp->irq_cnt - 1; i >= 0; i--) {
1133211332
struct tg3_napi *tnapi = &tp->napi[i];
1133311333
free_irq(tnapi->irq_vec, tnapi);
1133411334
}
1133511335

11336-
err_out2:
11336+
out_napi_fini:
1133711337
tg3_napi_disable(tp);
1133811338
tg3_napi_fini(tp);
1133911339
tg3_free_consistent(tp);
1134011340

11341-
err_out1:
11341+
out_ints_fini:
1134211342
tg3_ints_fini(tp);
1134311343

1134411344
return err;

0 commit comments

Comments
 (0)