Commit 806f6649 authored by Marek Vasut's avatar Marek Vasut Committed by David S. Miller

net: ks8851: Remove ks8851_rdreg32()

The ks8851_rdreg32() is used only in one place, to read two registers
using a single read. To make it easier to support 16-bit accesses via
parallel bus later on, replace this single read with two 16-bit reads
from each of the registers and drop the ks8851_rdreg32() altogether.

If this has noticeable performance impact on the SPI variant of KS8851,
then we should consider using regmap to abstract the SPI and parallel
bus options and in case of SPI, permit regmap to merge register reads
of neighboring registers into single, longer, read.
Signed-off-by: default avatarMarek Vasut <marex@denx.de>
Cc: David S. Miller <davem@davemloft.net>
Cc: Lukas Wunner <lukas@wunner.de>
Cc: Petr Stetiar <ynezz@true.cz>
Cc: YueHaibing <yuehaibing@huawei.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2c5b0a86
...@@ -296,25 +296,6 @@ static unsigned ks8851_rdreg16(struct ks8851_net *ks, unsigned reg) ...@@ -296,25 +296,6 @@ static unsigned ks8851_rdreg16(struct ks8851_net *ks, unsigned reg)
return le16_to_cpu(rx); return le16_to_cpu(rx);
} }
/**
* ks8851_rdreg32 - read 32 bit register from device
* @ks: The chip information
* @reg: The register address
*
* Read a 32bit register from the chip.
*
* Note, this read requires the address be aligned to 4 bytes.
*/
static unsigned ks8851_rdreg32(struct ks8851_net *ks, unsigned reg)
{
__le32 rx = 0;
WARN_ON(reg & 3);
ks8851_rdreg(ks, MK_OP(0xf, reg), (u8 *)&rx, 4);
return le32_to_cpu(rx);
}
/** /**
* ks8851_soft_reset - issue one of the soft reset to the device * ks8851_soft_reset - issue one of the soft reset to the device
* @ks: The device state. * @ks: The device state.
...@@ -508,7 +489,6 @@ static void ks8851_rx_pkts(struct ks8851_net *ks) ...@@ -508,7 +489,6 @@ static void ks8851_rx_pkts(struct ks8851_net *ks)
unsigned rxfc; unsigned rxfc;
unsigned rxlen; unsigned rxlen;
unsigned rxstat; unsigned rxstat;
u32 rxh;
u8 *rxpkt; u8 *rxpkt;
rxfc = ks8851_rdreg8(ks, KS_RXFC); rxfc = ks8851_rdreg8(ks, KS_RXFC);
...@@ -527,9 +507,8 @@ static void ks8851_rx_pkts(struct ks8851_net *ks) ...@@ -527,9 +507,8 @@ static void ks8851_rx_pkts(struct ks8851_net *ks)
*/ */
for (; rxfc != 0; rxfc--) { for (; rxfc != 0; rxfc--) {
rxh = ks8851_rdreg32(ks, KS_RXFHSR); rxstat = ks8851_rdreg16(ks, KS_RXFHSR);
rxstat = rxh & 0xffff; rxlen = ks8851_rdreg16(ks, KS_RXFHBCR) & RXFHBCR_CNT_MASK;
rxlen = (rxh >> 16) & 0xfff;
netif_dbg(ks, rx_status, ks->netdev, netif_dbg(ks, rx_status, ks->netdev,
"rx: stat 0x%04x, len 0x%04x\n", rxstat, rxlen); "rx: stat 0x%04x, len 0x%04x\n", rxstat, rxlen);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment