diff mbox series

[v1,2/2] ACPI: CPPC: Drop redundant local variable from cpc_read()

Message ID 4374346.LvFx2qVVIh@kreacher (mailing list archive)
State Mainlined, archived
Headers show
Series ACPI: CPPC: Fix I/O port reads on big endian and clean up code in cpc_read() | expand

Commit Message

Rafael J. Wysocki Jan. 12, 2022, 6:27 p.m. UTC 
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

The ret_val local variable in cpc_read() is not necessary, so
eliminate it.

No functional impact.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
 drivers/acpi/cppc_acpi.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

Comments

Huang Rui Jan. 13, 2022, 2:39 a.m. UTC | #1 
On Thu, Jan 13, 2022 at 02:27:22AM +0800, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> 
> The ret_val local variable in cpc_read() is not necessary, so
> eliminate it.
> 
> No functional impact.
> 
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

Acked-by: Huang Rui <ray.huang@amd.com>

> ---
>  drivers/acpi/cppc_acpi.c |    7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
> 
> Index: linux-pm/drivers/acpi/cppc_acpi.c
> ===================================================================
> --- linux-pm.orig/drivers/acpi/cppc_acpi.c
> +++ linux-pm/drivers/acpi/cppc_acpi.c
> @@ -915,14 +915,13 @@ int __weak cpc_write_ffh(int cpunum, str
>  
>  static int cpc_read(int cpu, struct cpc_register_resource *reg_res, u64 *val)
>  {
> -	int ret_val = 0;
>  	void __iomem *vaddr = NULL;
>  	int pcc_ss_id = per_cpu(cpu_pcc_subspace_idx, cpu);
>  	struct cpc_reg *reg = &reg_res->cpc_entry.reg;
>  
>  	if (reg_res->type == ACPI_TYPE_INTEGER) {
>  		*val = reg_res->cpc_entry.int_value;
> -		return ret_val;
> +		return 0;
>  	}
>  
>  	*val = 0;
> @@ -968,10 +967,10 @@ static int cpc_read(int cpu, struct cpc_
>  	default:
>  		pr_debug("Error: Cannot read %u bit width from PCC for ss: %d\n",
>  			 reg->bit_width, pcc_ss_id);
> -		ret_val = -EFAULT;
> +		return -EFAULT;
>  	}
>  
> -	return ret_val;
> +	return 0;
>  }
>  
>  static int cpc_write(int cpu, struct cpc_register_resource *reg_res, u64 val)
> 
> 
>
diff mbox series

Patch

Index: linux-pm/drivers/acpi/cppc_acpi.c
===================================================================
--- linux-pm.orig/drivers/acpi/cppc_acpi.c
+++ linux-pm/drivers/acpi/cppc_acpi.c
@@ -915,14 +915,13 @@  int __weak cpc_write_ffh(int cpunum, str
 
 static int cpc_read(int cpu, struct cpc_register_resource *reg_res, u64 *val)
 {
-	int ret_val = 0;
 	void __iomem *vaddr = NULL;
 	int pcc_ss_id = per_cpu(cpu_pcc_subspace_idx, cpu);
 	struct cpc_reg *reg = &reg_res->cpc_entry.reg;
 
 	if (reg_res->type == ACPI_TYPE_INTEGER) {
 		*val = reg_res->cpc_entry.int_value;
-		return ret_val;
+		return 0;
 	}
 
 	*val = 0;
@@ -968,10 +967,10 @@  static int cpc_read(int cpu, struct cpc_
 	default:
 		pr_debug("Error: Cannot read %u bit width from PCC for ss: %d\n",
 			 reg->bit_width, pcc_ss_id);
-		ret_val = -EFAULT;
+		return -EFAULT;
 	}
 
-	return ret_val;
+	return 0;
 }
 
 static int cpc_write(int cpu, struct cpc_register_resource *reg_res, u64 val)