platform/x86: surface3_power: Simplify mshw0011_adp_psr() to one liner

andy-shev · andy-shev · commit 48978995950b · 2020-03-28T22:37:29.000+02:00
Refactor mshw0011_adp_psr() to be one liner.

Signed-off-by: Andy Shevchenko &lt;andriy.shevchenko@linux.intel.com&gt;
diff --git a/drivers/platform/x86/surface3_power.c b/drivers/platform/x86/surface3_power.c
@@ -295,14 +295,7 @@ static int mshw0011_bst(struct mshw0011_data *cdata, struct bst *bst)
 
 static int mshw0011_adp_psr(struct mshw0011_data *cdata)
 {
-	struct i2c_client *client = cdata->adp1;
-	int ret;
-
-	ret = i2c_smbus_read_byte_data(client, MSHW0011_ADP1_REG_PSR);
-	if (ret < 0)
-		return ret;
-
-	return ret;
+	return i2c_smbus_read_byte_data(cdata->adp1, MSHW0011_ADP1_REG_PSR);
 }
 
 static int mshw0011_isr(struct mshw0011_data *cdata)

Original file line number	Diff line number	Diff line change
`@@ -295,14 +295,7 @@ static int mshw0011_bst(struct mshw0011_data cdata, struct bst bst)`
`295`	`295`
`296`	`296`	`static int mshw0011_adp_psr(struct mshw0011_data *cdata)`
`297`	`297`	`{`
`298`		`- struct i2c_client *client = cdata->adp1;`
`299`		`- int ret;`
`300`		`-`
`301`		`- ret = i2c_smbus_read_byte_data(client, MSHW0011_ADP1_REG_PSR);`
`302`		`- if (ret < 0)`
`303`		`- return ret;`
`304`		`-`
`305`		`- return ret;`
	`298`	`+ return i2c_smbus_read_byte_data(cdata->adp1, MSHW0011_ADP1_REG_PSR);`
`306`	`299`	`}`
`307`	`300`
`308`	`301`	`static int mshw0011_isr(struct mshw0011_data *cdata)`