From: Russell King <rmk@arm.linux.org.uk>
To: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: linux-kernel@vger.kernel.org
Subject: Patch: minor cleanup to floppy.c (3/3)
Date: Sun, 14 Oct 2001 20:31:07 +0100 [thread overview]
Message-ID: <20011014203107.H32145@flint.arm.linux.org.uk> (raw)
Alan,
Here's the final part of the cleanup - we remove the useless FDC2
declarations from the various architecture header files, as well
as some speeling mistaks. 8)
It depends on the first patch being applied.
--- orig/include/asm-m68k/floppy.h Sun Oct 14 20:23:49 2001
+++ linux/include/asm-m68k/floppy.h Sun Oct 14 20:23:30 2001
@@ -36,8 +36,6 @@
/* basically PC init + set use_virtual_dma */
#define FDC1 m68k_floppy_init()
-static int FDC2 = -1;
-
#define N_FDC 1
#define N_DRIVE 8
--- orig/include/asm-mips/floppy.h Sun Oct 14 20:23:49 2001
+++ linux/include/asm-mips/floppy.h Sun Oct 14 20:23:30 2001
@@ -79,14 +79,6 @@
#define FDC1 fd_ops->fd_getfdaddr1();
-/*
- * Hack: The floppy drivrer defines this, before including fdreg.h. We use
- * to define FDC2 only one and keep it a static variable in floppy.c.
- */
-#ifdef FDPATCHES
-static int FDC2 = -1;
-#endif
-
#define N_FDC 1 /* do you *really* want a second controller? */
#define N_DRIVE 8
--- orig/include/asm-mips64/floppy.h Sun Oct 14 20:23:49 2001
+++ linux/include/asm-mips64/floppy.h Sun Oct 14 20:23:30 2001
@@ -77,14 +77,6 @@
#define FDC1 fd_ops->fd_getfdaddr1();
-/*
- * Hack: The floppy drivrer defines this, before including fdreg.h. We use
- * to define FDC2 only one and keep it a static variable in floppy.c.
- */
-#ifdef FDPATCHES
-static int FDC2=-1;
-#endif
-
#define N_FDC 1 /* do you *really* want a second controller? */
#define N_DRIVE 8
--- orig/include/asm-sparc/floppy.h Sun Oct 14 20:23:49 2001
+++ linux/include/asm-sparc/floppy.h Sun Oct 14 20:23:30 2001
@@ -96,8 +96,6 @@
*/
#define FDC1 sun_floppy_init()
-static int FDC2=-1;
-
#define N_FDC 1
#define N_DRIVE 8
--- orig/include/asm-sparc64/floppy.h Sun Oct 14 20:23:50 2001
+++ linux/include/asm-sparc64/floppy.h Sun Oct 14 20:23:30 2001
@@ -104,7 +104,6 @@
#define FLOPPY1_TYPE sun_floppy_types[1]
#define FDC1 ((unsigned long)sun_fdc)
-static int FDC2 = -1;
#define N_FDC 1
#define N_DRIVE 8
--
Russell King (rmk@arm.linux.org.uk) The developer of ARM Linux
http://www.arm.linux.org.uk/personal/aboutme.html
reply other threads:[~2001-10-14 19:31 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20011014203107.H32145@flint.arm.linux.org.uk \
--to=rmk@arm.linux.org.uk \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=linux-kernel@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