Merge "input: touchscreen: synaptics: remove extra console output" (8826fc02) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/input/touchscreen/synaptics_tcm/synaptics_tcm_core.c

+13 −7

Original line number	Diff line number	Diff line
		@@ -627,7 +627,6 @@ static void syna_tcm_dispatch_report(struct syna_tcm_hcd *tcm_hcd)
		}
		}


		tcm_hcd->async_report_id = tcm_hcd->status_report_code;

		mutex_unlock(&mod_pool.mutex);
		@@ -742,7 +741,7 @@ static void syna_tcm_dispatch_message(struct syna_tcm_hcd *tcm_hcd)
		if (tcm_hcd->wr_chunk_size == 0)
		tcm_hcd->wr_chunk_size = max_write_size;

		LOGN(tcm_hcd->pdev->dev.parent,
		LOGD(tcm_hcd->pdev->dev.parent,
		"Received identify report (firmware mode = 0x%02x)\n",
		tcm_hcd->id_info.mode);

		@@ -2672,7 +2671,7 @@ static int syna_tcm_reset(struct syna_tcm_hcd *tcm_hcd, bool hw, bool update_wd)
		}

		get_features:
		LOGN(tcm_hcd->pdev->dev.parent,
		LOGD(tcm_hcd->pdev->dev.parent,
		"Firmware mode = 0x%02x\n",
		tcm_hcd->id_info.mode);

		@@ -2841,6 +2840,13 @@ static int syna_tcm_resume(struct device *dev)

		if (!tcm_hcd->init_okay)
		syna_tcm_deferred_probe(dev);
		else {
		if (tcm_hcd->irq_enabled) {
		tcm_hcd->watchdog.run = false;
		tcm_hcd->update_watchdog(tcm_hcd, false);
		tcm_hcd->enable_irq(tcm_hcd, false, false);
		}
		}

		if (!tcm_hcd->in_suspend)
		return 0;
		@@ -2947,10 +2953,6 @@ static int syna_tcm_suspend(struct device *dev)

		mutex_unlock(&mod_pool.mutex);

		#ifndef WAKEUP_GESTURE
		tcm_hcd->enable_irq(tcm_hcd, false, true);
		#endif

		tcm_hcd->in_suspend = true;

		return 0;
		@@ -3004,6 +3006,10 @@ static int syna_tcm_early_suspend(struct device *dev)

		mutex_unlock(&mod_pool.mutex);

		#ifndef WAKEUP_GESTURE
		tcm_hcd->enable_irq(tcm_hcd, false, true);
		#endif

		return 0;
		}

drivers/input/touchscreen/synaptics_tcm/synaptics_tcm_i2c.c

+12 −12

Original line number	Diff line number	Diff line
		@@ -242,11 +242,11 @@ static int syna_tcm_i2c_rmi_read(struct syna_tcm_hcd *tcm_hcd,
		retval = length;
		goto exit;
		}
		LOGE(&i2c->dev,
		"Transfer attempt %d failed\n",
		attempt + 1);

		LOGD(&i2c->dev, "Transfer attempt %d times\n", attempt + 1);

		if (attempt + 1 == XFER_ATTEMPTS) {
		LOGE(&i2c->dev, "Transfer failed\n");
		retval = -EIO;
		goto exit;
		}
		@@ -303,11 +303,11 @@ static int syna_tcm_i2c_rmi_write(struct syna_tcm_hcd *tcm_hcd,
		retval = length;
		goto exit;
		}
		LOGE(&i2c->dev,
		"Transfer attempt %d failed\n",
		attempt + 1);

		LOGD(&i2c->dev, "Transfer attempt %d times\n", attempt + 1);

		if (attempt + 1 == XFER_ATTEMPTS) {
		LOGE(&i2c->dev, "Transfer failed\n");
		retval = -EIO;
		goto exit;
		}
		@@ -341,11 +341,11 @@ static int syna_tcm_i2c_read(struct syna_tcm_hcd tcm_hcd, unsigned char data,
		retval = length;
		goto exit;
		}
		LOGE(&i2c->dev,
		"Transfer attempt %d failed\n",
		attempt + 1);

		LOGD(&i2c->dev, "Transfer attempt %d times\n", attempt + 1);

		if (attempt + 1 == XFER_ATTEMPTS) {
		LOGE(&i2c->dev, "Transfer failed\n");
		retval = -EIO;
		goto exit;
		}
		@@ -379,11 +379,11 @@ static int syna_tcm_i2c_write(struct syna_tcm_hcd tcm_hcd, unsigned char data,
		retval = length;
		goto exit;
		}
		LOGE(&i2c->dev,
		"Transfer attempt %d failed\n",
		attempt + 1);

		LOGD(&i2c->dev, "Transfer attempt %d times\n", attempt + 1);

		if (attempt + 1 == XFER_ATTEMPTS) {
		LOGE(&i2c->dev, "Transfer failed\n");
		retval = -EIO;
		goto exit;
		}

