[PATCH net-next v1 03/10] net: dsa: microchip: forward error value on all ksz_pread/ksz_pwrite functions

Oleksij Rempel
2022-07-29T13:04:15Z

ksz_read*/ksz_write* are able to return errors, so forward it.

Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
---
drivers/net/dsa/microchip/ksz_common.h | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/drivers/net/dsa/microchip/ksz_common.h b/drivers/net/dsa/microchip/ksz_common.h
index a06b9bf5938b..3a64a444fa26 100644
--- a/drivers/net/dsa/microchip/ksz_common.h
+++ b/drivers/net/dsa/microchip/ksz_common.h
@@ -390,40 +390,42 @@ static inline int ksz_write64(struct ksz_device *dev, u32 reg, u64 value)
return regmap_bulk_write(dev->regmap[2], reg, val, 2);
}

-static inline void ksz_pread8(struct ksz_device *dev, int port, int offset,
+static inline int ksz_pread8(struct ksz_device *dev, int port, int offset,
u8 *data)
{
- ksz_read8(dev, dev->dev_ops->get_port_addr(port, offset), data);
+ return ksz_read8(dev, dev->dev_ops->get_port_addr(port, offset), data);
}

-static inline void ksz_pread16(struct ksz_device *dev, int port, int offset,
+static inline int ksz_pread16(struct ksz_device *dev, int port, int offset,
u16 *data)
{
- ksz_read16(dev, dev->dev_ops->get_port_addr(port, offset), data);
+ return ksz_read16(dev, dev->dev_ops->get_port_addr(port, offset), data);
}

-static inline void ksz_pread32(struct ksz_device *dev, int port, int offset,
+static inline int ksz_pread32(struct ksz_device *dev, int port, int offset,
u32 *data)
{
- ksz_read32(dev, dev->dev_ops->get_port_addr(port, offset), data);
+ return ksz_read32(dev, dev->dev_ops->get_port_addr(port, offset), data);
}

-static inline void ksz_pwrite8(struct ksz_device *dev, int port, int offset,
+static inline int ksz_pwrite8(struct ksz_device *dev, int port, int offset,
u8 data)
{
- ksz_write8(dev, dev->dev_ops->get_port_addr(port, offset), data);
+ return ksz_write8(dev, dev->dev_ops->get_port_addr(port, offset), data);
}

-static inline void ksz_pwrite16(struct ksz_device *dev, int port, int offset,
+static inline int ksz_pwrite16(struct ksz_device *dev, int port, int offset,
u16 data)
{
- ksz_write16(dev, dev->dev_ops->get_port_addr(port, offset), data);
+ return ksz_write16(dev, dev->dev_ops->get_port_addr(port, offset),
+ data);
}

-static inline void ksz_pwrite32(struct ksz_device *dev, int port, int offset,
+static inline int ksz_pwrite32(struct ksz_device *dev, int port, int offset,
u32 data)
{
- ksz_write32(dev, dev->dev_ops->get_port_addr(port, offset), data);
+ return ksz_write32(dev, dev->dev_ops->get_port_addr(port, offset),
+ data);
}

static inline void ksz_prmw8(struct ksz_device *dev, int port, int offset,
--
2.30.2