From: Oleksij Rempel <o.rempel@pengutronix.de>
To: Woojung Huh <woojung.huh@microchip.com>,
UNGLinuxDriver@microchip.com, Andrew Lunn <andrew@lunn.ch>,
Vivien Didelot <vivien.didelot@gmail.com>,
Florian Fainelli <f.fainelli@gmail.com>,
Vladimir Oltean <olteanv@gmail.com>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>
Cc: Oleksij Rempel <o.rempel@pengutronix.de>,
kernel@pengutronix.de, linux-kernel@vger.kernel.org,
netdev@vger.kernel.org
Subject: [PATCH net-next v4 06/17] net: dsa: microchip: ksz9477: add error handling to ksz9477_r/w_phy
Date: Fri, 26 Aug 2022 12:56:23 +0200 [thread overview]
Message-ID: <20220826105634.3855578-7-o.rempel@pengutronix.de> (raw)
In-Reply-To: <20220826105634.3855578-1-o.rempel@pengutronix.de>
Now ksz_pread/ksz_pwrite can return error value. So, make use of it.
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
---
drivers/net/dsa/microchip/ksz9477.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/net/dsa/microchip/ksz9477.c b/drivers/net/dsa/microchip/ksz9477.c
index a4f682d3e1fe6..f60ceaf25a66c 100644
--- a/drivers/net/dsa/microchip/ksz9477.c
+++ b/drivers/net/dsa/microchip/ksz9477.c
@@ -277,6 +277,7 @@ static void ksz9477_r_phy_quirks(struct ksz_device *dev, u16 addr, u16 reg,
int ksz9477_r_phy(struct ksz_device *dev, u16 addr, u16 reg, u16 *data)
{
u16 val = 0xffff;
+ int ret;
/* No real PHY after this. Simulate the PHY.
* A fixed PHY can be setup in the device tree, but this function is
@@ -317,7 +318,10 @@ int ksz9477_r_phy(struct ksz_device *dev, u16 addr, u16 reg, u16 *data)
break;
}
} else {
- ksz_pread16(dev, addr, 0x100 + (reg << 1), &val);
+ ret = ksz_pread16(dev, addr, 0x100 + (reg << 1), &val);
+ if (ret)
+ return ret;
+
ksz9477_r_phy_quirks(dev, addr, reg, &val);
}
@@ -334,11 +338,9 @@ int ksz9477_w_phy(struct ksz_device *dev, u16 addr, u16 reg, u16 val)
/* No gigabit support. Do not write to this register. */
if (!dev->info->gbit_capable[addr] && reg == MII_CTRL1000)
- return 0;
+ return -ENXIO;
- ksz_pwrite16(dev, addr, 0x100 + (reg << 1), val);
-
- return 0;
+ return ksz_pwrite16(dev, addr, 0x100 + (reg << 1), val);
}
void ksz9477_cfg_port_member(struct ksz_device *dev, int port, u8 member)
--
2.30.2
next prev parent reply other threads:[~2022-08-26 10:57 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-26 10:56 [PATCH net-next v3 00/17] net: dsa: microchip: add error handling and register access validation Oleksij Rempel
2022-08-26 10:56 ` [PATCH net-next v4 01/17] net: dsa: microchip: add separate struct ksz_chip_data for KSZ8563 chip Oleksij Rempel
2022-08-26 10:56 ` [PATCH net-next v4 02/17] net: dsa: microchip: do per-port Gbit detection instead of per-chip Oleksij Rempel
2022-08-26 10:56 ` [PATCH net-next v4 03/17] net: dsa: microchip: don't announce extended register support on non Gbit chips Oleksij Rempel
2022-08-26 10:56 ` [PATCH net-next v4 04/17] net: dsa: microchip: allow to pass return values for PHY read/write accesses Oleksij Rempel
2022-08-26 10:56 ` [PATCH net-next v4 05/17] net: dsa: microchip: forward error value on all ksz_pread/ksz_pwrite functions Oleksij Rempel
2022-08-26 10:56 ` Oleksij Rempel [this message]
2022-08-26 10:56 ` [PATCH net-next v4 07/17] net: dsa: microchip: ksz8795: add error handling to ksz8_r/w_phy Oleksij Rempel
2022-08-26 10:56 ` [PATCH net-next v4 08/17] net: dsa: microchip: KSZ9893: do not write to not supported Output Clock Control Register Oleksij Rempel
2022-08-26 10:56 ` [PATCH net-next v4 09/17] net: dsa: microchip: add support for regmap_access_tables Oleksij Rempel
2022-08-26 10:56 ` [PATCH net-next v4 10/17] net: dsa: microchip: add regmap_range for KSZ8563 chip Oleksij Rempel
2022-08-26 10:56 ` [PATCH net-next v4 11/17] net: dsa: microchip: ksz9477: remove MII_CTRL1000 check from ksz9477_w_phy() Oleksij Rempel
2022-08-26 10:56 ` [PATCH net-next v4 12/17] net: dsa: microchip: add regmap_range for KSZ9477 chip Oleksij Rempel
2022-08-26 10:56 ` [PATCH net-next v4 13/17] net: dsa: microchip: ksz9477: use internal_phy instead of phy_port_cnt Oleksij Rempel
2022-08-26 10:56 ` [PATCH net-next v4 14/17] net: dsa: microchip: remove unused port phy variable Oleksij Rempel
2022-08-26 10:56 ` [PATCH net-next v4 15/17] net: dsa: microchip: ksz9477: remove unused "on" variable Oleksij Rempel
2022-08-26 10:56 ` [PATCH net-next v4 16/17] net: dsa: microchip: remove unused sgmii variable Oleksij Rempel
2022-08-26 10:56 ` [PATCH net-next v4 17/17] net: dsa: microchip: remove IS_9893 flag Oleksij Rempel
2022-08-31 8:50 ` [PATCH net-next v3 00/17] net: dsa: microchip: add error handling and register access validation patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220826105634.3855578-7-o.rempel@pengutronix.de \
--to=o.rempel@pengutronix.de \
--cc=UNGLinuxDriver@microchip.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=f.fainelli@gmail.com \
--cc=kernel@pengutronix.de \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=olteanv@gmail.com \
--cc=pabeni@redhat.com \
--cc=vivien.didelot@gmail.com \
--cc=woojung.huh@microchip.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).