Merge remote-tracking branch 'origin/Q' into Q

Team-420 · Nov 30, 2020 · 9e6d9bc · 9e6d9bc
2 parents bd7ba7b + db9efeb
commit 9e6d9bc
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/drivers/input/touchscreen/nvt_touch_f7b/nt36xxx.c b/drivers/input/touchscreen/nvt_touch_f7b/nt36xxx.c
@@ -235,7 +235,7 @@ void nvt_sw_reset_idle(void)
 	buf[1]=0xA5;
 	CTP_I2C_WRITE(ts->client, I2C_HW_Address, buf, 2);
 
-	msleep(15);
+	usleep_range(15000, 15000);
 }
 
 /*******************************************************
@@ -291,7 +291,7 @@ int32_t nvt_clear_fw_status(void)
 		if (buf[1] == 0x00)
 			break;
 
-		msleep(10);
+		usleep_range(10000, 10000);
 	}
 
 	if (i >= retry) {
@@ -330,7 +330,7 @@ int32_t nvt_check_fw_status(void)
 		if ((buf[1] & 0xF0) == 0xA0)
 			break;
 
-		msleep(10);
+		usleep_range(10000, 10000);
 	}
 
 	if (i >= retry) {
@@ -355,7 +355,7 @@ int32_t nvt_check_fw_reset_state(RST_COMPLETE_STATE check_reset_state)
 	int32_t retry = 0;
 
 	while (1) {
-		msleep(10);
+		usleep_range(10000, 10000);
 
 		//---read reset state---
 		buf[0] = EVENT_MAP_RESET_COMPLETE;
@@ -1074,7 +1074,7 @@ void nvt_stop_crc_reboot(void)
 			buf[0]=0x00;
 			buf[1]=0xA5;
 			CTP_I2C_WRITE(ts->client, I2C_HW_Address, buf, 2);
-			msleep(1);
+			usleep_range(1000, 1000);
 
 			//---clear CRC_ERR_FLAG---
 			buf[0] = 0xFF;
@@ -1131,7 +1131,7 @@ static int8_t nvt_ts_check_chip_ver_trim(void)
 		buf[0] = 0x00;
 		buf[1] = 0x35;
 		CTP_I2C_WRITE(ts->client, I2C_HW_Address, buf, 2);
-		msleep(10);
+		usleep_range(10000, 10000);
 
 		buf[0] = 0xFF;
 		buf[1] = 0x01;
@@ -1184,7 +1184,7 @@ static int8_t nvt_ts_check_chip_ver_trim(void)
 			}
 		}
 
-		msleep(10);
+		usleep_range(10000, 10000);
 	}
 
 out:
@@ -1238,7 +1238,7 @@ static int32_t nvt_ts_probe(struct i2c_client *client, const struct i2c_device_i
 	mutex_init(&ts->xbuf_lock);
 	mutex_init(&ts->pm_mutex);
 
-	msleep(10);
+	usleep_range(10000, 10000);
 
 	ret = nvt_ts_check_chip_ver_trim();
 	if (ret) {