From: Finn Thain <fthain@telegraphics.com.au>
To: "David S. Miller" <davem@davemloft.net>
Cc: netdev@vger.kernel.org, linux-m68k@vger.kernel.org,
linux-kernel@vger.kernel.org,
Geert Uytterhoeven <geert@linux-m68k.org>
Subject: [PATCH net 2/4] net/macsonic: Drop redundant MACH_IS_MAC test
Date: Sat, 24 Feb 2018 18:27:25 -0500 (EST) [thread overview]
Message-ID: <855f562229a4738706e30bcf232c58f14912f37e.1519514463.git.fthain@telegraphics.com.au> (raw)
In-Reply-To: <cover.1519514463.git.fthain@telegraphics.com.au>
The MACH_IS_MAC test is redundant here because the platform device
won't get registered unless MACH_IS_MAC.
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
---
drivers/net/ethernet/natsemi/macsonic.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/net/ethernet/natsemi/macsonic.c b/drivers/net/ethernet/natsemi/macsonic.c
index c744912f55a9..f6745a893c82 100644
--- a/drivers/net/ethernet/natsemi/macsonic.c
+++ b/drivers/net/ethernet/natsemi/macsonic.c
@@ -311,9 +311,6 @@ static int mac_onboard_sonic_probe(struct net_device *dev)
int sr;
bool commslot = macintosh_config->expansion_type == MAC_EXP_PDS_COMM;
- if (!MACH_IS_MAC)
- return -ENODEV;
-
printk(KERN_INFO "Checking for internal Macintosh ethernet (SONIC).. ");
/* Bogus probing, on the models which may or may not have
--
2.16.1
next prev parent reply other threads:[~2018-02-24 23:27 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-24 23:27 [PATCH net 0/4] Fixes, cleanup and modernization for SONIC ethernet drivers Finn Thain
2018-02-24 23:27 ` [PATCH net 3/4] net/sonic: Clean up and modernize log messages Finn Thain
2018-02-24 23:27 ` [PATCH net 4/4] net/sonic: Replace custom debug logging with netif_* calls Finn Thain
2018-02-24 23:27 ` [PATCH net 1/4] net/macsonic: Convert to nubus_driver Finn Thain
2018-02-24 23:27 ` Finn Thain [this message]
2018-02-25 9:51 ` [PATCH net 2/4] net/macsonic: Drop redundant MACH_IS_MAC test Geert Uytterhoeven
2018-02-26 19:46 ` [PATCH net 0/4] Fixes, cleanup and modernization for SONIC ethernet drivers David Miller
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=855f562229a4738706e30bcf232c58f14912f37e.1519514463.git.fthain@telegraphics.com.au \
--to=fthain@telegraphics.com.au \
--cc=davem@davemloft.net \
--cc=geert@linux-m68k.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/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).