]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
net: dsa: microchip: simplify ksz_prmw8()
authorRasmus Villemoes <linux@rasmusvillemoes.dk>
Tue, 20 Jun 2023 11:38:52 +0000 (13:38 +0200)
committerJakub Kicinski <kuba@kernel.org>
Fri, 23 Jun 2023 02:48:37 +0000 (19:48 -0700)
Implement ksz_prmw8() in terms of ksz_rmw8(), just as all the other
ksz_pX are implemented in terms of ksz_X. No functional change.

Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Acked-by: Arun Ramadoss <arun.ramadoss@microchip.com>
Link: https://lore.kernel.org/r/20230620113855.733526-2-linux@rasmusvillemoes.dk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/dsa/microchip/ksz_common.h

index a66b56857ec6aa4efe8b4a5659f84159598844dd..2453c43c48a543cc3d5b0aed314d67fc0014600c 100644 (file)
@@ -578,17 +578,8 @@ static inline int ksz_pwrite32(struct ksz_device *dev, int port, int offset,
 static inline int ksz_prmw8(struct ksz_device *dev, int port, int offset,
                            u8 mask, u8 val)
 {
-       int ret;
-
-       ret = regmap_update_bits(ksz_regmap_8(dev),
-                                dev->dev_ops->get_port_addr(port, offset),
-                                mask, val);
-       if (ret)
-               dev_err(dev->dev, "can't rmw 8bit reg 0x%x: %pe\n",
-                       dev->dev_ops->get_port_addr(port, offset),
-                       ERR_PTR(ret));
-
-       return ret;
+       return ksz_rmw8(dev, dev->dev_ops->get_port_addr(port, offset),
+                       mask, val);
 }
 
 static inline void ksz_regmap_lock(void *__mtx)