Commit e991d0ed authored by Vincent Whitchurch's avatar Vincent Whitchurch Committed by David S. Miller
Browse files

net: stmmac: remove unused get_addr() callback 



The last caller of the stmmac_desc_ops::get_addr() callback was removed
a while ago, so remove the unused callback.

Note that the callback also only gets half the descriptor address on
systems with 64-bit descriptor addresses, so that should be fixed if it
needs to be resurrected later.

Fixes: ec222003 ("net: stmmac: Prepare to add Split Header support")
Signed-off-by: default avatarVincent Whitchurch <vincent.whitchurch@axis.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 86d282ac

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

+0 −6
Original line number Diff line number Diff line
@@ -462,11 +462,6 @@ static void dwmac4_set_mss_ctxt(struct dma_desc *p, unsigned int mss) 
	p->des3 = cpu_to_le32(TDES3_CONTEXT_TYPE | TDES3_CTXT_TCMSSV);

}



static void dwmac4_get_addr(struct dma_desc *p, unsigned int *addr)

{

	*addr = le32_to_cpu(p->des0);

}



static void dwmac4_set_addr(struct dma_desc *p, dma_addr_t addr)

{

	p->des0 = cpu_to_le32(lower_32_bits(addr));
@@ -575,7 +570,6 @@ const struct stmmac_desc_ops dwmac4_desc_ops = { 
	.init_tx_desc = dwmac4_rd_init_tx_desc,

	.display_ring = dwmac4_display_ring,

	.set_mss = dwmac4_set_mss_ctxt,

	.get_addr = dwmac4_get_addr,

	.set_addr = dwmac4_set_addr,

	.clear = dwmac4_clear,

	.set_sarc = dwmac4_set_sarc,

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

+0 −6
Original line number Diff line number Diff line
@@ -239,11 +239,6 @@ static void dwxgmac2_set_mss(struct dma_desc *p, unsigned int mss) 
	p->des3 = cpu_to_le32(XGMAC_TDES3_CTXT | XGMAC_TDES3_TCMSSV);

}



static void dwxgmac2_get_addr(struct dma_desc *p, unsigned int *addr)

{

	*addr = le32_to_cpu(p->des0);

}



static void dwxgmac2_set_addr(struct dma_desc *p, dma_addr_t addr)

{

	p->des0 = cpu_to_le32(lower_32_bits(addr));
@@ -366,7 +361,6 @@ const struct stmmac_desc_ops dwxgmac210_desc_ops = { 
	.init_rx_desc = dwxgmac2_init_rx_desc,

	.init_tx_desc = dwxgmac2_init_tx_desc,

	.set_mss = dwxgmac2_set_mss,

	.get_addr = dwxgmac2_get_addr,

	.set_addr = dwxgmac2_set_addr,

	.clear = dwxgmac2_clear,

	.get_rx_hash = dwxgmac2_get_rx_hash,

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

+0 −6
Original line number Diff line number Diff line
@@ -440,11 +440,6 @@ static void enh_desc_display_ring(void *head, unsigned int size, bool rx, 
	pr_info("\n");

}



static void enh_desc_get_addr(struct dma_desc *p, unsigned int *addr)

{

	*addr = le32_to_cpu(p->des2);

}



static void enh_desc_set_addr(struct dma_desc *p, dma_addr_t addr)

{

	p->des2 = cpu_to_le32(addr);
@@ -475,7 +470,6 @@ const struct stmmac_desc_ops enh_desc_ops = { 
	.get_timestamp = enh_desc_get_timestamp,

	.get_rx_timestamp_status = enh_desc_get_rx_timestamp_status,

	.display_ring = enh_desc_display_ring,

	.get_addr = enh_desc_get_addr,

	.set_addr = enh_desc_set_addr,

	.clear = enh_desc_clear,

};

drivers/net/ethernet/stmicro/stmmac/hwif.h

+0 −4
Original line number Diff line number Diff line
@@ -82,8 +82,6 @@ struct stmmac_desc_ops { 
			     dma_addr_t dma_rx_phy, unsigned int desc_size);

	/* set MSS via context descriptor */

	void (*set_mss)(struct dma_desc *p, unsigned int mss);

	/* get descriptor skbuff address */

	void (*get_addr)(struct dma_desc *p, unsigned int *addr);

	/* set descriptor skbuff address */

	void (*set_addr)(struct dma_desc *p, dma_addr_t addr);

	/* clear descriptor */
@@ -142,8 +140,6 @@ struct stmmac_desc_ops { 
	stmmac_do_void_callback(__priv, desc, display_ring, __args)

#define stmmac_set_mss(__priv, __args...) \

	stmmac_do_void_callback(__priv, desc, set_mss, __args)

#define stmmac_get_desc_addr(__priv, __args...) \

	stmmac_do_void_callback(__priv, desc, get_addr, __args)

#define stmmac_set_desc_addr(__priv, __args...) \

	stmmac_do_void_callback(__priv, desc, set_addr, __args)

#define stmmac_clear_desc(__priv, __args...) \

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

+0 −6
Original line number Diff line number Diff line
@@ -292,11 +292,6 @@ static void ndesc_display_ring(void *head, unsigned int size, bool rx, 
	pr_info("\n");

}



static void ndesc_get_addr(struct dma_desc *p, unsigned int *addr)

{

	*addr = le32_to_cpu(p->des2);

}



static void ndesc_set_addr(struct dma_desc *p, dma_addr_t addr)

{

	p->des2 = cpu_to_le32(addr);
@@ -326,7 +321,6 @@ const struct stmmac_desc_ops ndesc_ops = { 
	.get_timestamp = ndesc_get_timestamp,

	.get_rx_timestamp_status = ndesc_get_rx_timestamp_status,

	.display_ring = ndesc_display_ring,

	.get_addr = ndesc_get_addr,

	.set_addr = ndesc_set_addr,

	.clear = ndesc_clear,

};