shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

media: rockchip: isp: fix compile error when config with module

Browse Source 
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: Icdedf22cfe30674107e72293dca80711c2c4a548
This commit is contained in:
Hu Kejun
2020-06-23 10:39:59 +08:00
committed by Tao Huang
parent be64802e6b
commit ff3ba38a27
3 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/media/platform/rockchip/isp/bridge.c
View File

@@ -796,3 +796,4 @@ void rkisp_get_bridge_sd(struct platform_device *dev,
else
*sd = NULL;
}
EXPORT_SYMBOL(rkisp_get_bridge_sd);

33
drivers/media/platform/rockchip/isp/dev.c
View File

@@ -81,6 +81,30 @@ MODULE_PARM_DESC(version, "version number");
static DEFINE_MUTEX(rkisp_dev_mutex);
static LIST_HEAD(rkisp_device_list);
static int __maybe_unused __rkisp_clr_unready_dev(void)
{
struct rkisp_device *isp_dev;
mutex_lock(&rkisp_dev_mutex);
list_for_each_entry(isp_dev, &rkisp_device_list, list)
v4l2_async_notifier_clr_unready_dev(&isp_dev->notifier);
mutex_unlock(&rkisp_dev_mutex);
return 0;
}
static int rkisp_clr_unready_dev_param_set(const char *val, const struct kernel_param *kp)
{
#ifdef MODULE
__rkisp_clr_unready_dev();
#endif
return 0;
}
module_param_call(clr_unready_dev, rkisp_clr_unready_dev_param_set, NULL, NULL, 0200);
MODULE_PARM_DESC(clr_unready_dev, "clear unready devices");
/**************************** pipeline operations *****************************/
static int __isp_pipeline_prepare(struct rkisp_pipeline *p,
@@ -1171,18 +1195,15 @@ static int __maybe_unused rkisp_runtime_resume(struct device *dev)
return 0;
}
#ifndef MODULE
static int __init rkisp_clr_unready_dev(void)
{
struct rkisp_device *isp_dev;
mutex_lock(&rkisp_dev_mutex);
list_for_each_entry(isp_dev, &rkisp_device_list, list)
v4l2_async_notifier_clr_unready_dev(&isp_dev->notifier);
mutex_unlock(&rkisp_dev_mutex);
__rkisp_clr_unready_dev();
return 0;
}
late_initcall_sync(rkisp_clr_unready_dev);
#endif
static const struct dev_pm_ops rkisp_plat_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,

2
drivers/media/platform/rockchip/isp/isp_ispp.h
View File

@@ -41,7 +41,7 @@ struct rkisp_ispp_buf {
int __init rkispp_plat_drv_init(void);
#endif
#if defined(CONFIG_VIDEO_ROCKCHIP_ISP)
#if IS_ENABLED(CONFIG_VIDEO_ROCKCHIP_ISP)
void rkisp_get_bridge_sd(struct platform_device *dev,
struct v4l2_subdev **sd);
#else