dmaengine: dw: substitute dma_read_byaddr by dma_readl_native

Since struct dw_dma is allocated and regs member is assigned properly we can
use standard IO accessors to the DMA registers.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>

diff --git a/drivers/dma/dw/core.c b/drivers/dma/dw/core.c
index db9b6f433148c02e1ece8524c8e6a96f93c72592..93d8d553c686b3127edbfa799d2503aa5390e40e 100644 (file)
--- a/drivers/dma/dw/core.c
+++ b/drivers/dma/dw/core.c
@@ -1529,7 +1529,7 @@ int dw_dma_probe(struct dw_dma_chip *chip, struct dw_dma_platform_data *pdata)
        pm_runtime_get_sync(chip->dev);
 
        if (!pdata) {
-               dw_params = dma_read_byaddr(chip->regs, DW_PARAMS);
+               dw_params = dma_readl(dw, DW_PARAMS);
                dev_dbg(chip->dev, "DW_PARAMS: 0x%08x\n", dw_params);
 
                autocfg = dw_params >> DW_PARAMS_EN & 1;
@@ -1629,11 +1629,9 @@ int dw_dma_probe(struct dw_dma_chip *chip, struct dw_dma_platform_data *pdata)
 
                /* Hardware configuration */
                if (autocfg) {
-                       unsigned int dwc_params;
                        unsigned int r = DW_DMA_MAX_NR_CHANNELS - i - 1;
-                       void __iomem *addr = chip->regs + r * sizeof(u32);
-
-                       dwc_params = dma_read_byaddr(addr, DWC_PARAMS);
+                       void __iomem *addr = &__dw_regs(dw)->DWC_PARAMS[r];
+                       unsigned int dwc_params = dma_readl_native(addr);
 
                        dev_dbg(chip->dev, "DWC_PARAMS[%d]: 0x%08x\n", i,
                                           dwc_params);

diff --git a/drivers/dma/dw/regs.h b/drivers/dma/dw/regs.h
index 59d6cec01dca6ca5331130e4a72c5a875aeb1598..feb3a4a7623b3cec654c31af91de18d58c4d950b 100644 (file)
--- a/drivers/dma/dw/regs.h
+++ b/drivers/dma/dw/regs.h
@@ -114,10 +114,6 @@ struct dw_dma_regs {
 #define dma_writel_native writel
 #endif
 
-/* To access the registers in early stage of probe */
-#define dma_read_byaddr(addr, name) \
-       dma_readl_native((addr) + offsetof(struct dw_dma_regs, name))
-
 /* Bitfields in DW_PARAMS */
 #define DW_PARAMS_NR_CHAN      8               /* number of channels */
 #define DW_PARAMS_NR_MASTER    11              /* number of AHB masters */