| Message ID | 20241105173637.733589-5-Shyam-sundar.S-k@amd.com (mailing list archive) |
|---|---|
| State | Changes Requested, archived |
| Headers | show |
| Series | platform/x86/amd/pmc: Updates to AMD PMC driver | expand |
On Tue, 5 Nov 2024, Shyam Sundar S K wrote: > Relocate the call to amd_pmc_s2d_init() to occur after the creation of the > "amd_pmc" debugfs directory. This ensures that the driver's root debugfs > directory is established beforehand. > > Co-developed-by: Sanket Goswami <Sanket.Goswami@amd.com> > Signed-off-by: Sanket Goswami <Sanket.Goswami@amd.com> > Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com> > --- > drivers/platform/x86/amd/pmc/pmc.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/platform/x86/amd/pmc/pmc.c b/drivers/platform/x86/amd/pmc/pmc.c > index 58fdf044fd36..6ebb9123ba00 100644 > --- a/drivers/platform/x86/amd/pmc/pmc.c > +++ b/drivers/platform/x86/amd/pmc/pmc.c > @@ -822,10 +822,6 @@ static int amd_pmc_probe(struct platform_device *pdev) > /* Get num of IP blocks within the SoC */ > amd_pmc_get_ip_info(dev); > > - err = amd_pmc_s2d_init(dev); > - if (err) > - goto err_pci_dev_put; > - > platform_set_drvdata(pdev, dev); > if (IS_ENABLED(CONFIG_SUSPEND)) { > err = acpi_register_lps0_dev(&amd_pmc_s2idle_dev_ops); > @@ -836,6 +832,10 @@ static int amd_pmc_probe(struct platform_device *pdev) > } > > amd_pmc_dbgfs_register(dev); > + err = amd_pmc_s2d_init(dev); > + if (err) > + goto err_pci_dev_put; > + > if (IS_ENABLED(CONFIG_AMD_MP2_STB)) > amd_mp2_stb_init(dev); > pm_report_max_hw_sleep(U64_MAX); > My expectation was that this would be the first patch of the series and it would include the move of the if (enable_stb) block from amd_pmc_dbgfs_register() to amd_pmc_s2d_init(). (Patch 3 too can be incorporated into that same refactoring patch as long as you explain the reason for adding the return in the commit message). Is that order not viable for some reason?
diff --git a/drivers/platform/x86/amd/pmc/pmc.c b/drivers/platform/x86/amd/pmc/pmc.c index 58fdf044fd36..6ebb9123ba00 100644 --- a/drivers/platform/x86/amd/pmc/pmc.c +++ b/drivers/platform/x86/amd/pmc/pmc.c @@ -822,10 +822,6 @@ static int amd_pmc_probe(struct platform_device *pdev) /* Get num of IP blocks within the SoC */ amd_pmc_get_ip_info(dev); - err = amd_pmc_s2d_init(dev); - if (err) - goto err_pci_dev_put; - platform_set_drvdata(pdev, dev); if (IS_ENABLED(CONFIG_SUSPEND)) { err = acpi_register_lps0_dev(&amd_pmc_s2idle_dev_ops); @@ -836,6 +832,10 @@ static int amd_pmc_probe(struct platform_device *pdev) } amd_pmc_dbgfs_register(dev); + err = amd_pmc_s2d_init(dev); + if (err) + goto err_pci_dev_put; + if (IS_ENABLED(CONFIG_AMD_MP2_STB)) amd_mp2_stb_init(dev); pm_report_max_hw_sleep(U64_MAX);