Updated for Linaro 6.3.1

arch/arm64/configs/N1_defconfig

@@ -569,12 +569,6 @@ CONFIG_MTK_HALL_SUPPORT=y
 
 # CONFIG_TOUCHSCREEN_MTK_GT1151=y
 CONFIG_TOUCHSCREEN_MTK_SYNAPTICS=y
-# CONFIG_TOUCHSCREEN_MTK_NT36xxx=y
-CONFIG_GT1151_FIRMWARE="firmware2"
-CONFIG_GT1151_CONFIG="config8"
-CONFIG_GTP_DRIVER_SEND_CFG=y
-CONFIG_GTP_CUSTOM_CFG=y
-CONFIG_GTP_CREATE_WR_NODE=y
 
 CONFIG_MTK_NFC_SUPPORT=y
 

drivers/input/fingerprint/gx556/gf_spi.c

@@ -867,7 +867,7 @@ static int gf_fasync(int fd, struct file *filp, int mode)
 	return ret;
 }
 #endif
-/*
+
 //xiaowen, add start
 static unsigned int gf_fp_poll(struct file *file, poll_table *wait)
 {
@@ -883,7 +883,7 @@ static unsigned int gf_fp_poll(struct file *file, poll_table *wait)
 	return mask;
 }
 //xiaowen, add end
-*/
+
 static int gf_release(struct inode *inode, struct file *filp)
 {
 	struct gf_dev *gf_dev;
@@ -922,7 +922,7 @@ static const struct file_operations gf_fops = {
 #ifdef GF_FASYNC
 	.fasync = gf_fasync,
 #endif
-       //.poll = gf_fp_poll,
+     .poll = gf_fp_poll,
 };
 
 /* The main reason to have this class is to make mdev/udev create the
@@ -1254,13 +1254,13 @@ static int gf_remove(struct spi_device *spi)
 
 
 	/* make sure ops on existing fds can abort cleanly */
-	if (gf_dev->spi->irq)
+	if (gf_dev->spi->irq) {
 		free_irq(gf_dev->spi->irq, gf_dev);
-
-	if (gf_dev->input != NULL)
-		input_unregister_device(gf_dev->input);
-		input_free_device(gf_dev->input);
-
+    }
+	        if (gf_dev->input != NULL) {
+		        input_unregister_device(gf_dev->input);
+		        input_free_device(gf_dev->input);
+            }
 	/* prevent new opens */
 	mutex_lock(&device_list_lock);
 	list_del(&gf_dev->device_entry);

drivers/misc/mediatek/base/power/spm_v2/mtk_idle.c

@@ -2475,7 +2475,7 @@ static ssize_t mcidle_state_write(struct file *filp,
 			mcidle_time_critera = param;
 
 		return count;
-	} else if (!kstrtoint(cmd_buf, 10, &param) == 1) {
+	} else if (!kstrtoint(cmd_buf, 10, &param)) {
 		idle_switch[IDLE_TYPE_MC] = param;
 
 		return count;
@@ -2605,7 +2605,7 @@ static ssize_t dpidle_state_write(struct file *filp,
 			dpidle_dump_log = param;
 
 		return count;
-	} else if (!kstrtoint(cmd_buf, 10, &param) == 1) {
+	} else if (!kstrtoint(cmd_buf, 10, &param)) {
 		idle_switch[IDLE_TYPE_DP] = param;
 
 		return count;
@@ -2756,7 +2756,7 @@ static ssize_t soidle3_state_write(struct file *filp,
 #endif
 		}
 		return count;
-	} else if (!kstrtoint(cmd_buf, 10, &param) == 1) {
+	} else if (!kstrtoint(cmd_buf, 10, &param)) {
 		idle_switch[IDLE_TYPE_SO3] = param;
 		return count;
 	}
@@ -2882,7 +2882,7 @@ static ssize_t soidle_state_write(struct file *filp,
 			idle_dbg("sodi_flags = 0x%x\n", sodi_flags);
 		}
 		return count;
-	} else if (!kstrtoint(cmd_buf, 10, &param) == 1) {
+	} else if (!kstrtoint(cmd_buf, 10, &param)) {
 		idle_switch[IDLE_TYPE_SO] = param;
 		return count;
 	}
@@ -2992,7 +2992,7 @@ static ssize_t mcsodi_state_write(struct file *filp, const char __user *userbuf,
 			mcsodi_by_pass_en = !!param;
 
 		return count;
-	} else if (!kstrtoint(cmd_buf, 10, &param) == 1) {
+	} else if (!kstrtoint(cmd_buf, 10, &param)) {
 		idle_switch[IDLE_TYPE_MCSODI] = param;
 		return count;
 	}
@@ -3075,7 +3075,7 @@ static ssize_t slidle_state_write(struct file *filp, const char __user *userbuf,
 			disable_slidle_by_bit(param);
 
 		return count;
-	} else if (!kstrtoint(userbuf, 10, &param) == 1) {
+	} else if (!kstrtoint(userbuf, 10, &param)) {
 		idle_switch[IDLE_TYPE_SL] = param;
 		return count;
 	}

drivers/misc/mediatek/cameraisp/src/mt6757/camera_fdvt.c

@@ -886,7 +886,7 @@ static long compat_FD_ioctl(struct file *file, unsigned int cmd, unsigned long a
 		err = compat_FD_get_register_data(data32, data);
 		if (err)
 			return err;
-			ret = file->f_op->unlocked_ioctl(file, FDVT_IOC_G_WAITIRQ, (unsigned long)data);
+		ret = file->f_op->unlocked_ioctl(file, FDVT_IOC_G_WAITIRQ, (unsigned long)data);
 		err = compat_FD_put_register_data(data32, data);
 		return ret ? ret : err;
 	}

drivers/misc/mediatek/cameraisp/src/mt6757/camera_isp.c

@@ -7702,8 +7702,7 @@ static long ISP_ioctl(struct file *pFile, unsigned int Cmd, unsigned long Param)
 				Ret = -EFAULT;
 				break;
 			}
