summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Green <andy.green@linaro.org>2012-03-11 21:00:36 +0800
committerAndy Green <andy.green@linaro.org>2012-03-13 11:20:40 +0800
commit69f6082a8defb178f61605f56bbdf7d44e37cbf0 (patch)
tree6d26712fec030c279d17a067da1cf18f822821e2
parent687f86176b6e66d67044ef05ecbb962a22d8dc0e (diff)
uplevel omap_iopgtable_store_entry and pdev is pointer in omap_device now
Signed-off-by: Andy Green <andy.green@linaro.org>
-rw-r--r--drivers/remoteproc/omap_remoteproc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/remoteproc/omap_remoteproc.c b/drivers/remoteproc/omap_remoteproc.c
index 90798fb95df..fd202a7c9e2 100644
--- a/drivers/remoteproc/omap_remoteproc.c
+++ b/drivers/remoteproc/omap_remoteproc.c
@@ -156,7 +156,7 @@ omap_rproc_map(struct device *dev, struct iommu *obj, u32 da, u32 pa, u32 size)
e.endian = MMU_RAM_ENDIAN_LITTLE;
e.elsz = MMU_RAM_ELSZ_32;
- ret = iopgtable_store_entry(obj, &e);
+ ret = omap_iopgtable_store_entry(obj, &e);
if (ret) {
dev_err(dev, "iopgtable_store_entry fail: %d\n", ret);
return ret;
@@ -186,7 +186,7 @@ static int omap_rproc_iommu_isr(struct iommu *iommu, u32 da, u32 errs, void *p)
int omap_rproc_activate(struct omap_device *od)
{
int i, ret = 0;
- struct rproc *rproc = platform_get_drvdata(&od->pdev);
+ struct rproc *rproc = platform_get_drvdata(od->pdev);
struct device *dev = rproc->dev;
struct omap_rproc_pdata *pdata = dev->platform_data;
struct omap_rproc_timers_info *timers = pdata->timers;
@@ -242,7 +242,7 @@ int omap_rproc_activate(struct omap_device *od)
int omap_rproc_deactivate(struct omap_device *od)
{
int i, ret = 0;
- struct rproc *rproc = platform_get_drvdata(&od->pdev);
+ struct rproc *rproc = platform_get_drvdata(od->pdev);
struct device *dev = rproc->dev;
struct omap_rproc_pdata *pdata = dev->platform_data;
struct omap_rproc_timers_info *timers = pdata->timers;