diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2016-09-21 15:41:28 +0300 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2016-09-28 08:53:06 +0530 |
| commit | b7862742feadf22cc1496bb6b460236a900512db (patch) | |
| tree | fae37c1627cdea225493b36f4c56e3020b8d0a33 | |
| parent | 86737510781bca1c5d27099c7a6ed4f33b631643 (diff) | |
| download | linux-stable-b7862742feadf22cc1496bb6b460236a900512db.tar.gz linux-stable-b7862742feadf22cc1496bb6b460236a900512db.tar.bz2 linux-stable-b7862742feadf22cc1496bb6b460236a900512db.zip | |
dmaengine: edma: Fix of_device_id data parameter usage (legacy vs TPCC)
Use pointers to static constant variables for eDMA binding
type (legacy vs TPCC).
Fixes the following warning when compiling the driver for 64bit
architectures (x86_64 for example):
drivers/dma/edma.c:2185:16: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
if (match && (u32)match->data == EDMA_BINDING_TPCC)
^
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
| -rw-r--r-- | drivers/dma/edma.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c index c2098a4b4dcf..951b8b204a47 100644 --- a/drivers/dma/edma.c +++ b/drivers/dma/edma.c @@ -263,14 +263,19 @@ static const struct edmacc_param dummy_paramset = { #define EDMA_BINDING_LEGACY 0 #define EDMA_BINDING_TPCC 1 +static const u32 edma_binding_type[] = { + [EDMA_BINDING_LEGACY] = EDMA_BINDING_LEGACY, + [EDMA_BINDING_TPCC] = EDMA_BINDING_TPCC, +}; + static const struct of_device_id edma_of_ids[] = { { .compatible = "ti,edma3", - .data = (void *)EDMA_BINDING_LEGACY, + .data = &edma_binding_type[EDMA_BINDING_LEGACY], }, { .compatible = "ti,edma3-tpcc", - .data = (void *)EDMA_BINDING_TPCC, + .data = &edma_binding_type[EDMA_BINDING_TPCC], }, {} }; @@ -2184,7 +2189,7 @@ static int edma_probe(struct platform_device *pdev) const struct of_device_id *match; match = of_match_node(edma_of_ids, node); - if (match && (u32)match->data == EDMA_BINDING_TPCC) + if (match && (*(u32 *)match->data) == EDMA_BINDING_TPCC) legacy_mode = false; info = edma_setup_info_from_dt(dev, legacy_mode); |