old mode 100644new mode 100755.. | .. |
---|
1191 | 1191 | int ret = 0; |
---|
1192 | 1192 | |
---|
1193 | 1193 | /* Read memdump info from the file */ |
---|
1194 | | - fp = dhd_filp_open(filepath, O_RDONLY, 0); |
---|
1195 | | - if (IS_ERR(fp) || (fp == NULL)) { |
---|
| 1194 | + fp = filp_open(filepath, O_RDONLY, 0); |
---|
| 1195 | + if (IS_ERR(fp)) { |
---|
1196 | 1196 | DHD_ERROR(("%s: File [%s] doesn't exist\n", __FUNCTION__, filepath)); |
---|
1197 | 1197 | #if defined(CONFIG_X86) && defined(OEM_ANDROID) |
---|
1198 | 1198 | /* Check if it is Live Brix Image */ |
---|
.. | .. |
---|
1202 | 1202 | /* Try if it is Installed Brix Image */ |
---|
1203 | 1203 | filepath = MEMDUMPINFO_INST; |
---|
1204 | 1204 | DHD_ERROR(("%s: Try File [%s]\n", __FUNCTION__, filepath)); |
---|
1205 | | - fp = dhd_filp_open(filepath, O_RDONLY, 0); |
---|
1206 | | - if (IS_ERR(fp) || (fp == NULL)) { |
---|
| 1205 | + fp = filp_open(filepath, O_RDONLY, 0); |
---|
| 1206 | + if (IS_ERR(fp)) { |
---|
1207 | 1207 | DHD_ERROR(("%s: File [%s] doesn't exist\n", __FUNCTION__, filepath)); |
---|
1208 | 1208 | goto done; |
---|
1209 | 1209 | } |
---|
.. | .. |
---|
1213 | 1213 | } |
---|
1214 | 1214 | |
---|
1215 | 1215 | /* Handle success case */ |
---|
1216 | | - ret = dhd_kernel_read_compat(fp, 0, (char *)&mem_val, sizeof(uint32)); |
---|
| 1216 | + ret = kernel_read_compat(fp, 0, (char *)&mem_val, sizeof(uint32)); |
---|
1217 | 1217 | if (ret < 0) { |
---|
1218 | 1218 | DHD_ERROR(("%s: File read error, ret=%d\n", __FUNCTION__, ret)); |
---|
1219 | | - dhd_filp_close(fp, NULL); |
---|
| 1219 | + filp_close(fp, NULL); |
---|
1220 | 1220 | goto done; |
---|
1221 | 1221 | } |
---|
1222 | 1222 | |
---|
.. | .. |
---|
1224 | 1224 | p_mem_val[sizeof(uint32) - 1] = '\0'; |
---|
1225 | 1225 | mem_val = bcm_atoi(p_mem_val); |
---|
1226 | 1226 | |
---|
1227 | | - dhd_filp_close(fp, NULL); |
---|
| 1227 | + filp_close(fp, NULL); |
---|
1228 | 1228 | |
---|
1229 | 1229 | done: |
---|
1230 | 1230 | return mem_val; |
---|
.. | .. |
---|
1335 | 1335 | * 2: Trigger Kernel crash by BUG() |
---|
1336 | 1336 | * File doesn't exist: Keep default value (1). |
---|
1337 | 1337 | */ |
---|
1338 | | - fp = dhd_filp_open(filepath, O_RDONLY, 0); |
---|
1339 | | - if (IS_ERR(fp) || (fp == NULL)) { |
---|
| 1338 | + fp = filp_open(filepath, O_RDONLY, 0); |
---|
| 1339 | + if (IS_ERR(fp)) { |
---|
1340 | 1340 | DHD_ERROR(("%s: File [%s] doesn't exist\n", __FUNCTION__, filepath)); |
---|
1341 | 1341 | } else { |
---|
1342 | | - int ret = dhd_kernel_read_compat(fp, 0, (char *)&mem_val, sizeof(uint32)); |
---|
| 1342 | + int ret = kernel_read_compat(fp, 0, (char *)&mem_val, sizeof(uint32)); |
---|
1343 | 1343 | if (ret < 0) { |
---|
1344 | 1344 | DHD_ERROR(("%s: File read error, ret=%d\n", __FUNCTION__, ret)); |
---|
1345 | 1345 | } else { |
---|
.. | .. |
---|
1348 | 1348 | mem_val = bcm_atoi(p_mem_val); |
---|
1349 | 1349 | DHD_ERROR(("%s: ASSERT ENABLED = %d\n", __FUNCTION__, mem_val)); |
---|
1350 | 1350 | } |
---|
1351 | | - dhd_filp_close(fp, NULL); |
---|
| 1351 | + filp_close(fp, NULL); |
---|
1352 | 1352 | } |
---|
1353 | 1353 | |
---|
1354 | 1354 | #ifdef CUSTOMER_HW4_DEBUG |
---|