[PATCH v15 1/2] platform/x86/amd: pmc: Adjust workarounds to be part of a switch/case
From: Mario Limonciello
Date: Mon Aug 28 2023 - 00:37:56 EST
To allow introducing additional workarounds more cleanly for other
platforms change the if block into a switch/case.
Signed-off-by: Mario Limonciello <mario.limonciello@xxxxxxx>
---
drivers/platform/x86/amd/pmc/pmc.c | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/drivers/platform/x86/amd/pmc/pmc.c b/drivers/platform/x86/amd/pmc/pmc.c
index c1e788b67a74..eb2a4263814c 100644
--- a/drivers/platform/x86/amd/pmc/pmc.c
+++ b/drivers/platform/x86/amd/pmc/pmc.c
@@ -884,17 +884,20 @@ static struct acpi_s2idle_dev_ops amd_pmc_s2idle_dev_ops = {
static int amd_pmc_suspend_handler(struct device *dev)
{
struct amd_pmc_dev *pdev = dev_get_drvdata(dev);
+ int rc = 0;
- if (pdev->cpu_id == AMD_CPU_ID_CZN && !disable_workarounds) {
- int rc = amd_pmc_czn_wa_irq1(pdev);
+ if (disable_workarounds)
+ return 0;
- if (rc) {
- dev_err(pdev->dev, "failed to adjust keyboard wakeup: %d\n", rc);
- return rc;
- }
+ switch (pdev->cpu_id) {
+ case AMD_CPU_ID_CZN:
+ rc = amd_pmc_czn_wa_irq1(pdev);
+ break;
+ default:
+ break;
}
- return 0;
+ return rc;
}
static DEFINE_SIMPLE_DEV_PM_OPS(amd_pmc_pm, amd_pmc_suspend_handler, NULL);
base-commit: 4dbd6e61adc7e52dd1c9165f0ccaa90806611e40
--
2.34.1