From fc1705f35f006d3408a855b30243ebcc20a87ec9 Mon Sep 17 00:00:00 2001 From: xuzhenhai Date: Mon, 15 Jul 2024 16:33:24 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E8=A7=A6=E6=91=B8=E5=B1=8F?= =?UTF-8?q?=E5=BC=82=E6=AD=A5=E5=8A=A0=E8=BD=BD=E7=9A=84=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E8=A1=A5=E4=B8=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- framework/model/input/driver/hdf_touch.c | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/framework/model/input/driver/hdf_touch.c b/framework/model/input/driver/hdf_touch.c index a043310bd..52aec409c 100644 --- a/framework/model/input/driver/hdf_touch.c +++ b/framework/model/input/driver/hdf_touch.c @@ -606,7 +606,7 @@ static int32_t ChipDriverInit(ChipDevice *chipDev) ChipReset(chipDev); } CHECK_RETURN_VALUE(ret); - + #if GTP_ESD_PROTECT gt1x_workqueue = create_singlethread_workqueue("gt1x_workthread"); if (gt1x_workqueue == NULL) { @@ -699,14 +699,8 @@ static int32_t DeviceBindDriver(ChipDevice *chipDev) return HDF_SUCCESS; } -#if defined(CONFIG_ARCH_ROCKCHIP) -static int DoRegisterTouchChipDevice(void * data) -{ - ChipDevice *chipDev = (ChipDevice *) data; -#else -static int32_t DoRegisterTouchChipDevice(ChipDevice *chipDev) +int32_t RegisterTouchChipDevice(ChipDevice *chipDev) { -#endif int32_t ret; InputDevice *inputDev = NULL; if ((chipDev == NULL) || (chipDev->chipCfg == NULL)) { @@ -744,17 +738,6 @@ EXIT: return HDF_FAILURE; } -int32_t RegisterTouchChipDevice(ChipDevice *chipDev) -{ -#if defined(CONFIG_ARCH_ROCKCHIP) - struct task_struct *task; - task = kthread_run(DoRegisterTouchChipDevice, chipDev, "RegisterTouchChipDevicThread"); - return HDF_SUCCESS; -#else - return DoRegisterTouchChipDevice(chipDev); -#endif -} - static int32_t TouchGetDevType(TouchDriver *driver, struct HdfSBuf *reply) { uint32_t devType = driver->devType; @@ -1255,4 +1238,5 @@ struct HdfDriverEntry g_hdfTouchEntry = { .Init = HdfTouchDriverProbe, .Release = HdfTouchDriverRelease, }; + HDF_INIT(g_hdfTouchEntry); -- Gitee