From: Adrian Bunk <bunk@fs.tum.de>
To: Jochen Friedrich <jochen@scram.de>
Cc: linux-kernel@vger.kernel.org, linux-net@vger.kernel.or
Subject: [patch] fix compile warning and initialization of static tmsisa
Date: Fri, 6 Dec 2002 02:11:21 +0100 [thread overview]
Message-ID: <20021206011121.GY2544@fs.tum.de> (raw)
Hi Jochen,
as already discussed some months ago the patch below contains the
follosing fixes for the static compile of tmsisa:
- fixes a "`portlist' defined but not used" compile time warning by
moving portlist below an #ifdef MODULE
- call tms_isa_probe in Space.c for intialization
The patch compiles against 2.5.50 and applies against 2.4.20.
Please comment on whether it's correct or not and if it's correct
please apply.
TIA
Adrian
--- l/drivers/net/Space.c.old Mon Dec 17 00:44:29 2001
+++ l/drivers/net/Space.c Mon Dec 17 00:49:00 2001
@@ -540,6 +540,7 @@
#ifdef CONFIG_TR
/* Token-ring device probe */
extern int ibmtr_probe(struct net_device *);
+extern int tms_isa_probe(struct net_device *dev);
extern int smctr_probe(struct net_device *);
static int
@@ -548,6 +549,9 @@
if (1
#ifdef CONFIG_IBMTR
&& ibmtr_probe(dev)
+#endif
+#ifdef CONFIG_TMSISA
+ && tms_isa_probe(dev)
#endif
#ifdef CONFIG_SMCTR
&& smctr_probe(dev)
--- l/drivers/net/tokenring/tmsisa.c.old 2002-12-06 01:51:02.000000000 +0100
+++ l/drivers/net/tokenring/tmsisa.c 2002-12-06 01:54:58.000000000 +0100
@@ -39,12 +39,6 @@
#define TMS_ISA_IO_EXTENT 32
-/* A zero-terminated list of I/O addresses to be probed. */
-static unsigned int portlist[] __initdata = {
- 0x0A20, 0x1A20, 0x0B20, 0x1B20, 0x0980, 0x1980, 0x0900, 0x1900,// SK
- 0
-};
-
/* A zero-terminated list of IRQs to be probed.
* Used again after initial probe for sktr_chipset_init, called from sktr_open.
*/
@@ -367,6 +361,12 @@
#define ISATR_MAX_ADAPTERS 3
+/* A zero-terminated list of I/O addresses to be probed. */
+static unsigned int portlist[] __initdata = {
+ 0x0A20, 0x1A20, 0x0B20, 0x1B20, 0x0980, 0x1980, 0x0900, 0x1900,// SK
+ 0
+};
+
static int io[ISATR_MAX_ADAPTERS];
static int irq[ISATR_MAX_ADAPTERS];
static int dma[ISATR_MAX_ADAPTERS];
next reply other threads:[~2002-12-06 1:03 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2002-12-06 1:11 Adrian Bunk [this message]
2002-12-06 8:35 ` [patch] fix compile warning and initialization of static tmsisa Jochen Friedrich
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=20021206011121.GY2544@fs.tum.de \
--to=bunk@fs.tum.de \
--cc=jochen@scram.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-net@vger.kernel.or \
/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