soc/intel/*/pmutil.c: Align cosmetics across platforms

Change-Id: I78d1b15deac2b80cc319dcfc5ab6bf419e2d61db
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50931
Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

src/soc/intel/alderlake/pmutil.c

@@ -209,10 +209,8 @@ static inline int deep_s3_enabled(void)
 }
 
 /* Return 0, 3, or 5 to indicate the previous sleep state. */
-int soc_prev_sleep_state(const struct chipset_power_state *ps,
+int soc_prev_sleep_state(const struct chipset_power_state *ps, int prev_sleep_state)
-	int prev_sleep_state)
 {
-
 	/*
 	 * Check for any power failure to determine if this a wake from
 	 * S5 because the PCH does not set the WAK_STS bit when waking

src/soc/intel/cannonlake/pmutil.c

@@ -202,10 +202,8 @@ static inline int deep_s3_enabled(void)
 }
 
 /* Return 0, 3, or 5 to indicate the previous sleep state. */
-int soc_prev_sleep_state(const struct chipset_power_state *ps,
+int soc_prev_sleep_state(const struct chipset_power_state *ps, int prev_sleep_state)
-	int prev_sleep_state)
 {
-
 	/*
 	 * Check for any power failure to determine if this a wake from
 	 * S5 because the PCH does not set the WAK_STS bit when waking
@@ -241,8 +239,7 @@ void soc_fill_power_state(struct chipset_power_state *ps)
 	ps->tco1_sts = tco_read_reg(TCO1_STS);
 	ps->tco2_sts = tco_read_reg(TCO2_STS);
 
-	printk(BIOS_DEBUG, "TCO_STS:   %04x %04x\n",
+	printk(BIOS_DEBUG, "TCO_STS:   %04x %04x\n", ps->tco1_sts, ps->tco2_sts);
-	ps->tco1_sts, ps->tco2_sts);
 
 	pmc = pmc_mmio_regs();
 	ps->gen_pmcon_a = read32(pmc + GEN_PMCON_A);

src/soc/intel/elkhartlake/pmutil.c

@@ -202,10 +202,8 @@ static inline int deep_s3_enabled(void)
 }
 
 /* Return 0, 3, or 5 to indicate the previous sleep state. */
-int soc_prev_sleep_state(const struct chipset_power_state *ps,
+int soc_prev_sleep_state(const struct chipset_power_state *ps, int prev_sleep_state)
-	int prev_sleep_state)
 {
-
 	/*
 	 * Check for any power failure to determine if this a wake from
 	 * S5 because the PCH does not set the WAK_STS bit when waking
@@ -241,8 +239,7 @@ void soc_fill_power_state(struct chipset_power_state *ps)
 	ps->tco1_sts = tco_read_reg(TCO1_STS);
 	ps->tco2_sts = tco_read_reg(TCO2_STS);
 
-	printk(BIOS_DEBUG, "TCO_STS:   %04x %04x\n",
+	printk(BIOS_DEBUG, "TCO_STS:   %04x %04x\n", ps->tco1_sts, ps->tco2_sts);
-	ps->tco1_sts, ps->tco2_sts);
 
 	pmc = pmc_mmio_regs();
 	ps->gen_pmcon_a = read32(pmc + GEN_PMCON_A);

src/soc/intel/icelake/pmutil.c

@@ -202,10 +202,8 @@ static inline int deep_s3_enabled(void)
 }
 
 /* Return 0, 3, or 5 to indicate the previous sleep state. */
-int soc_prev_sleep_state(const struct chipset_power_state *ps,
+int soc_prev_sleep_state(const struct chipset_power_state *ps, int prev_sleep_state)
-	int prev_sleep_state)
 {
-
 	/*
 	 * Check for any power failure to determine if this a wake from
 	 * S5 because the PCH does not set the WAK_STS bit when waking
@@ -241,8 +239,7 @@ void soc_fill_power_state(struct chipset_power_state *ps)
 	ps->tco1_sts = tco_read_reg(TCO1_STS);
 	ps->tco2_sts = tco_read_reg(TCO2_STS);
 
-	printk(BIOS_DEBUG, "TCO_STS:   %04x %04x\n",
+	printk(BIOS_DEBUG, "TCO_STS:   %04x %04x\n", ps->tco1_sts, ps->tco2_sts);
-	ps->tco1_sts, ps->tco2_sts);
 
 	pmc = pmc_mmio_regs();
 	ps->gen_pmcon_a = read32(pmc + GEN_PMCON_A);

src/soc/intel/jasperlake/pmutil.c

@@ -202,10 +202,8 @@ static inline int deep_s3_enabled(void)
 }
 
 /* Return 0, 3, or 5 to indicate the previous sleep state. */
-int soc_prev_sleep_state(const struct chipset_power_state *ps,
+int soc_prev_sleep_state(const struct chipset_power_state *ps, int prev_sleep_state)
-	int prev_sleep_state)
 {
-
 	/*
 	 * Check for any power failure to determine if this a wake from
 	 * S5 because the PCH does not set the WAK_STS bit when waking
@@ -241,8 +239,7 @@ void soc_fill_power_state(struct chipset_power_state *ps)
 	ps->tco1_sts = tco_read_reg(TCO1_STS);
 	ps->tco2_sts = tco_read_reg(TCO2_STS);
 
-	printk(BIOS_DEBUG, "TCO_STS:   %04x %04x\n",
+	printk(BIOS_DEBUG, "TCO_STS:   %04x %04x\n", ps->tco1_sts, ps->tco2_sts);
-	ps->tco1_sts, ps->tco2_sts);
 
 	pmc = pmc_mmio_regs();
 	ps->gen_pmcon_a = read32(pmc + GEN_PMCON_A);

src/soc/intel/skylake/pmutil.c

@@ -204,8 +204,7 @@ int vbnv_cmos_failed(void)
 }
 
 /* Return 0, 3, or 5 to indicate the previous sleep state. */
-int soc_prev_sleep_state(const struct chipset_power_state *ps,
+int soc_prev_sleep_state(const struct chipset_power_state *ps, int prev_sleep_state)
-						int prev_sleep_state)
 {
 	/*
 	 * Check for any power failure to determine if this a wake from
@@ -242,8 +241,7 @@ void soc_fill_power_state(struct chipset_power_state *ps)
 	ps->tco1_sts = tco_read_reg(TCO1_STS);
 	ps->tco2_sts = tco_read_reg(TCO2_STS);
 
-	printk(BIOS_DEBUG, "TCO_STS:   %04x %04x\n",
+	printk(BIOS_DEBUG, "TCO_STS:   %04x %04x\n", ps->tco1_sts, ps->tco2_sts);
-	       ps->tco1_sts, ps->tco2_sts);
 
 	ps->gen_pmcon_a = pci_read_config32(PCH_DEV_PMC, GEN_PMCON_A);
 	ps->gen_pmcon_b = pci_read_config32(PCH_DEV_PMC, GEN_PMCON_B);

src/soc/intel/tigerlake/pmutil.c

@@ -208,10 +208,8 @@ static inline int deep_s3_enabled(void)
 }
 
 /* Return 0, 3, or 5 to indicate the previous sleep state. */
-int soc_prev_sleep_state(const struct chipset_power_state *ps,
+int soc_prev_sleep_state(const struct chipset_power_state *ps, int prev_sleep_state)
-	int prev_sleep_state)
 {
-
 	/*
 	 * Check for any power failure to determine if this a wake from
 	 * S5 because the PCH does not set the WAK_STS bit when waking
@@ -247,8 +245,7 @@ void soc_fill_power_state(struct chipset_power_state *ps)
 	ps->tco1_sts = tco_read_reg(TCO1_STS);
 	ps->tco2_sts = tco_read_reg(TCO2_STS);
 
-	printk(BIOS_DEBUG, "TCO_STS:   %04x %04x\n",
+	printk(BIOS_DEBUG, "TCO_STS:   %04x %04x\n", ps->tco1_sts, ps->tco2_sts);
-	ps->tco1_sts, ps->tco2_sts);
 
 	pmc = pmc_mmio_regs();
 	ps->gen_pmcon_a = read32(pmc + GEN_PMCON_A);