Re: [PATCH -next] input/touchscreen: simplify the return expression of mxt_send_bootloader_cmd()

2020-12-10 Thread Dmitry Torokhov
On Thu, Dec 10, 2020 at 09:59:43PM +0800, Zheng Yongjun wrote:
> Simplify the return expression.
> 
> Signed-off-by: Zheng Yongjun 

Applied, thank you.

-- 
Dmitry


[PATCH -next] input/touchscreen: simplify the return expression of mxt_send_bootloader_cmd()

2020-12-10 Thread Zheng Yongjun
Simplify the return expression.

Signed-off-by: Zheng Yongjun 
---
 drivers/input/touchscreen/atmel_mxt_ts.c | 7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c 
b/drivers/input/touchscreen/atmel_mxt_ts.c
index b6f75367a284..664fd940c06e 100644
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -606,7 +606,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) {
@@ -617,11 +616,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, 2);
 }
 
 static int __mxt_read_reg(struct i2c_client *client,
-- 
2.22.0