Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

dmaengine: ti-dma-crossbar: Fix of_device_id data parameter usage

Browse source 
Use pointers to static constant variables for crossbar type and for DMA
offset configuration.

Fixes compiler warnings on 64bit architectures:

drivers/dma/ti-dma-crossbar.c: In function ‘ti_dra7_xbar_probe’:
drivers/dma/ti-dma-crossbar.c:398:21: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
  xbar->dma_offset = (u32)match->data;
                     ^
drivers/dma/ti-dma-crossbar.c: In function ‘ti_dma_xbar_probe’:
drivers/dma/ti-dma-crossbar.c:431:10: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
  switch ((u32)match->data) {
          ^

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
This commit is contained in:
Peter Ujfalusi 2016-09-21 15:41:32 +03:00 committed by Vinod Koul
parent e7282b66a3
commit 5f9367a8d2
1 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
drivers/dma/ti-dma-crossbar.c
View file

@ -18,15 +18,19 @@
#define TI_XBAR_DRA7 0 #define TI_XBAR_DRA7 0
#define TI_XBAR_AM335X 1 #define TI_XBAR_AM335X 1
static const u32 ti_xbar_type[] = {
[TI_XBAR_DRA7] = TI_XBAR_DRA7,
[TI_XBAR_AM335X] = TI_XBAR_AM335X,
};
static const struct of_device_id ti_dma_xbar_match[] = { static const struct of_device_id ti_dma_xbar_match[] = {
{ {
.compatible = "ti,dra7-dma-crossbar", .compatible = "ti,dra7-dma-crossbar",
.data = (void *)TI_XBAR_DRA7, .data = &ti_xbar_type[TI_XBAR_DRA7],
}, },
{ {
.compatible = "ti,am335x-edma-crossbar", .compatible = "ti,am335x-edma-crossbar",
.data = (void *)TI_XBAR_AM335X, .data = &ti_xbar_type[TI_XBAR_AM335X],
}, },
{}, {},
}; };
@ -190,9 +194,6 @@ static int ti_am335x_xbar_probe(struct platform_device *pdev)
#define TI_DRA7_XBAR_OUTPUTS 127 #define TI_DRA7_XBAR_OUTPUTS 127
#define TI_DRA7_XBAR_INPUTS 256 #define TI_DRA7_XBAR_INPUTS 256
#define TI_XBAR_EDMA_OFFSET 0
#define TI_XBAR_SDMA_OFFSET 1
struct ti_dra7_xbar_data { struct ti_dra7_xbar_data {
void __iomem *iomem; void __iomem *iomem;
@ -280,18 +281,25 @@ static void *ti_dra7_xbar_route_allocate(struct of_phandle_args *dma_spec,
return map; return map;
} }
#define TI_XBAR_EDMA_OFFSET 0
#define TI_XBAR_SDMA_OFFSET 1
static const u32 ti_dma_offset[] = {
[TI_XBAR_EDMA_OFFSET] = 0,
[TI_XBAR_SDMA_OFFSET] = 1,
};
static const struct of_device_id ti_dra7_master_match[] = { static const struct of_device_id ti_dra7_master_match[] = {
{ {
.compatible = "ti,omap4430-sdma", .compatible = "ti,omap4430-sdma",
.data = (void *)TI_XBAR_SDMA_OFFSET, .data = &ti_dma_offset[TI_XBAR_SDMA_OFFSET],
}, },
{ {
.compatible = "ti,edma3", .compatible = "ti,edma3",
.data = (void *)TI_XBAR_EDMA_OFFSET, .data = &ti_dma_offset[TI_XBAR_EDMA_OFFSET],
}, },
{ {
.compatible = "ti,edma3-tpcc", .compatible = "ti,edma3-tpcc",
.data = (void *)TI_XBAR_EDMA_OFFSET, .data = &ti_dma_offset[TI_XBAR_EDMA_OFFSET],
}, },
{}, {},
}; };
@ -395,7 +403,7 @@ static int ti_dra7_xbar_probe(struct platform_device *pdev)
xbar->dmarouter.dev = &pdev->dev; xbar->dmarouter.dev = &pdev->dev;
xbar->dmarouter.route_free = ti_dra7_xbar_free; xbar->dmarouter.route_free = ti_dra7_xbar_free;
xbar->dma_offset = (u32)match->data; xbar->dma_offset = *(u32 *)match->data;
mutex_init(&xbar->mutex); mutex_init(&xbar->mutex);
platform_set_drvdata(pdev, xbar); platform_set_drvdata(pdev, xbar);
@ -428,7 +436,7 @@ static int ti_dma_xbar_probe(struct platform_device *pdev)
if (unlikely(!match)) if (unlikely(!match))
return -EINVAL; return -EINVAL;
switch ((u32)match->data) { switch (*(u32 *)match->data) {
case TI_XBAR_DRA7: case TI_XBAR_DRA7:
ret = ti_dra7_xbar_probe(pdev); ret = ti_dra7_xbar_probe(pdev);
break; break;