coresight: etm4x: Drop iomem 'base' argument from etm4_probe()

[linux-2.6-microblaze.git] / drivers / hwtracing / coresight / coresight-etm4x-core.c

diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c
index 264242b..bf93147 100644 (file)
--- a/drivers/hwtracing/coresight/coresight-etm4x-core.c
+++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c
@@ -2044,7 +2044,7 @@ static int etm4_add_coresight_dev(struct etm4_init_arg *init_arg)
        return 0;
 }
 
-static int etm4_probe(struct device *dev, void __iomem *base, u32 etm_pid)
+static int etm4_probe(struct device *dev, u32 etm_pid)
 {
        struct etmv4_drvdata *drvdata = dev_get_drvdata(dev);
        struct csdev_access access = { 0 };
@@ -2065,8 +2065,6 @@ static int etm4_probe(struct device *dev, void __iomem *base, u32 etm_pid)
                        return -ENOMEM;
        }
 
-       drvdata->base = base;
-
        spin_lock_init(&drvdata->spinlock);
 
        drvdata->cpu = coresight_get_cpu(dev);
@@ -2120,8 +2118,9 @@ static int etm4_probe_amba(struct amba_device *adev, const struct amba_id *id)
        if (!drvdata)
                return -ENOMEM;
 
+       drvdata->base = base;
        dev_set_drvdata(dev, drvdata);
-       ret = etm4_probe(dev, base, id->id);
+       ret = etm4_probe(dev, id->id);
        if (!ret)
                pm_runtime_put(&adev->dev);
 
@@ -2137,6 +2136,7 @@ static int etm4_probe_platform_dev(struct platform_device *pdev)
        if (!drvdata)
                return -ENOMEM;
 
+       drvdata->base = NULL;
        dev_set_drvdata(&pdev->dev, drvdata);
        pm_runtime_get_noresume(&pdev->dev);
        pm_runtime_set_active(&pdev->dev);
@@ -2147,7 +2147,7 @@ static int etm4_probe_platform_dev(struct platform_device *pdev)
         * HW by reading appropriate registers on the HW
         * and thus we could skip the PID.
         */
-       ret = etm4_probe(&pdev->dev, NULL, 0);
+       ret = etm4_probe(&pdev->dev, 0);
 
        pm_runtime_put(&pdev->dev);
        return ret;