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

Commit 94cb0e79 authored by Russell King's avatar Russell King
Browse files

DMA-API: dma: edma.c: no need to explicitly initialize DMA masks 



register_platform_device_full() can setup the DMA mask provided the
appropriate member is set in struct platform_device_info.  So lets
make that be the case.  This avoids a direct reference to the DMA
masks by this driver.

While here, add the dma_set_mask_and_coherent() call which the DMA API
requires DMA-using drivers to call.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 460d47db

drivers/dma/edma.c

+6 −4
Original line number Original line Diff line number Diff line
@@ -631,6 +631,10 @@ static int edma_probe(struct platform_device *pdev) 
	struct edma_cc *ecc;

	struct edma_cc *ecc;

	int ret;

	int ret;





	ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));

	if (ret)

		return ret;



	ecc = devm_kzalloc(&pdev->dev, sizeof(*ecc), GFP_KERNEL);

	ecc = devm_kzalloc(&pdev->dev, sizeof(*ecc), GFP_KERNEL);

	if (!ecc) {

	if (!ecc) {

		dev_err(&pdev->dev, "Can't allocate controller\n");

		dev_err(&pdev->dev, "Can't allocate controller\n");
@@ -702,11 +706,13 @@ static struct platform_device *pdev0, *pdev1; 
static const struct platform_device_info edma_dev_info0 = {

static const struct platform_device_info edma_dev_info0 = {

	.name = "edma-dma-engine",

	.name = "edma-dma-engine",

	.id = 0,

	.id = 0,

	.dma_mask = DMA_BIT_MASK(32),

};

};





static const struct platform_device_info edma_dev_info1 = {

static const struct platform_device_info edma_dev_info1 = {

	.name = "edma-dma-engine",

	.name = "edma-dma-engine",

	.id = 1,

	.id = 1,

	.dma_mask = DMA_BIT_MASK(32),

};

};





static int edma_init(void)

static int edma_init(void)
@@ -720,8 +726,6 @@ static int edma_init(void) 
			ret = PTR_ERR(pdev0);

			ret = PTR_ERR(pdev0);

			goto out;

			goto out;

		}

		}

		pdev0->dev.dma_mask = &pdev0->dev.coherent_dma_mask;

		pdev0->dev.coherent_dma_mask = DMA_BIT_MASK(32);

	}

	}





	if (EDMA_CTLRS == 2) {

	if (EDMA_CTLRS == 2) {
@@ -731,8 +735,6 @@ static int edma_init(void) 
			platform_device_unregister(pdev0);

			platform_device_unregister(pdev0);

			ret = PTR_ERR(pdev1);

			ret = PTR_ERR(pdev1);

		}

		}

		pdev1->dev.dma_mask = &pdev1->dev.coherent_dma_mask;

		pdev1->dev.coherent_dma_mask = DMA_BIT_MASK(32);

	}

	}





out:

out: