Input: atmel_mxt_ts - simplify the return expression of mxt_send_bootloader_cmd()

Zheng Yongjun · dtor · commit 3d722dd4509d · 2020-12-10T23:39:18.000-08:00
Simplify the return expression. Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com> Link: https://lore.kernel.org/r/20201210135943.1612-1-zhengyongjun3@huawei.com Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -608,7 +608,6 @@ static int mxt_check_bootloader(struct mxt_data *data, unsigned int state,
 
 static int mxt_send_bootloader_cmd(struct mxt_data *data, bool unlock)
 {
-	int ret;
 	u8 buf[2];
 
 	if (unlock) {
@@ -619,11 +618,7 @@ static int mxt_send_bootloader_cmd(struct mxt_data *data, bool unlock)
 		buf[1] = 0x01;
 	}
 
-	ret = mxt_bootloader_write(data, buf, 2);
-	if (ret)
-		return ret;
-
-	return 0;
+	return mxt_bootloader_write(data, buf, sizeof(buf));
 }
 
 static int __mxt_read_reg(struct i2c_client *client,

Original file line number	Diff line number	Diff line change
`@@ -608,7 +608,6 @@ static int mxt_check_bootloader(struct mxt_data *data, unsigned int state,`
`608`	`608`
`609`	`609`	`static int mxt_send_bootloader_cmd(struct mxt_data *data, bool unlock)`
`610`	`610`	`{`
`611`		`- int ret;`
`612`	`611`	`u8 buf[2];`
`613`	`612`
`614`	`613`	`if (unlock) {`
`@@ -619,11 +618,7 @@ static int mxt_send_bootloader_cmd(struct mxt_data *data, bool unlock)`
`619`	`618`	`buf[1] = 0x01;`
`620`	`619`	`}`
`621`	`620`
`622`		`- ret = mxt_bootloader_write(data, buf, 2);`
`623`		`- if (ret)`
`624`		`- return ret;`
`625`		`-`
`626`		`- return 0;`
	`621`	`+ return mxt_bootloader_write(data, buf, sizeof(buf));`
`627`	`622`	`}`
`628`	`623`
`629`	`624`	`static int __mxt_read_reg(struct i2c_client *client,`