From: Joe Perches <joe@perches.com>
To: Stephen Hemminger <shemminger@vyatta.com>
Cc: LKML <linux-kernel@vger.kernel.org>,
Marcin Slusarz <marcin.slusarz@gmail.com>
Subject: [PATCH 11/13] drivers/block/floppy.c: Add function is_ready_state
Date: Tue, 1 Dec 2009 22:07:51 -0800 [thread overview]
Message-ID: <7ab46de8d857b9bb5c91ea759b65a7ae5bcce870.1259733457.git.joe@perches.com> (raw)
In-Reply-To: <cover.1259733456.git.joe@perches.com>
Used a couple of times, might simplify the code a bit.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/block/floppy.c | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 4a9cb15..e054fae 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -1307,6 +1307,12 @@ static inline int is_selected(int dor, int unit)
return ((dor & (0x10 << unit)) && (dor & 3) == unit);
}
+static bool is_ready_state(int status)
+{
+ int state = status & (STATUS_READY | STATUS_DIR | STATUS_DMA);
+ return state == STATUS_READY;
+}
+
static int set_dor(int fdc, char mask, char data)
{
unsigned char unit;
@@ -1348,8 +1354,10 @@ static void twaddle(void)
DRS->select_date = jiffies;
}
-/* reset all driver information about the current fdc. This is needed after
- * a reset, and after a raw command. */
+/*
+ * Reset all driver information about the current fdc.
+ * This is needed after a reset, and after a raw command.
+ */
static void reset_fdc_info(int mode)
{
int drive;
@@ -1688,7 +1696,7 @@ static int output_byte(char byte)
if (status < 0)
return -1;
- if ((status & (STATUS_READY | STATUS_DIR | STATUS_DMA)) == STATUS_READY) {
+ if (is_ready_state(status)) {
fd_outb(byte, FD_DATA);
#ifdef FLOPPY_SANITY_CHECK
output_log[output_log_pos].data = byte;
@@ -1748,8 +1756,10 @@ static int need_more_output(void)
if (status < 0)
return -1;
- if ((status & (STATUS_READY | STATUS_DIR | STATUS_DMA)) == STATUS_READY)
+
+ if (is_ready_state(status))
return MORE_OUTPUT;
+
return result();
}
--
1.6.6.rc0.57.gad7a
next prev parent reply other threads:[~2009-12-02 6:07 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-02 6:07 [PATCH 00/13] drivers/block/floppy.c: More cleanups Joe Perches
2009-12-02 6:07 ` [PATCH 01/13] drivers/block/floppy.c: Remove macro LOCK_FDC Joe Perches
2009-12-02 6:07 ` [PATCH 02/13] drivers/block/floppy.c: Add debug_dcl(...) macro Joe Perches
2009-12-02 6:07 ` [PATCH 03/13] drivers/block/floppy.c: Remove [U]CLEARF, [U]SETF, and [U]TESTF macros Joe Perches
2009-12-02 6:07 ` [PATCH 04/13] drivers/block/floppy.c: Remove most uses of CALL and ECALL macros Joe Perches
2009-12-02 6:07 ` [PATCH 05/13] drivers/block/floppy.c: remove [_]COPYIN [_]COPYOUT " Joe Perches
2009-12-02 6:07 ` [PATCH 06/13] drivers/block/floppy.c: remove macros CALL, WAIT and IWAIT Joe Perches
2009-12-02 6:07 ` [PATCH 07/13] drivers/block/floppy.c: convert int 1/0 to bool true/false Joe Perches
2009-12-02 6:07 ` [PATCH 08/13] drivers/block/floppy.c: Move leading && and || to preceding line Joe Perches
2009-12-02 6:07 ` [PATCH 09/13] drivers/block/floppy.c: remove #define DEVICE_NAME "floppy" Joe Perches
2009-12-02 6:07 ` [PATCH 10/13] drivers/block/floppy.c: Convert int initialising to bool initialized Joe Perches
2009-12-02 6:07 ` Joe Perches [this message]
2009-12-02 6:07 ` [PATCH 12/13] drivers/block/floppy.c: Readd SunOS eject cmd comment Joe Perches
2009-12-02 6:07 ` [PATCH 13/13] drivers/block/floppy.c: Remove unnecessary return and braces Joe Perches
2009-12-02 17:05 ` [PATCH 00/13] drivers/block/floppy.c: More cleanups Marcin Slusarz
2009-12-02 19:03 ` Stephen Hemminger
2009-12-02 20:05 ` Joe Perches
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=7ab46de8d857b9bb5c91ea759b65a7ae5bcce870.1259733457.git.joe@perches.com \
--to=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=marcin.slusarz@gmail.com \
--cc=shemminger@vyatta.com \
/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
all inboxes | Powered by JetHome®