coresight: etm4x: Check every parameter used by dma_xx_coherent.
authorEric Long <eric.long@linaro.org>
Thu, 18 Feb 2016 00:51:44 +0000 (17:51 -0700)
committerMathieu Poirier <mathieu.poirier@linaro.org>
Wed, 1 Jun 2016 21:30:11 +0000 (15:30 -0600)
The dma_alloc_coherent return an "void *" not an "void __iomen *".
It uses the wrong parameters when calls dma_free_coherent function.

The sparse tool output logs as the following:
coresight-tmc.c:199:23:    expected void *<noident>
coresight-tmc.c:199:23:    got void [noderef] <asn:2>*vaddr
coresight-tmc.c:336:30: warning: incorrect type in assignment
(different address spaces)
coresight-tmc.c:336:30:    expected char *buf
coresight-tmc.c:336:30:    got void [noderef] <asn:2>*
coresight-tmc.c:769:50: warning: incorrect type in argument 4
(different base types)
coresight-tmc.c:769:50:    expected unsigned long long
[unsigned] [usertype] dma_handle
coresight-tmc.c:769:50:    got restricted gfp_t

Signed-off-by: Eric Long <eric.long@linaro.org>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 61390593f72377c3a8f41ef998462e2d3985adac)

drivers/hwtracing/coresight/coresight-tmc.c

index 570d96815f7875391adfaa33c25dad432297af37..c4fa70ed14cedabbdab3e9da0d704914aac6ddf7 100644 (file)
@@ -124,7 +124,7 @@ struct tmc_drvdata {
        bool                    reading;
        char                    *buf;
        dma_addr_t              paddr;
-       void __iomem            *vaddr;
+       void                    *vaddr;
        u32                     size;
        bool                    enable;
        enum tmc_config_type    config_type;
@@ -766,7 +766,7 @@ err_misc_register:
 err_devm_kzalloc:
        if (drvdata->config_type == TMC_CONFIG_TYPE_ETR)
                dma_free_coherent(dev, drvdata->size,
-                               &drvdata->paddr, GFP_KERNEL);
+                               drvdata->vaddr, drvdata->paddr);
        return ret;
 }