Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f9367a8 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Vinod Koul
Browse files

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



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: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent e7282b66

drivers/dma/ti-dma-crossbar.c

+18 −10
Original line number Diff line number Diff line
@@ -18,15 +18,19 @@ 


#define TI_XBAR_DRA7		0

#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[] = {

	{

		.compatible = "ti,dra7-dma-crossbar",

		.data = (void *)TI_XBAR_DRA7,

		.data = &ti_xbar_type[TI_XBAR_DRA7],

	},

	{

		.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_INPUTS	256



#define TI_XBAR_EDMA_OFFSET	0

#define TI_XBAR_SDMA_OFFSET	1



struct ti_dra7_xbar_data {

	void __iomem *iomem;
@@ -280,18 +281,25 @@ static void *ti_dra7_xbar_route_allocate(struct of_phandle_args *dma_spec, 
	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[] = {

	{

		.compatible = "ti,omap4430-sdma",

		.data = (void *)TI_XBAR_SDMA_OFFSET,

		.data = &ti_dma_offset[TI_XBAR_SDMA_OFFSET],

	},

	{

		.compatible = "ti,edma3",

		.data = (void *)TI_XBAR_EDMA_OFFSET,

		.data = &ti_dma_offset[TI_XBAR_EDMA_OFFSET],

	},

	{

		.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.route_free = ti_dra7_xbar_free;

	xbar->dma_offset = (u32)match->data;

	xbar->dma_offset = *(u32 *)match->data;



	mutex_init(&xbar->mutex);

	platform_set_drvdata(pdev, xbar);
@@ -428,7 +436,7 @@ static int ti_dma_xbar_probe(struct platform_device *pdev) 
	if (unlikely(!match))

		return -EINVAL;



	switch ((u32)match->data) {

	switch (*(u32 *)match->data) {

	case TI_XBAR_DRA7:

		ret = ti_dra7_xbar_probe(pdev);

		break;