dmaengine: xilinx: xdma: Get rid of unused code

Get rid of duplicated macro definitions, as these macros are defined
earlier in the file. Also, get rid of unused member
of 'struct xdma_desc'.

Signed-off-by: Jan Kuliga <jankul@alatek.krakow.pl>
Link: https://lore.kernel.org/r/20231218113943.9099-2-jankul@alatek.krakow.pl
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/dma/xilinx/xdma-regs.h b/drivers/dma/xilinx/xdma-regs.h
index e641a5083e14b081a7871b3a19bda0c57601d6b5..0b17a931f58307f1cd0226bab231160f54afc3b3 100644 (file)
--- a/drivers/dma/xilinx/xdma-regs.h
+++ b/drivers/dma/xilinx/xdma-regs.h
@@ -134,18 +134,6 @@ struct xdma_hw_desc {
 #define XDMA_SGDMA_DESC_ADJ    0x4088
 #define XDMA_SGDMA_DESC_CREDIT 0x408c
 
-/* bits of the SG DMA control register */
-#define XDMA_CTRL_RUN_STOP                     BIT(0)
-#define XDMA_CTRL_IE_DESC_STOPPED              BIT(1)
-#define XDMA_CTRL_IE_DESC_COMPLETED            BIT(2)
-#define XDMA_CTRL_IE_DESC_ALIGN_MISMATCH       BIT(3)
-#define XDMA_CTRL_IE_MAGIC_STOPPED             BIT(4)
-#define XDMA_CTRL_IE_IDLE_STOPPED              BIT(6)
-#define XDMA_CTRL_IE_READ_ERROR                        GENMASK(13, 9)
-#define XDMA_CTRL_IE_DESC_ERROR                        GENMASK(23, 19)
-#define XDMA_CTRL_NON_INCR_ADDR                        BIT(25)
-#define XDMA_CTRL_POLL_MODE_WB                 BIT(26)
-
 /*
  * interrupt registers
  */

diff --git a/drivers/dma/xilinx/xdma.c b/drivers/dma/xilinx/xdma.c
index 290bb5d2d1e2bdd47cdd99e305507c1c0d00453b..ddb9e7d07461652446bd47edae46d27534f037ff 100644 (file)
--- a/drivers/dma/xilinx/xdma.c
+++ b/drivers/dma/xilinx/xdma.c
@@ -78,7 +78,6 @@ struct xdma_chan {
  * @vdesc: Virtual DMA descriptor
  * @chan: DMA channel pointer
  * @dir: Transferring direction of the request
- * @dev_addr: Physical address on DMA device side
  * @desc_blocks: Hardware descriptor blocks
  * @dblk_num: Number of hardware descriptor blocks
  * @desc_num: Number of hardware descriptors
@@ -91,7 +90,6 @@ struct xdma_desc {
        struct virt_dma_desc            vdesc;
        struct xdma_chan                *chan;
        enum dma_transfer_direction     dir;
-       u64                             dev_addr;
        struct xdma_desc_block          *desc_blocks;
        u32                             dblk_num;
        u32                             desc_num;