diff --git a/framework/model/input/driver/hdf_touch.c b/framework/model/input/driver/hdf_touch.c index a043310bd0a2418a569654769968936cd3862400..52aec409c9d1e2ed0171c07cd927327df624d05c 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);