Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd1ac7b7 authored by Karthik Jayakumar's avatar Karthik Jayakumar Committed by Gerrit - the friendly Code Review server
Browse files

msm: camera: req_mgr: Fix kmem_cache definition 



Add fixes to cam_req_mgr to include kmem_cache struct
definitions.

CRs-Fixed: 2554484
Change-Id: I368aa32e085431eff1976dfc09929e730d63b405
Signed-off-by: default avatarKarthik Jayakumar <kjayakum@codeaurora.org>
parent a27592f0

drivers/cam_req_mgr/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ ccflags-y += -I$(srctree)/techpack/camera/include/uapi 
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core

ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_smmu/

ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils

ccflags-y += -I$(src)

ccflags-y += -I$(srctree)/



obj-$(CONFIG_SPECTRA_CAMERA) += cam_req_mgr_core.o\

				cam_req_mgr_dev.o \

drivers/cam_req_mgr/cam_req_mgr_dev.c

+5 −1
Original line number Diff line number Diff line
@@ -6,12 +6,17 @@ 
#include <linux/module.h>

#include <linux/slab.h>

#include <linux/platform_device.h>

#include <linux/highmem.h>



#include <mm/slab.h>



#include <media/v4l2-fh.h>

#include <media/v4l2-device.h>

#include <media/v4l2-event.h>

#include <media/v4l2-ioctl.h>

#include <media/cam_req_mgr.h>

#include <media/cam_defs.h>



#include "cam_req_mgr_dev.h"

#include "cam_req_mgr_util.h"

#include "cam_req_mgr_core.h"
@@ -19,7 +24,6 @@ 
#include "cam_mem_mgr.h"

#include "cam_debug_util.h"

#include "cam_common_util.h"

#include <linux/slub_def.h>



#define CAM_REQ_MGR_EVENT_MAX 30

drivers/cam_req_mgr/cam_req_mgr_timer.c

+3 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.

 */



#include "cam_req_mgr_timer.h"

#include "cam_debug_util.h"



extern struct kmem_cache *g_cam_req_mgr_timer_cachep;



void crm_timer_reset(struct cam_req_mgr_timer *crm_timer)

{

	if (!crm_timer)

drivers/cam_req_mgr/cam_req_mgr_timer.h

+0 −1
Original line number Diff line number Diff line
@@ -62,5 +62,4 @@ int crm_timer_init(struct cam_req_mgr_timer **timer, 
 */

void crm_timer_exit(struct cam_req_mgr_timer **timer);



extern struct kmem_cache *g_cam_req_mgr_timer_cachep;

#endif