aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/omap3isp/isp.c
diff options
context:
space:
mode:
authorOhad Ben-Cohen <ohad@wizery.com>2011-08-17 15:57:56 -0400
committerJoerg Roedel <joerg.roedel@amd.com>2011-08-26 05:46:01 -0400
commit6c32df437c7c5b1fc29d3ca29b0ff44f8dfafc56 (patch)
tree939d751cbae86291f6b5152cee4615284165fece /drivers/media/video/omap3isp/isp.c
parent384fa675795ae3796dbc263e5d0f35b9a27d6462 (diff)
omap: iommu: omapify 'struct iommu' and exposed API
Prepend 'omap_' to OMAP's 'struct iommu' and exposed API, to prevent namespace pollution and generally to improve readability of the code that still uses the driver directly. Update the users as needed as well. Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com> Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Diffstat (limited to 'drivers/media/video/omap3isp/isp.c')
-rw-r--r--drivers/media/video/omap3isp/isp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/omap3isp/isp.c b/drivers/media/video/omap3isp/isp.c
index 0db45ac7489b..a4baa6165c2c 100644
--- a/drivers/media/video/omap3isp/isp.c
+++ b/drivers/media/video/omap3isp/isp.c
@@ -85,7 +85,7 @@
85 * any omap-specific iommu API 85 * any omap-specific iommu API
86 */ 86 */
87#define to_iommu(dev) \ 87#define to_iommu(dev) \
88 (struct iommu *)platform_get_drvdata(to_platform_device(dev)) 88 (struct omap_iommu *)platform_get_drvdata(to_platform_device(dev))
89 89
90static unsigned int autoidle; 90static unsigned int autoidle;
91module_param(autoidle, int, 0444); 91module_param(autoidle, int, 0444);
@@ -1115,7 +1115,7 @@ static void isp_save_ctx(struct isp_device *isp)
1115{ 1115{
1116 isp_save_context(isp, isp_reg_list); 1116 isp_save_context(isp, isp_reg_list);
1117 if (isp->iommu) 1117 if (isp->iommu)
1118 iommu_save_ctx(isp->iommu); 1118 omap_iommu_save_ctx(isp->iommu);
1119} 1119}
1120 1120
1121/* 1121/*
@@ -1129,7 +1129,7 @@ static void isp_restore_ctx(struct isp_device *isp)
1129{ 1129{
1130 isp_restore_context(isp, isp_reg_list); 1130 isp_restore_context(isp, isp_reg_list);
1131 if (isp->iommu) 1131 if (isp->iommu)
1132 iommu_restore_ctx(isp->iommu); 1132 omap_iommu_restore_ctx(isp->iommu);
1133 omap3isp_ccdc_restore_context(isp); 1133 omap3isp_ccdc_restore_context(isp);
1134 omap3isp_preview_restore_context(isp); 1134 omap3isp_preview_restore_context(isp);
1135} 1135}