Commit 79a4f4df authored by Baruch Siach's avatar Baruch Siach Committed by Paolo Abeni
Browse files

net: stmmac: reduce dma ring display code duplication 



The code to show extended descriptor is identical to normal one.
Consolidate the code to remove duplication.

Signed-off-by: default avatarBaruch Siach <baruch@tkos.co.il>
Link: https://lore.kernel.org/r/a2a5c5ce9338bdea60ec71d7eeb00fe757281557.1700372381.git.baruch@tkos.co.il


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 7911deba

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

+11 −17
Original line number Diff line number Diff line
@@ -6180,31 +6180,25 @@ static struct dentry *stmmac_fs_dir; 
static void sysfs_display_ring(void *head, int size, int extend_desc,

			       struct seq_file *seq, dma_addr_t dma_phy_addr)

{

	int i;

	struct dma_extended_desc *ep = (struct dma_extended_desc *)head;

	struct dma_desc *p = (struct dma_desc *)head;

	unsigned int desc_size;

	dma_addr_t dma_addr;

	int i;



	desc_size = extend_desc ? sizeof(*ep) : sizeof(*p);

	for (i = 0; i < size; i++) {

		if (extend_desc) {

			dma_addr = dma_phy_addr + i * sizeof(*ep);

			seq_printf(seq, "%d [%pad]: 0x%x 0x%x 0x%x 0x%x\n",

				   i, &dma_addr,

				   le32_to_cpu(ep->basic.des0),

				   le32_to_cpu(ep->basic.des1),

				   le32_to_cpu(ep->basic.des2),

				   le32_to_cpu(ep->basic.des3));

			ep++;

		} else {

			dma_addr = dma_phy_addr + i * sizeof(*p);

		dma_addr = dma_phy_addr + i * desc_size;

		seq_printf(seq, "%d [%pad]: 0x%x 0x%x 0x%x 0x%x\n",

				i, &dma_addr,

				le32_to_cpu(p->des0), le32_to_cpu(p->des1),

				le32_to_cpu(p->des2), le32_to_cpu(p->des3));

		if (extend_desc)

			p = &(++ep)->basic;

		else

			p++;

	}

}

}



static int stmmac_rings_status_show(struct seq_file *seq, void *v)

{