Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

staging: kpc2000: improve label names in kp2000_pcie_probe

Use self-explanatory label names instead of the generic numbered ones,
to make it easier to follow and understand the code.

Signed-off-by: Simon Sandström <simon@nikanor.nu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Simon Sandström and committed by
Greg Kroah-Hartman
fd5a82f4 0bbb1374

+20 -22
+20 -22
drivers/staging/kpc2000/kpc2000/core.c
··· 327 327 if (err < 0) { 328 328 dev_err(&pdev->dev, "probe: failed to get card number (%d)\n", 329 329 err); 330 - goto out2; 330 + goto err_free_pcard; 331 331 } 332 332 pcard->card_num = err; 333 333 scnprintf(pcard->name, 16, "kpcard%u", pcard->card_num); ··· 346 346 dev_err(&pcard->pdev->dev, 347 347 "probe: failed to enable PCIE2000 PCIe device (%d)\n", 348 348 err); 349 - goto out3; 349 + goto err_remove_ida; 350 350 } 351 351 352 352 /* ··· 360 360 dev_err(&pcard->pdev->dev, 361 361 "probe: REG_BAR could not remap memory to virtual space\n"); 362 362 err = -ENODEV; 363 - goto out4; 363 + goto err_disable_device; 364 364 } 365 365 dev_dbg(&pcard->pdev->dev, 366 366 "probe: REG_BAR virt hardware address start [%p]\n", ··· 373 373 "probe: failed to acquire PCI region (%d)\n", 374 374 err); 375 375 err = -ENODEV; 376 - goto out4; 376 + goto err_disable_device; 377 377 } 378 378 379 379 pcard->regs_base_resource.start = reg_bar_phys_addr; ··· 393 393 dev_err(&pcard->pdev->dev, 394 394 "probe: DMA_BAR could not remap memory to virtual space\n"); 395 395 err = -ENODEV; 396 - goto out5; 396 + goto err_unmap_regs; 397 397 } 398 398 dev_dbg(&pcard->pdev->dev, 399 399 "probe: DMA_BAR virt hardware address start [%p]\n", ··· 407 407 dev_err(&pcard->pdev->dev, 408 408 "probe: failed to acquire PCI region (%d)\n", err); 409 409 err = -ENODEV; 410 - goto out5; 410 + goto err_unmap_regs; 411 411 } 412 412 413 413 pcard->dma_base_resource.start = dma_bar_phys_addr; ··· 421 421 pcard->sysinfo_regs_base = pcard->regs_bar_base; 422 422 err = read_system_regs(pcard); 423 423 if (err) 424 - goto out6; 424 + goto err_unmap_dma; 425 425 426 426 // Disable all "user" interrupts because they're not used yet. 427 427 writeq(0xFFFFFFFFFFFFFFFF, ··· 461 461 if (err) { 462 462 dev_err(&pcard->pdev->dev, 463 463 "CANNOT use DMA mask %0llx\n", DMA_BIT_MASK(64)); 464 - goto out7; 464 + goto err_unmap_dma; 465 465 } 466 466 dev_dbg(&pcard->pdev->dev, 467 467 "Using DMA mask %0llx\n", dma_get_mask(PCARD_TO_DEV(pcard))); ··· 471 471 */ 472 472 err = pci_enable_msi(pcard->pdev); 473 473 if (err < 0) 474 - goto out8a; 474 + goto err_unmap_dma; 475 475 476 476 rv = request_irq(pcard->pdev->irq, kp2000_irq_handler, IRQF_SHARED, 477 477 pcard->name, pcard); 478 478 if (rv) { 479 479 dev_err(&pcard->pdev->dev, 480 480 "%s: failed to request_irq: %d\n", __func__, rv); 481 - goto out8b; 481 + goto err_disable_msi; 482 482 } 483 483 484 484 /* ··· 487 487 err = sysfs_create_files(&pdev->dev.kobj, kp_attr_list); 488 488 if (err) { 489 489 dev_err(&pdev->dev, "Failed to add sysfs files: %d\n", err); 490 - goto out9; 490 + goto err_free_irq; 491 491 } 492 492 493 493 /* ··· 495 495 */ 496 496 err = kp2000_probe_cores(pcard); 497 497 if (err) 498 - goto out10; 498 + goto err_remove_sysfs; 499 499 500 500 /* 501 501 * Step 11: Enable IRQs in HW ··· 506 506 mutex_unlock(&pcard->sem); 507 507 return 0; 508 508 509 - out10: 509 + err_remove_sysfs: 510 510 sysfs_remove_files(&pdev->dev.kobj, kp_attr_list); 511 - out9: 511 + err_free_irq: 512 512 free_irq(pcard->pdev->irq, pcard); 513 - out8b: 513 + err_disable_msi: 514 514 pci_disable_msi(pcard->pdev); 515 - out8a: 516 - out7: 517 - out6: 515 + err_unmap_dma: 518 516 iounmap(pcard->dma_bar_base); 519 517 pci_release_region(pdev, DMA_BAR); 520 518 pcard->dma_bar_base = NULL; 521 - out5: 519 + err_unmap_regs: 522 520 iounmap(pcard->regs_bar_base); 523 521 pci_release_region(pdev, REG_BAR); 524 522 pcard->regs_bar_base = NULL; 525 - out4: 523 + err_disable_device: 526 524 pci_disable_device(pcard->pdev); 527 - out3: 525 + err_remove_ida: 528 526 mutex_unlock(&pcard->sem); 529 527 ida_simple_remove(&card_num_ida, pcard->card_num); 530 - out2: 528 + err_free_pcard: 531 529 kfree(pcard); 532 530 return err; 533 531 }