]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
platform/x86/amd/pmf: Use dev_err_probe() to simplify error handling
authorShyam Sundar S K <Shyam-sundar.S-k@amd.com>
Mon, 4 Nov 2024 05:48:27 +0000 (11:18 +0530)
committerIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Mon, 4 Nov 2024 13:13:04 +0000 (15:13 +0200)
To simplify error handling in the amd_pmf probe function and reduce code
size, dev_err() is replaced with dev_err_probe().

Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
Co-developed-by: Patil Rajesh Reddy <Patil.Reddy@amd.com>
Signed-off-by: Patil Rajesh Reddy <Patil.Reddy@amd.com>
Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
Link: https://lore.kernel.org/r/20241104054829.620858-2-Shyam-sundar.S-k@amd.com
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
drivers/platform/x86/amd/pmf/core.c

index 47126abd13ca00eaf89167d319d6fede44e83e90..745d0e013a33041517f621f5ba4edce1dd877bd1 100644 (file)
@@ -429,18 +429,18 @@ static int amd_pmf_probe(struct platform_device *pdev)
 
        err = amd_smn_read(0, AMD_PMF_BASE_ADDR_LO, &val);
        if (err) {
-               dev_err(dev->dev, "error in reading from 0x%x\n", AMD_PMF_BASE_ADDR_LO);
                pci_dev_put(rdev);
-               return pcibios_err_to_errno(err);
+               return dev_err_probe(dev->dev, pcibios_err_to_errno(err),
+                                    "error in reading from 0x%x\n", AMD_PMF_BASE_ADDR_LO);
        }
 
        base_addr_lo = val & AMD_PMF_BASE_ADDR_HI_MASK;
 
        err = amd_smn_read(0, AMD_PMF_BASE_ADDR_HI, &val);
        if (err) {
-               dev_err(dev->dev, "error in reading from 0x%x\n", AMD_PMF_BASE_ADDR_HI);
                pci_dev_put(rdev);
-               return pcibios_err_to_errno(err);
+               return dev_err_probe(dev->dev, pcibios_err_to_errno(err),
+                                    "error in reading from 0x%x\n", AMD_PMF_BASE_ADDR_HI);
        }
 
        base_addr_hi = val & AMD_PMF_BASE_ADDR_LO_MASK;