samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

msm: camera: reqmgr: Remove debug flags when creating timer slab

Browse Source 
Remove all the debug flags in cache create call. The change
also adds the destroy call during unbind for consistency.

CRs-Fixed: 2841729
Change-Id: I2e0a0e4f2ec9191a3159d77892ff292a0a3cc131
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
This commit is contained in:
Karthik Anantha Ram
2021-04-14 14:26:51 -07:00
parent 2c537f74d5
commit 18485ef697
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/cam_req_mgr/cam_req_mgr_dev.c
View File

@@ -729,6 +729,12 @@ int cam_unregister_subdev(struct cam_subdev *csd)
} }
EXPORT_SYMBOL(cam_unregister_subdev); EXPORT_SYMBOL(cam_unregister_subdev);
static inline void cam_req_mgr_destroy_timer_slab(void)
{
kmem_cache_destroy(g_cam_req_mgr_timer_cachep);
g_cam_req_mgr_timer_cachep = NULL;
}
static int cam_req_mgr_component_master_bind(struct device *dev) static int cam_req_mgr_component_master_bind(struct device *dev)
{ {
int rc = 0; int rc = 0;
@@ -767,9 +773,7 @@ static int cam_req_mgr_component_master_bind(struct device *dev)
if (g_cam_req_mgr_timer_cachep == NULL) { if (g_cam_req_mgr_timer_cachep == NULL) {
g_cam_req_mgr_timer_cachep = kmem_cache_create("crm_timer", g_cam_req_mgr_timer_cachep = kmem_cache_create("crm_timer",
sizeof(struct cam_req_mgr_timer), 64, sizeof(struct cam_req_mgr_timer), 64, 0x0, NULL);
SLAB_CONSISTENCY_CHECKS | SLAB_RED_ZONE |
SLAB_POISON | SLAB_STORE_USER, NULL);
if (!g_cam_req_mgr_timer_cachep) if (!g_cam_req_mgr_timer_cachep)
CAM_ERR(CAM_CRM, CAM_ERR(CAM_CRM,
"Failed to create kmem_cache for crm_timer"); "Failed to create kmem_cache for crm_timer");
@@ -801,6 +805,7 @@ static int cam_req_mgr_component_master_bind(struct device *dev)
sysfs_fail: sysfs_fail:
sysfs_remove_file(&dev->kobj, &camera_debug_sysfs_attr.attr); sysfs_remove_file(&dev->kobj, &camera_debug_sysfs_attr.attr);
req_mgr_device_deinit: req_mgr_device_deinit:
cam_req_mgr_destroy_timer_slab();
cam_req_mgr_core_device_deinit(); cam_req_mgr_core_device_deinit();
req_mgr_core_fail: req_mgr_core_fail:
cam_req_mgr_util_deinit(); cam_req_mgr_util_deinit();
@@ -828,6 +833,7 @@ static void cam_req_mgr_component_master_unbind(struct device *dev)
cam_media_device_cleanup(); cam_media_device_cleanup();
cam_video_device_cleanup(); cam_video_device_cleanup();
cam_v4l2_device_cleanup(); cam_v4l2_device_cleanup();
cam_req_mgr_destroy_timer_slab();
mutex_destroy(&g_dev.dev_lock); mutex_destroy(&g_dev.dev_lock);
g_dev.state = false; g_dev.state = false;
} }