openharmony/drivers_framework
1
0
Fork 0
mirror of https://github.com/openharmony/drivers_framework.git synced 2026-07-20 00:33:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

!16 modify private to priv

Browse Source 
Merge pull request !16 from GongHui/master
This commit is contained in:
openharmony_ci
2021-03-22 17:36:46 +08:00
committed by Gitee
parent 59ce11f6a8 a575dc3088
commit 71f152a486
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/core/hdf_device_desc.h
+1 -1
View File
@@ -94,7 +94,7 @@ struct HdfDeviceObject {
const struct DeviceResourceNode *property;
DeviceClass deviceClass;
/** Pointer to the private data of the device */
void *private;
void *priv;
};
/**
model/input/driver/hdf_touch.c
+4 -4
View File
@@ -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) {