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

Commit 41d267df authored by Harsh Shah's avatar Harsh Shah
Browse files

msm: camera: Make inline functions static 



Declaring inline functions static so that the header can be included
by multiple modules without compilation errors.

Change-Id: Ieb13e47f075bbc83b3aa7000527f1d0200d7101f
Signed-off-by: default avatarHarsh Shah <harshs@codeaurora.org>
parent 4fed24d1

drivers/media/platform/msm/camera/cam_utils/cam_soc_util.h

+13 −13
Original line number Diff line number Diff line
@@ -10,8 +10,8 @@ 
 * GNU General Public License for more details.

 */



#ifndef _CAM_UTIL_SOC_H_

#define _CAM_UTIL_SOC_H_

#ifndef _CAM_SOC_UTIL_H_

#define _CAM_SOC_UTIL_H_



#include <linux/clk.h>

#include <linux/interrupt.h>
@@ -292,7 +292,7 @@ int cam_soc_util_irq_disable(struct cam_hw_soc_info *soc_info); 
 *

 * @return:             Success or Failure

 */

inline int cam_soc_util_w(struct cam_hw_soc_info *soc_info,

static inline int cam_soc_util_w(struct cam_hw_soc_info *soc_info,

	uint32_t base_index, uint32_t offset, uint32_t data)

{

	if (!CAM_SOC_GET_REG_MAP_START(soc_info, base_index))
@@ -316,7 +316,7 @@ inline int cam_soc_util_w(struct cam_hw_soc_info *soc_info, 
 *

 * @return:             Success or Failure

 */

inline int cam_soc_util_w_mb(struct cam_hw_soc_info *soc_info,

static inline int cam_soc_util_w_mb(struct cam_hw_soc_info *soc_info,

	uint32_t base_index, uint32_t offset, uint32_t data)

{

	if (!CAM_SOC_GET_REG_MAP_START(soc_info, base_index))
@@ -336,7 +336,7 @@ inline int cam_soc_util_w_mb(struct cam_hw_soc_info *soc_info, 
 *

 * @return:             Value read from the register address

 */

inline uint32_t cam_soc_util_r(struct cam_hw_soc_info *soc_info,

static inline uint32_t cam_soc_util_r(struct cam_hw_soc_info *soc_info,

	uint32_t base_index, uint32_t offset)

{

	if (!CAM_SOC_GET_REG_MAP_START(soc_info, base_index))
@@ -359,7 +359,7 @@ inline uint32_t cam_soc_util_r(struct cam_hw_soc_info *soc_info, 
 *

 * @return:             Value read from the register address

 */

inline uint32_t cam_soc_util_r_mb(struct cam_hw_soc_info *soc_info,

static inline uint32_t cam_soc_util_r_mb(struct cam_hw_soc_info *soc_info,

	uint32_t base_index, uint32_t offset)

{

	if (!CAM_SOC_GET_REG_MAP_START(soc_info, base_index))
@@ -383,4 +383,4 @@ inline uint32_t cam_soc_util_r_mb(struct cam_hw_soc_info *soc_info, 
int cam_soc_util_reg_dump(struct cam_hw_soc_info *soc_info,

	uint32_t base_index, uint32_t offset, int size);



#endif /* __CAM_UTIL_SOC_H__ */
 
#endif /* _CAM_SOC_UTIL_H_ */