-			if (copy_to_user((void *)Param, &g_DmaErr_CAM[DebugFlag[0]], sizeof(MUINT32)*nDMA_ERR) != 0)
-				LOG_ERR("get dma_err fail\n");
+			//if (copy_to_user((void *)Param, &g_DmaErr_CAM[DebugFlag[0]], sizeof(MUINT32)*nDMA_ERR) != 0) LOG_ERR("get dma_err fail\n");
 
 		}
 		break;

drivers/misc/mediatek/connectivity/common/common_main/core/stp_core.c

@@ -2075,11 +2075,11 @@ static INT32 stp_parser_data_in_full_mode(UINT32 length, UINT8 *p_data)
 				stp_core_ctx.parser.nak = 0;	/* disable NAK */
 			else
 				stp_core_ctx.parser.nak = (*p_data & 0x80) >> 7;
-				stp_core_ctx.parser.type = (*p_data & 0x70) >> 4;
-				stp_core_ctx.parser.length = (*p_data & 0x0f) << 8;
-				stp_core_ctx.rx_buf[1] = *p_data;
-				/* Geoge FIXME: WHY comment the following line? */
-				/*stp_core_ctx.rx_counter++; */
+			stp_core_ctx.parser.type = (*p_data & 0x70) >> 4;
+			stp_core_ctx.parser.length = (*p_data & 0x0f) << 8;
+    		stp_core_ctx.rx_buf[1] = *p_data;
+			/* Geoge FIXME: WHY comment the following line? */
+			/*stp_core_ctx.rx_counter++; */
 				if (stp_core_ctx.parser.nak)
 					STP_ERR_FUNC("MTKSTP_NAK TRUE: mtk_wcn_stp_parser_data, buff = %x\n", *p_data);
 

drivers/misc/mediatek/connectivity/common/common_main/core/wmt_core.c

@@ -1332,7 +1332,7 @@ static INT32 opfunc_func_off(P_WMT_OP pWmtOp)
 			gMtkWmtCtx.eDrvStatus[drvType] = DRV_STS_POWER_OFF;
 		else if (drvType == WMTDRV_TYPE_COREDUMP)
 			gMtkWmtCtx.eDrvStatus[drvType] = DRV_STS_POWER_OFF;
-			iRet = 0;
+		iRet = 0;
 	}
 
 	/* shall we put device state to POWER_OFF state when fail? */

drivers/misc/mediatek/connectivity/wlan/gen2/mgmt/scan.c

@@ -2050,7 +2050,7 @@ UINT_8 nicChannelNum2Index(IN UINT_8 ucChannelNum)
 	} else
 		ucindex = 0;
 
-		return ucindex;
+	return ucindex;
 }
 
 /*----------------------------------------------------------------------------*/

drivers/misc/mediatek/eccci/port_ctlmsg.c

