From de8715a63a3a0adf3ea9df1d34766bbbc05956c1 Mon Sep 17 00:00:00 2001 From: GongHui Date: Mon, 22 Mar 2021 16:34:24 +0800 Subject: [PATCH 1/2] modify private to priv --- include/core/hdf_device_desc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/core/hdf_device_desc.h b/include/core/hdf_device_desc.h index ed8f2d622..9c64aa6f7 100644 --- a/include/core/hdf_device_desc.h +++ b/include/core/hdf_device_desc.h @@ -94,7 +94,7 @@ struct HdfDeviceObject { const struct DeviceResourceNode *property; DeviceClass deviceClass; /** Pointer to the private data of the device */ - void *private; + void *priv; }; /** -- Gitee From a575dc3088d0f4ba89ced24feb41ea6d4cb0aec8 Mon Sep 17 00:00:00 2001 From: GongHui Date: Mon, 22 Mar 2021 17:00:18 +0800 Subject: [PATCH 2/2] modify private to priv --- model/input/driver/hdf_touch.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/model/input/driver/hdf_touch.c b/model/input/driver/hdf_touch.c index 04daecad1..239c711d5 100644 --- a/model/input/driver/hdf_touch.c +++ b/model/input/driver/hdf_touch.c @@ -593,7 +593,7 @@ static int32_t HdfTouchDispatch(struct HdfDeviceIoClient *client, int32_t cmd, return HDF_FAILURE; } - touchDriver = (TouchDriver *)client->device->private; + touchDriver = (TouchDriver *)client->device->priv; if (touchDriver == NULL) { HDF_LOGE("%s: touchDriver is null", __func__); return HDF_FAILURE; @@ -775,7 +775,7 @@ static int32_t HdfTouchDriverProbe(struct HdfDeviceObject *device) touchDriver->hdfTouchDev = device; touchDriver->boardCfg = boardCfg; AddTouchDriver(touchDriver); - device->private = (void *)touchDriver; + device->priv = (void *)touchDriver; HDF_LOGI("%s: %s exit succ", __func__, boardCfg->attr.devName); return HDF_SUCCESS; } @@ -795,11 +795,11 @@ static void HdfTouchDriverRelease(struct HdfDeviceObject *device) InputDevice *inputDev = NULL; int32_t i; - if (device == NULL || device->private == NULL) { + if (device == NULL || device->priv == NULL) { HDF_LOGE("%s: param is null", __func__); return; } - driver = device->private; + driver = device->priv; for (i = 0; i < MAX_TOUCH_DEVICE; i++) { if (g_touchDriverList[i] == driver) { -- Gitee