diff options
| author | Ben Hutchings <ben.hutchings@mind.be> | 2021-08-10 00:59:12 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-08-10 09:58:14 +0100 |
| commit | c34f674c8875235725c3ef86147a627f165d23b4 (patch) | |
| tree | e075cfa2820412a4f22865f06f1602d7dcfb6e8f /drivers | |
| parent | 31782a01d14f04bcdd5414861e806937a1db21c4 (diff) | |
| download | linux-c34f674c8875235725c3ef86147a627f165d23b4.tar.bz2 | |
net: dsa: microchip: Fix ksz_read64()
ksz_read64() currently does some dubious byte-swapping on the two
halves of a 64-bit register, and then only returns the high bits.
Replace this with a straightforward expression.
Fixes: e66f840c08a2 ("net: dsa: ksz: Add Microchip KSZ8795 DSA driver")
Signed-off-by: Ben Hutchings <ben.hutchings@mind.be>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/dsa/microchip/ksz_common.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/dsa/microchip/ksz_common.h b/drivers/net/dsa/microchip/ksz_common.h index 2e6bfd333f50..6afbb41ad39e 100644 --- a/drivers/net/dsa/microchip/ksz_common.h +++ b/drivers/net/dsa/microchip/ksz_common.h @@ -205,12 +205,8 @@ static inline int ksz_read64(struct ksz_device *dev, u32 reg, u64 *val) int ret; ret = regmap_bulk_read(dev->regmap[2], reg, value, 2); - if (!ret) { - /* Ick! ToDo: Add 64bit R/W to regmap on 32bit systems */ - value[0] = swab32(value[0]); - value[1] = swab32(value[1]); - *val = swab64((u64)*value); - } + if (!ret) + *val = (u64)value[0] << 32 | value[1]; return ret; } |