| Message ID | f49dc04a87653e0155f4fab3e3eb584785c8ad6a.1722699555.git.lorenzo@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 63a796b4988c3dca83176a534890b510d44f105a |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net: airoha: honor reset return value in airoha_hw_init() | expand |
On Sat, Aug 03, 2024 at 05:50:50PM +0200, Lorenzo Bianconi wrote: > Take into account return value from reset_control_bulk_assert and > reset_control_bulk_deassert routines in airoha_hw_init(). > > Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> Reviewed-by: Simon Horman <horms@kernel.org>
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Sat, 3 Aug 2024 17:50:50 +0200 you wrote: > Take into account return value from reset_control_bulk_assert and > reset_control_bulk_deassert routines in airoha_hw_init(). > > Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> > --- > drivers/net/ethernet/mediatek/airoha_eth.c | 16 ++++++++++++---- > 1 file changed, 12 insertions(+), 4 deletions(-) Here is the summary with links: - [net-next] net: airoha: honor reset return value in airoha_hw_init() https://git.kernel.org/netdev/net-next/c/63a796b4988c You are awesome, thank you!
diff --git a/drivers/net/ethernet/mediatek/airoha_eth.c b/drivers/net/ethernet/mediatek/airoha_eth.c index db4267225fa4..1fb46db0c1e9 100644 --- a/drivers/net/ethernet/mediatek/airoha_eth.c +++ b/drivers/net/ethernet/mediatek/airoha_eth.c @@ -2071,13 +2071,21 @@ static int airoha_hw_init(struct platform_device *pdev, int err, i; /* disable xsi */ - reset_control_bulk_assert(ARRAY_SIZE(eth->xsi_rsts), eth->xsi_rsts); + err = reset_control_bulk_assert(ARRAY_SIZE(eth->xsi_rsts), + eth->xsi_rsts); + if (err) + return err; + + err = reset_control_bulk_assert(ARRAY_SIZE(eth->rsts), eth->rsts); + if (err) + return err; - reset_control_bulk_assert(ARRAY_SIZE(eth->rsts), eth->rsts); - msleep(20); - reset_control_bulk_deassert(ARRAY_SIZE(eth->rsts), eth->rsts); msleep(20); + err = reset_control_bulk_deassert(ARRAY_SIZE(eth->rsts), eth->rsts); + if (err) + return err; + msleep(20); err = airoha_fe_init(eth); if (err) return err;
Take into account return value from reset_control_bulk_assert and reset_control_bulk_deassert routines in airoha_hw_init(). Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> --- drivers/net/ethernet/mediatek/airoha_eth.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)