Drop the redeclaration of 'rc' & 'ret' due to the merge error to fix
below building error:
drivers/net/ethernet/xilinx/xilinx_emaclite.c:808:13: error : redeclaration of 
'rc' with no linkage
|   808 |         int rc, ret;
|       |             ^~

Signed-off-by: Xulin Sun <[email protected]>
---
 drivers/net/ethernet/xilinx/xilinx_emaclite.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c 
b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
index ba5c40ad89b5..8fc4cf9a358c 100644
--- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c
+++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
@@ -801,7 +801,6 @@ static int xemaclite_mdio_write(struct mii_bus *bus, int 
phy_id, int reg,
 static int xemaclite_mdio_setup(struct net_local *lp, struct device *dev)
 {
        struct mii_bus *bus;
-       int rc, ret;
        struct resource res;
        struct device_node *np = of_get_parent(lp->phy_node);
        struct device_node *npp;
-- 
2.36.0

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#11340): 
https://lists.yoctoproject.org/g/linux-yocto/message/11340
Mute This Topic: https://lists.yoctoproject.org/mt/91421875/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to