]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: ethernet: cs89x0: remove stale CONFIG_MACH_MX31ADS reference
authorEthan Nelson-Moore <enelsonmoore@gmail.com>
Sat, 9 May 2026 02:37:28 +0000 (19:37 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 1 Jun 2026 15:46:28 +0000 (17:46 +0200)
[ Upstream commit 36a8d04a8293afcb9304cf0cd3741f67698f2a1a ]

The legacy ARM board file for MACH_MX31ADS was removed in commit
c93197b0041d ("ARM: imx: Remove i.MX31 board files"), but a reference
to it remained in the cs89x0 driver. Drop this unused code.

Signed-off-by: Ethan Nelson-Moore <enelsonmoore@gmail.com>
Fixes: c93197b0041d ("ARM: imx: Remove i.MX31 board files")
Link: https://patch.msgid.link/20260509023732.42256-1-enelsonmoore@gmail.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/ethernet/cirrus/cs89x0.c

index 0a21a10a791c5b3a71355b4171817a5eb01886f3..6b01c44a5f7285793da0765e4c77fc07c18c1d13 100644 (file)
@@ -1271,7 +1271,6 @@ static const struct net_device_ops net_ops = {
 
 static void __init reset_chip(struct net_device *dev)
 {
-#if !defined(CONFIG_MACH_MX31ADS)
        struct net_local *lp = netdev_priv(dev);
        unsigned long reset_start_time;
 
@@ -1298,7 +1297,6 @@ static void __init reset_chip(struct net_device *dev)
        while ((readreg(dev, PP_SelfST) & INIT_DONE) == 0 &&
               time_before(jiffies, reset_start_time + 2))
                ;
-#endif /* !CONFIG_MACH_MX31ADS */
 }
 
 /* This is the real probe routine.