dw_dmac: don't check resource with devm_ioremap_resource

[linux-2.6-block.git] / drivers / dma / dw_dmac.c

diff --git a/drivers/dma/dw_dmac.c b/drivers/dma/dw_dmac.c
index 2e5deaa82b60579d24bd80fc42ac5327ac5e273f..2b65ba614e60a89ebf2bd852152f49b3ec15e48b 100644 (file)
--- a/drivers/dma/dw_dmac.c
+++ b/drivers/dma/dw_dmac.c
@@ -556,14 +556,14 @@ static void dwc_handle_error(struct dw_dma *dw, struct dw_dma_chan *dwc)
 
 /* --------------------- Cyclic DMA API extensions -------------------- */
 
-inline dma_addr_t dw_dma_get_src_addr(struct dma_chan *chan)
+dma_addr_t dw_dma_get_src_addr(struct dma_chan *chan)
 {
        struct dw_dma_chan *dwc = to_dw_dma_chan(chan);
        return channel_readl(dwc, SAR);
 }
 EXPORT_SYMBOL(dw_dma_get_src_addr);
 
-inline dma_addr_t dw_dma_get_dst_addr(struct dma_chan *chan)
+dma_addr_t dw_dma_get_dst_addr(struct dma_chan *chan)
 {
        struct dw_dma_chan *dwc = to_dw_dma_chan(chan);
        return channel_readl(dwc, DAR);
@@ -1667,14 +1667,11 @@ static int dw_probe(struct platform_device *pdev)
        int                     err;
        int                     i;
 
-       io = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (!io)
-               return -EINVAL;
-
        irq = platform_get_irq(pdev, 0);
        if (irq < 0)
                return irq;
 
+       io = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        regs = devm_ioremap_resource(&pdev->dev, io);
        if (IS_ERR(regs))
                return PTR_ERR(regs);