Message ID | 20130921195531.GO12758@n2100.arm.linux.org.uk |
---|---|
State | Not Applicable, archived |
Delegated to: | David Miller |
Headers | show |
On Sat, Sep 21, 2013 at 08:55:31PM +0100, Russell King - ARM Linux wrote: > On Fri, Sep 20, 2013 at 04:42:08PM +0100, Ben Hutchings wrote: > > On Thu, 2013-09-19 at 22:43 +0100, Russell King wrote: > > > + if (dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)) || > > > + dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32))) { > > > > Surely we want && here. > > Good catch, exactly right. Thanks for the review, here's the replacement > patch: > > 8<==== > From: Russell King <rmk+kernel@arm.linux.org.uk> > Subject: [PATCH] DMA-API: staging: et131x: replace > dma_set_mask()+dma_set_coherent_mask() with new helper > > Replace the following sequence: > > dma_set_mask(dev, mask); > dma_set_coherent_mask(dev, mask); > > with a call to the new helper dma_set_mask_and_coherent(). > > Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> > --- > drivers/staging/et131x/et131x.c | 17 ++--------------- > 1 files changed, 2 insertions(+), 15 deletions(-) Acked-by: Mark Einon <mark.einon@gmail.com> Cheers, Mark -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c index f73e58f..61da7ee 100644 --- a/drivers/staging/et131x/et131x.c +++ b/drivers/staging/et131x/et131x.c @@ -4797,21 +4797,8 @@ static int et131x_pci_setup(struct pci_dev *pdev, pci_set_master(pdev); /* Check the DMA addressing support of this device */ - if (!dma_set_mask(&pdev->dev, DMA_BIT_MASK(64))) { - rc = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64)); - if (rc < 0) { - dev_err(&pdev->dev, - "Unable to obtain 64 bit DMA for consistent allocations\n"); - goto err_release_res; - } - } else if (!dma_set_mask(&pdev->dev, DMA_BIT_MASK(32))) { - rc = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); - if (rc < 0) { - dev_err(&pdev->dev, - "Unable to obtain 32 bit DMA for consistent allocations\n"); - goto err_release_res; - } - } else { + if (dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)) && + dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32))) { dev_err(&pdev->dev, "No usable DMA addressing method\n"); rc = -EIO; goto err_release_res;