Merge "input: touchscreen: focaltech_touch: remove extra kernel print" (6f98876d) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/input/touchscreen/focaltech_touch/focaltech_core.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -1271,11 +1271,11 @@ static int fb_notifier_callback(struct notifier_block *self,
		}

		blank = evdata->data;
		FTS_INFO("FB event:%lu,blank:%d", event, *blank);
		FTS_DEBUG("FB event:%lu,blank:%d", event, *blank);
		switch (*blank) {
		case DRM_PANEL_BLANK_UNBLANK:
		if (event == DRM_PANEL_EARLY_EVENT_BLANK) {
		FTS_INFO("resume: event = %lu, not care\n", event);
		FTS_DEBUG("resume: event = %lu, not care\n", event);
		} else if (event == DRM_PANEL_EVENT_BLANK) {
		queue_work(fts_data->ts_workqueue, &fts_data->resume_work);
		}
		@@ -1286,12 +1286,12 @@ static int fb_notifier_callback(struct notifier_block *self,
		cancel_work_sync(&fts_data->resume_work);
		fts_ts_suspend(ts_data->dev);
		} else if (event == DRM_PANEL_EVENT_BLANK) {
		FTS_INFO("suspend: event = %lu, not care\n", event);
		FTS_DEBUG("suspend: event = %lu, not care\n", event);
		}
		break;

		default:
		FTS_INFO("FB BLANK(%d) do not need process\n", *blank);
		FTS_DEBUG("FB BLANK(%d) do not need process\n", *blank);
		break;
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -1862,7 +1862,7 @@ static int fts_fwupg_get_fw_file(struct fts_upgrade *upg)
		upg->lic = upg->fw;
		upg->lic_length = upg->fw_length;

		FTS_INFO("upgrade fw file len:%d", upg->fw_length);
		FTS_DEBUG("upgrade fw file len:%d", upg->fw_length);
		if ((upg->fw_length < FTS_MIN_LEN)
		\|\| (upg->fw_length > FTS_MAX_LEN_FILE)) {
		FTS_ERROR("fw file len(%d) fail", upg->fw_length);
		@@ -1898,7 +1898,7 @@ static void fts_fwupg_work(struct work_struct *work)
		return ;
		#endif

		FTS_INFO("fw upgrade work function");
		FTS_DEBUG("fw upgrade work function");
		if (!upg \|\| !upg->ts_data) {
		FTS_ERROR("upg/ts_data is null");
		return ;