@@ -111,7 +111,7 @@ static void control_msg_handler(struct ccci_port *port, struct sk_buff *skb)
 	case C2K_FLOW_CTRL_MSG:
 	if (port->md_id == MD_SYS3)
 		ret = c2k_msg_handler(port, skb);
-		break;
+	break;
 	default:
 		CCCI_ERROR_LOG(port->md_id, KERN, "receive unknown data from CCCI_CONTROL_RX = %d\n", ccci_h->data[1]);
 		break;

drivers/misc/mediatek/imgsensor/src/mt6757/s5k3p3sx_mipi_raw/s5k3P3_pdafotp.c

@@ -46,9 +46,9 @@ static bool selective_read_eeprom(kal_uint16 addr, BYTE* data)
     if(addr > S5K3P3_MAX_OFFSET)
         return false;
 
-	if(iReadRegI2C(pu_send_cmd, 2, (u8*)data, 1, S5K3P3_EEPROM_WRITE_ID)<0)
-		return false;
-    return true;
+	    if(iReadRegI2C(pu_send_cmd, 2, (u8*)data, 1, S5K3P3_EEPROM_WRITE_ID)<0)
+		    return false;
+        return true;
 }
 
 static bool _read_3P3_eeprom(kal_uint16 addr, BYTE* data, kal_uint32 size ){

drivers/misc/mediatek/mu3phy/mt6757/mtk-phy-asic.c

@@ -153,7 +153,7 @@ static bool usb_enable_clock(bool enable)
 		else
 			clk_count = (clk_count == 0) ? 0 : (clk_count-1);
 
-			spin_unlock_irqrestore(&musb_reg_clock_lock, flags);
+		spin_unlock_irqrestore(&musb_reg_clock_lock, flags);
 
 #ifdef USB_CLK_DEBUG
 	if (get_clk_io) {

drivers/misc/mediatek/uart/mt6757/platform_uart.c

@@ -819,10 +819,7 @@ void mtk_uart_dma_vfifo_tx_tasklet(unsigned long arg)
 	unsigned long flags;
 
 	spin_lock_irqsave(&vfifo->iolock, flags);
-	if (atomic_inc_and_test(&vfifo->entry) > 1) {
-		MSG(ERR, "tx entry!!\n");
-		tasklet_schedule(&vfifo->dma->tasklet);
-	} else {
+     {
 		while (UART_READ32(VFF_LEFT_SIZE(base)) >= vfifo->trig) {
 			/* deal with x_char first */
 			if (unlikely(port->x_char)) {
@@ -1097,13 +1094,11 @@ void mtk_uart_dma_vfifo_rx_tasklet(unsigned long arg)
 
 	MSG(DMA, "%d, %x, %x\n", uart->read_allow(uart), UART_READ32(VFF_VALID_SIZE(vfifo->base)), vfifo->trig);
 	spin_lock_irqsave(&vfifo->iolock, flags);
-	if (atomic_inc_and_test(&vfifo->entry) > 1) {
-		MSG(ERR, "rx entry!!\n");
-		tasklet_schedule(&vfifo->dma->tasklet);
-	} else {
-		if (uart->read_allow(uart))
-			mtk_uart_dma_vfifo_rx_tasklet_str(arg);
-	}
+	atomic_inc(&vfifo->entry);
+
+	if (uart->read_allow(uart))
+		mtk_uart_dma_vfifo_rx_tasklet_str(arg);
+
 	atomic_dec(&vfifo->entry);
 	spin_unlock_irqrestore(&vfifo->iolock, flags);
 }

drivers/power/mediatek/charger/mtk_switch_charging.c

@@ -133,7 +133,7 @@ static void swchg_select_charging_current_limit(struct charger_manager *info)
 			else
 				pdata->input_current_limit = info->data.usb_charger_current_unconfigured;
 
-				pdata->charging_current_limit = pdata->input_current_limit;
+			pdata->charging_current_limit = pdata->input_current_limit;
 		} else {
 			pdata->input_current_limit = info->data.usb_charger_current;
 			pdata->charging_current_limit = info->data.usb_charger_current;	/* it can be larger */

drivers/staging/android/ion/ion.c

@@ -591,7 +591,7 @@ static void user_ion_free_nolock(struct ion_client *client, struct ion_handle *h
 		WARN(1, "%s: invalid handle passed to free.\n", __func__);
 		return;
 	}
-	if (!handle->user_ref_count > 0) {
+	if (handle->user_ref_count <= 0) {
 		WARN(1, "%s: User does not have access!\n", __func__);
 		return;
 	}