Hi,
On 10/26/21 20:40, Sanket Goswami wrote:
> Handle error-exits in the amd_pmc_probe() so that the code duplication
> is reduced.
>
> Suggested-by: Hans de Goede <hdegoede@xxxxxxxxxx>
> Signed-off-by: Sanket Goswami <Sanket.Goswami@xxxxxxx>
> ---
> Changes in v4:
> - No change.
>
> Changes in v3:
> - No change.
>
> Changes in v2:
> - No change.
>
> drivers/platform/x86/amd-pmc.c | 22 ++++++++++------------
> 1 file changed, 10 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/platform/x86/amd-pmc.c b/drivers/platform/x86/amd-pmc.c
> index 5d88e55e1ce7..50cb65e38d11 100644
> --- a/drivers/platform/x86/amd-pmc.c
> +++ b/drivers/platform/x86/amd-pmc.c
> @@ -546,30 +546,24 @@ static int amd_pmc_probe(struct platform_device *pdev)
> err = pci_write_config_dword(rdev, AMD_PMC_SMU_INDEX_ADDRESS, AMD_PMC_BASE_ADDR_LO);
> if (err) {
> dev_err(dev->dev, "error writing to 0x%x\n", AMD_PMC_SMU_INDEX_ADDRESS);
> - pci_dev_put(rdev);
> - return pcibios_err_to_errno(err);
You probably want to add:
err = pcibios_err_to_errno(err);
here and in the other similar cases.
> + goto err_pci_dev_put;
> }
>
> err = pci_read_config_dword(rdev, AMD_PMC_SMU_INDEX_DATA, &val);
> - if (err) {
> - pci_dev_put(rdev);
> - return pcibios_err_to_errno(err);
> - }
> + if (err)
> + goto err_pci_dev_put;
>
> base_addr_lo = val & AMD_PMC_BASE_ADDR_HI_MASK;
>
> err = pci_write_config_dword(rdev, AMD_PMC_SMU_INDEX_ADDRESS, AMD_PMC_BASE_ADDR_HI);
> if (err) {
> dev_err(dev->dev, "error writing to 0x%x\n", AMD_PMC_SMU_INDEX_ADDRESS);
> - pci_dev_put(rdev);
> - return pcibios_err_to_errno(err);
> + goto err_pci_dev_put;
> }
>
> err = pci_read_config_dword(rdev, AMD_PMC_SMU_INDEX_DATA, &val);
> - if (err) {
> - pci_dev_put(rdev);
> - return pcibios_err_to_errno(err);
> - }
> + if (err)
> + goto err_pci_dev_put;
>
> base_addr_hi = val & AMD_PMC_BASE_ADDR_LO_MASK;
> base_addr = ((u64)base_addr_hi << 32 | base_addr_lo);
> @@ -598,6 +592,10 @@ static int amd_pmc_probe(struct platform_device *pdev)
> platform_set_drvdata(pdev, dev);
> amd_pmc_dbgfs_register(dev);
> return 0;
> +
> +err_pci_dev_put:
> + pci_dev_put(rdev);
> + return pcibios_err_to_errno(err);
And change this to just:
return err;
So that "goto err_pci_dev_put" can also be used for errors which are not
returned by pci_read/write_config_dword() .
> }
>
> static int amd_pmc_remove(struct platform_device *pdev)
>
Regards,
Hans
