From 658bd43fdc2743d30bfab448ba15a8aaed3da03c Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Fri, 6 Jul 2012 08:26:57 -0300 Subject: [PATCH] --- yaml --- r: 330741 b: refs/heads/master c: fbabfa8dde57f7862f2c9b0fd1324f241e2f267a h: refs/heads/master i: 330739: b786c4e82bcbff0e0a59535ca5cfa1ccc0b21a86 v: v3 --- [refs] | 2 +- .../drivers/media/video/omap3isp/isppreview.c | 18 +----------------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/[refs] b/[refs] index 3bf8cefdcdcd..cc8afedd3928 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b1e71f31cb315cdc3be5a861b2eaab7401b70295 +refs/heads/master: fbabfa8dde57f7862f2c9b0fd1324f241e2f267a diff --git a/trunk/drivers/media/video/omap3isp/isppreview.c b/trunk/drivers/media/video/omap3isp/isppreview.c index 53f5a703e31a..eede8187217d 100644 --- a/trunk/drivers/media/video/omap3isp/isppreview.c +++ b/trunk/drivers/media/video/omap3isp/isppreview.c @@ -214,22 +214,6 @@ preview_enable_drkframe(struct isp_prev_device *prev, u8 enable) ISPPRV_PCR_DRKFEN); } -/* - * preview_config_drkf_shadcomp - Configures shift value in shading comp. - * @scomp_shtval: 3bit value of shift used in shading compensation. - */ -static void -preview_config_drkf_shadcomp(struct isp_prev_device *prev, - const void *scomp_shtval) -{ - struct isp_device *isp = to_isp_device(prev); - const u32 *shtval = scomp_shtval; - - isp_reg_clr_set(isp, OMAP3_ISP_IOMEM_PREV, ISPPRV_PCR, - ISPPRV_PCR_SCOMP_SFT_MASK, - *shtval << ISPPRV_PCR_SCOMP_SFT_SHIFT); -} - /* * preview_enable_hmed - Enables/Disables of the Horizontal Median Filter. * @enable: 1 - Enables Horizontal Median Filter. @@ -870,7 +854,7 @@ static const struct preview_update update_attrs[] = { NULL, preview_enable_drkframe, }, /* OMAP3ISP_PREV_LENS_SHADING */ { - preview_config_drkf_shadcomp, + NULL, preview_enable_drkframe, }, /* OMAP3ISP_PREV_NF */ { preview_config_noisefilter,