diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2012-10-11 21:08:04 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-11-28 07:37:57 -0500 |
commit | d83501a0416160cc45e84b6719f7a2784013cf16 (patch) | |
tree | 2382d6bf3a15c12ffd641bdb609c526ace48d490 /drivers/media/platform/omap3isp/isphist.c | |
parent | 07d19e3cce15ed4a481236fe5e24668a720d0cbd (diff) |
[media] omap3isp: Remove unneeded module memory address definitions
The OMAP3ISP_*_REG_OFFSET, OMAP3ISP_*_REG_BASE and OMAP3ISP_*_REG macros
are not needed. Remove them.
The only exception is the OMAP3ISP_HIST_REG_BASE address. Replace it
with the memory address received through platform resources.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/platform/omap3isp/isphist.c')
-rw-r--r-- | drivers/media/platform/omap3isp/isphist.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/media/platform/omap3isp/isphist.c b/drivers/media/platform/omap3isp/isphist.c index d1a8dee5e1ca..74326ff342a5 100644 --- a/drivers/media/platform/omap3isp/isphist.c +++ b/drivers/media/platform/omap3isp/isphist.c | |||
@@ -72,11 +72,14 @@ static void hist_reset_mem(struct ispstat *hist) | |||
72 | 72 | ||
73 | static void hist_dma_config(struct ispstat *hist) | 73 | static void hist_dma_config(struct ispstat *hist) |
74 | { | 74 | { |
75 | struct isp_device *isp = hist->isp; | ||
76 | |||
75 | hist->dma_config.data_type = OMAP_DMA_DATA_TYPE_S32; | 77 | hist->dma_config.data_type = OMAP_DMA_DATA_TYPE_S32; |
76 | hist->dma_config.sync_mode = OMAP_DMA_SYNC_ELEMENT; | 78 | hist->dma_config.sync_mode = OMAP_DMA_SYNC_ELEMENT; |
77 | hist->dma_config.frame_count = 1; | 79 | hist->dma_config.frame_count = 1; |
78 | hist->dma_config.src_amode = OMAP_DMA_AMODE_CONSTANT; | 80 | hist->dma_config.src_amode = OMAP_DMA_AMODE_CONSTANT; |
79 | hist->dma_config.src_start = OMAP3ISP_HIST_REG_BASE + ISPHIST_DATA; | 81 | hist->dma_config.src_start = isp->mmio_base_phys[OMAP3_ISP_IOMEM_HIST] |
82 | + ISPHIST_DATA; | ||
80 | hist->dma_config.dst_amode = OMAP_DMA_AMODE_POST_INC; | 83 | hist->dma_config.dst_amode = OMAP_DMA_AMODE_POST_INC; |
81 | hist->dma_config.src_or_dst_synch = OMAP_DMA_SRC_SYNC; | 84 | hist->dma_config.src_or_dst_synch = OMAP_DMA_SRC_SYNC; |
82 | } | 85 | } |
@@ -477,6 +480,8 @@ int omap3isp_hist_init(struct isp_device *isp) | |||
477 | return -ENOMEM; | 480 | return -ENOMEM; |
478 | 481 | ||
479 | memset(hist, 0, sizeof(*hist)); | 482 | memset(hist, 0, sizeof(*hist)); |
483 | hist->isp = isp; | ||
484 | |||
480 | if (HIST_CONFIG_DMA) | 485 | if (HIST_CONFIG_DMA) |
481 | ret = omap_request_dma(OMAP24XX_DMA_NO_DEVICE, "DMA_ISP_HIST", | 486 | ret = omap_request_dma(OMAP24XX_DMA_NO_DEVICE, "DMA_ISP_HIST", |
482 | hist_dma_cb, hist, &hist->dma_ch); | 487 | hist_dma_cb, hist, &hist->dma_ch); |
@@ -494,7 +499,6 @@ int omap3isp_hist_init(struct isp_device *isp) | |||
494 | hist->ops = &hist_ops; | 499 | hist->ops = &hist_ops; |
495 | hist->priv = hist_cfg; | 500 | hist->priv = hist_cfg; |
496 | hist->event_type = V4L2_EVENT_OMAP3ISP_HIST; | 501 | hist->event_type = V4L2_EVENT_OMAP3ISP_HIST; |
497 | hist->isp = isp; | ||
498 | 502 | ||
499 | ret = omap3isp_stat_init(hist, "histogram", &hist_subdev_ops); | 503 | ret = omap3isp_stat_init(hist, "histogram", &hist_subdev_ops); |
500 | if (ret) { | 504 | if (ret) { |