diff options
| author |   Marek Vasut <marex@denx.de> | 2020-05-29 00:21:36 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-05-28 16:30:04 -0700 |
| commit | aa39bf6730b72e495f711b0f06ca92e9673d648c (patch) | |
| tree | dd134689d12a7edea73ac8b7336869e9fc83261d /drivers/net/ethernet/micrel/ks8851.c | |
| parent | net: ks8851: Use 16-bit writes to program MAC address (diff) | |
| download | linux-dev-aa39bf6730b72e495f711b0f06ca92e9673d648c.tar.xz linux-dev-aa39bf6730b72e495f711b0f06ca92e9673d648c.zip | |
net: ks8851: Use 16-bit read of RXFC register
The RXFC register is the only one being read using 8-bit accessors.
To make it easier to support the 16-bit accesses used by the parallel
bus variant of KS8851, use 16-bit accessor to read RXFC register as
well as neighboring RXFCTR register.
Remove ks8851_rdreg8() as it is not used anywhere anymore.
There should be no functional change.
Signed-off-by: Marek 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: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ethernet/micrel/ks8851.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/drivers/net/ethernet/micrel/ks8851.c b/drivers/net/ethernet/micrel/ks8851.c index 1b81340e811f..e2e75041e931 100644 --- a/drivers/net/ethernet/micrel/ks8851.c +++ b/drivers/net/ethernet/micrel/ks8851.c @@ -237,21 +237,6 @@ static void ks8851_rdreg(struct ks8851_net *ks, unsigned op, } /** - * ks8851_rdreg8 - read 8 bit register from device - * @ks: The chip information - * @reg: The register address - * - * Read a 8bit register from the chip, returning the result -*/ -static unsigned ks8851_rdreg8(struct ks8851_net *ks, unsigned reg) -{ - u8 rxb[1]; - - ks8851_rdreg(ks, MK_OP(1 << (reg & 3), reg), rxb, 1); - return rxb[0]; -} - -/** * ks8851_rdreg16 - read 16 bit register from device * @ks: The chip information * @reg: The register address @@ -470,7 +455,7 @@ static void ks8851_rx_pkts(struct ks8851_net *ks) unsigned rxstat; u8 *rxpkt; - rxfc = ks8851_rdreg8(ks, KS_RXFC); + rxfc = (ks8851_rdreg16(ks, KS_RXFCTR) >> 8) & 0xff; netif_dbg(ks, rx_status, ks->netdev, "%s: %d packets\n", __func__, rxfc); |