drivers/input/touchscreen/synaptics_tcm/synaptics_tcm_reflash.c

+9 −11

Original line number	Diff line number	Diff line
		@@ -448,7 +448,7 @@ static ssize_t reflash_sysfs_reflash_store(struct device *dev,

		retval = reflash_get_fw_image();
		if (retval < 0) {
		LOGE(tcm_hcd->pdev->dev.parent,
		LOGD(tcm_hcd->pdev->dev.parent,
		"Failed to get firmware image\n");
		goto exit;
		}
		@@ -932,7 +932,7 @@ static int reflash_get_fw_image(void)
		retval = request_firmware(&reflash_hcd->fw_entry, FW_IMAGE_NAME,
		tcm_hcd->pdev->dev.parent);
		if (retval < 0) {
		LOGE(tcm_hcd->pdev->dev.parent,
		LOGD(tcm_hcd->pdev->dev.parent,
		"Failed to request %s\n",
		FW_IMAGE_NAME);
		return retval;
		@@ -1024,16 +1024,14 @@ static enum update_area reflash_compare_id_info(void)
		update_area = NONE;

		exit:
		if (update_area == NONE) {
		LOGN(tcm_hcd->pdev->dev.parent,
		"No need to do reflash\n");
		} else {
		LOGN(tcm_hcd->pdev->dev.parent,
		if (update_area == NONE)
		LOGD(tcm_hcd->pdev->dev.parent, "No need to do reflash\n");
		else
		LOGD(tcm_hcd->pdev->dev.parent,
		"Updating %s\n",
		update_area == FIRMWARE_CONFIG ?
		"firmware and config" :
		"config only");
		}

		return update_area;
		}
		@@ -1869,12 +1867,12 @@ static int reflash_do_reflash(void)

		retval = reflash_get_fw_image();
		if (retval < 0) {
		LOGE(tcm_hcd->pdev->dev.parent,
		LOGD(tcm_hcd->pdev->dev.parent,
		"Failed to get firmware image\n");
		goto exit;
		}

		LOGN(tcm_hcd->pdev->dev.parent,
		LOGD(tcm_hcd->pdev->dev.parent,
		"Start of reflash\n");

		atomic_set(&tcm_hcd->firmware_flashing, 1);
		@@ -1919,7 +1917,7 @@ static int reflash_do_reflash(void)
		break;
		}

		LOGN(tcm_hcd->pdev->dev.parent,
		LOGD(tcm_hcd->pdev->dev.parent,
		"End of reflash\n");

		retval = 0;

drivers/input/touchscreen/synaptics_tcm/synaptics_tcm_touch.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -996,7 +996,7 @@ static int touch_set_input_reporting(void)
		"Failed to check input parameters\n");
		goto exit;
		} else if (retval == 0) {
		LOGN(tcm_hcd->pdev->dev.parent,
		LOGD(tcm_hcd->pdev->dev.parent,
		"Input parameters unchanged\n");
		goto exit;
		}