From: Philipp Hortmann Date: Sun, 11 Sep 2022 10:47:15 +0000 (+0200) Subject: staging: vt6655: Cleanup and rename function MACvSetCurrTXDescAddr X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8bd2a9f16f6f3891c7e9c1affdd98aff4bfd6a2b;p=linux.git staging: vt6655: Cleanup and rename function MACvSetCurrTXDescAddr Rename function MACvSetCurrTXDescAddr to vt6655_mac_set_curr_tx_desc_addr and iTxType to tx_type to avoid CamelCase which is not accepted by checkpatch.pl. Remove unnecessary line break. Signed-off-by: Philipp Hortmann Link: https://lore.kernel.org/r/88dcbac76f6bad8b4eb68a3cb37cd4f9684294a0.1662890990.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index d137b4b45e3b7..c680925b9c92c 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -409,9 +409,9 @@ void CARDvSafeResetTx(struct vnt_private *priv) } /* set MAC TD pointer */ - MACvSetCurrTXDescAddr(TYPE_TXDMA0, priv, priv->td0_pool_dma); + vt6655_mac_set_curr_tx_desc_addr(TYPE_TXDMA0, priv, priv->td0_pool_dma); - MACvSetCurrTXDescAddr(TYPE_AC0DMA, priv, priv->td1_pool_dma); + vt6655_mac_set_curr_tx_desc_addr(TYPE_AC0DMA, priv, priv->td1_pool_dma); /* set MAC Beacon TX pointer */ iowrite32((u32)priv->tx_beacon_dma, priv->port_offset + MAC_REG_BCNDMAPTR); diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c index d6614be79e394..0ff98468b2e08 100644 --- a/drivers/staging/vt6655/mac.c +++ b/drivers/staging/vt6655/mac.c @@ -653,12 +653,11 @@ void MACvSetCurrAC0DescAddrEx(struct vnt_private *priv, iowrite8(DMACTL_RUN, io_base + MAC_REG_AC0DMACTL); } -void MACvSetCurrTXDescAddr(int iTxType, struct vnt_private *priv, - u32 curr_desc_addr) +void vt6655_mac_set_curr_tx_desc_addr(int tx_type, struct vnt_private *priv, u32 curr_desc_addr) { - if (iTxType == TYPE_AC0DMA) + if (tx_type == TYPE_AC0DMA) MACvSetCurrAC0DescAddrEx(priv, curr_desc_addr); - else if (iTxType == TYPE_TXDMA0) + else if (tx_type == TYPE_TXDMA0) MACvSetCurrTx0DescAddrEx(priv, curr_desc_addr); } diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index fff9dc72e2c07..0224f710d6036 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -558,8 +558,7 @@ bool MACbShutdown(struct vnt_private *priv); void MACvInitialize(struct vnt_private *priv); void vt6655_mac_set_curr_rx_0_desc_addr(struct vnt_private *priv, u32 curr_desc_addr); void vt6655_mac_set_curr_rx_1_desc_addr(struct vnt_private *priv, u32 curr_desc_addr); -void MACvSetCurrTXDescAddr(int iTxType, struct vnt_private *priv, - u32 curr_desc_addr); +void vt6655_mac_set_curr_tx_desc_addr(int tx_type, struct vnt_private *priv, u32 curr_desc_addr); void MACvSetCurrTx0DescAddrEx(struct vnt_private *priv, u32 curr_desc_addr); void MACvSetCurrAC0DescAddrEx(struct vnt_private *priv,