Skip to content

Commit 5d5d9c2

Browse files
pkitszelanguy11
authored andcommitted
ice: minor: rename goto labels from err to unroll
Clean up goto labels after previous commit, to conform to single naming scheme in ice_probe() and ice_init_dev(). Reviewed-by: Marcin Szycik <[email protected]> Signed-off-by: Przemek Kitszel <[email protected]> Reviewed-by: Kalesh AP <[email protected]> Tested-by: Pucha Himasekhar Reddy <[email protected]> (A Contingent worker at Intel) Signed-off-by: Tony Nguyen <[email protected]>
1 parent 4d3f59b commit 5d5d9c2

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

drivers/net/ethernet/intel/ice/ice_main.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4799,7 +4799,7 @@ int ice_init_dev(struct ice_pf *pf)
47994799
if (err) {
48004800
dev_err(dev, "ice_init_interrupt_scheme failed: %d\n", err);
48014801
err = -EIO;
4802-
goto err_init_interrupt_scheme;
4802+
goto unroll_pf_init;
48034803
}
48044804

48054805
/* In case of MSIX we are going to setup the misc vector right here
@@ -4810,14 +4810,14 @@ int ice_init_dev(struct ice_pf *pf)
48104810
err = ice_req_irq_msix_misc(pf);
48114811
if (err) {
48124812
dev_err(dev, "setup of misc vector failed: %d\n", err);
4813-
goto err_req_irq_msix_misc;
4813+
goto unroll_irq_scheme_init;
48144814
}
48154815

48164816
return 0;
48174817

4818-
err_req_irq_msix_misc:
4818+
unroll_irq_scheme_init:
48194819
ice_clear_interrupt_scheme(pf);
4820-
err_init_interrupt_scheme:
4820+
unroll_pf_init:
48214821
ice_deinit_pf(pf);
48224822
return err;
48234823
}
@@ -5324,18 +5324,18 @@ ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent)
53245324
devl_lock(priv_to_devlink(pf));
53255325
err = ice_load(pf);
53265326
if (err)
5327-
goto err_load;
5327+
goto unroll_init;
53285328

53295329
err = ice_init_devlink(pf);
53305330
if (err)
5331-
goto err_init_devlink;
5331+
goto unroll_load;
53325332
devl_unlock(priv_to_devlink(pf));
53335333

53345334
return 0;
53355335

5336-
err_init_devlink:
5336+
unroll_load:
53375337
ice_unload(pf);
5338-
err_load:
5338+
unroll_init:
53395339
devl_unlock(priv_to_devlink(pf));
53405340
ice_deinit(pf);
53415341
unroll_hw_init:

0 commit comments

Comments
 (0)