mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Joe Perches <joe@perches.com>
To: linux-kernel@vger.kernel.org
Cc: Marcin Slusarz <marcin.slusarz@gmail.com>,
	Stephen Hemminger <shemminger@vyatta.com>,
	Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>,
	Andrew Morton <akpm@linux-foundation.org>
Subject: [PATCH 18/24] drivers/block/floppy.c: remove macros CALL, WAIT and IWAIT
Date: Thu, 21 Jan 2010 20:52:48 -0800	[thread overview]
Message-ID: <ede2cfe4c04a8c75df5703f4082cd6cb69d66dd3.1264133863.git.joe@perches.com> (raw)
In-Reply-To: <cover.1264133863.git.joe@perches.com>

Obfuscating macros with embedded returns are not nice

Signed-off-by: Joe Perches <joe@perches.com>
---
 drivers/block/floppy.c |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index a1eb5fe..de5dc29 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -519,10 +519,6 @@ static DECLARE_WAIT_QUEUE_HEAD(fdc_wait);
 static DECLARE_WAIT_QUEUE_HEAD(command_done);
 
 #define NO_SIGNAL (!interruptible || !signal_pending(current))
-#define CALL(x)		if ((x) == -EINTR) return -EINTR
-#define _WAIT(x,i)	CALL(ret=wait_til_done((x),i))
-#define WAIT(x)		_WAIT((x),interruptible)
-#define IWAIT(x)	_WAIT((x),1)
 
 /* Errors during formatting are counted here. */
 static int format_errors;
@@ -2268,7 +2264,9 @@ static int do_format(int drive, struct format_descr *tmp_format_req)
 	format_errors = 0;
 	cont = &format_cont;
 	errors = &format_errors;
-	IWAIT(redo_format);
+	ret = wait_til_done(redo_format, 1);
+	if (ret == -EINTR)
+		return -EINTR;
 	process_fd_request();
 	return ret;
 }
@@ -2996,8 +2994,6 @@ static struct cont_t poll_cont = {
 
 static int poll_drive(int interruptible, int flag)
 {
-	int ret;
-
 	/* no auto-sense, just clear dcl */
 	raw_cmd = &default_raw_cmd;
 	raw_cmd->flags = flag;
@@ -3006,8 +3002,8 @@ static int poll_drive(int interruptible, int flag)
 	cont = &poll_cont;
 	debug_dcl(DP->flags, "setting NEWCHANGE in poll_drive\n");
 	set_bit(FD_DISK_NEWCHANGE_BIT, &DRS->flags);
-	WAIT(floppy_ready);
-	return ret;
+
+	return wait_til_done(floppy_ready, interruptible);
 }
 
 /*
@@ -3038,7 +3034,9 @@ static int user_reset_fdc(int drive, int arg, int interruptible)
 		FDCS->reset = 1;
 	if (FDCS->reset) {
 		cont = &reset_cont;
-		WAIT(reset_fdc);
+		ret = wait_til_done(reset_fdc, interruptible);
+		if (ret == -EINTR)
+			return -EINTR;
 	}
 	process_fd_request();
 	return 0;
-- 
1.6.6.rc0.57.gad7a


  parent reply	other threads:[~2010-01-22  4:56 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-01-22  4:52 [PATCH 00/24] drivers/block/floppy.c cleanups Joe Perches
2010-01-22  4:52 ` [PATCH 01/24] drivers/block/floppy.c: Convert some #include <asm/ to #include <linux/ Joe Perches
2010-01-22  4:52 ` [PATCH 02/24] drivers/block/floppy.c: #define space and column neatening Joe Perches
2010-01-22  4:52 ` [PATCH 03/24] drivers/block/floppy.c: Use pr_<level> Joe Perches
2010-01-22  4:52 ` [PATCH 04/24] drivers/block/floppy.c: Remove unnecessary braces Joe Perches
2010-01-22  4:52 ` [PATCH 05/24] drivers/block/floppy.c: Remove used once CHECK_READY macro Joe Perches
2010-01-22  4:52 ` [PATCH 06/24] drivers/block/floppy.c: Hoist assigns from if()s, neatening Joe Perches
2010-01-22  4:52 ` [PATCH 07/24] drivers/block/floppy.c: Remove LAST_OUT macro Joe Perches
2010-01-22  4:52 ` [PATCH 08/24] drivers/block/floppy.c: Comment neatening and remove naked ; Joe Perches
2010-01-22  4:52 ` [PATCH 09/24] drivers/block/floppy.c: Remove CLEARSTRUCT macro, use memset Joe Perches
2010-01-22  4:52 ` [PATCH 10/24] drivers/block/floppy.c: Indent a comment Joe Perches
2010-01-22  4:52 ` [PATCH 11/24] drivers/block/floppy.c: Remove IN/OUT macros, indent switch/case Joe Perches
2010-01-22  4:52 ` [PATCH 12/24] drivers/block/floppy.c: Remove a few spaces from function casts Joe Perches
2010-01-22  4:52 ` [PATCH 13/24] drivers/block/floppy.c: Remove macro LOCK_FDC Joe Perches
2010-01-22  4:52 ` [PATCH 14/24] drivers/block/floppy.c: Add debug_dcl(...) macro Joe Perches
2010-01-22  4:52 ` [PATCH 15/24] drivers/block/floppy.c: Remove [U]CLEARF, [U]SETF, and [U]TESTF macros Joe Perches
2010-01-22  4:52 ` [PATCH 16/24] drivers/block/floppy.c: Remove most uses of CALL and ECALL macros Joe Perches
2010-01-22  4:52 ` [PATCH 17/24] drivers/block/floppy.c: remove [_]COPYIN [_]COPYOUT " Joe Perches
2010-01-22  4:52 ` Joe Perches [this message]
2010-01-22  4:52 ` [PATCH 19/24] drivers/block/floppy.c: convert int 1/0 to bool true/false Joe Perches
2010-01-22  4:52 ` [PATCH 20/24] drivers/block/floppy.c: Move leading && and || to preceding line Joe Perches
2010-01-22  4:52 ` [PATCH 21/24] drivers/block/floppy.c: remove #define DEVICE_NAME "floppy" Joe Perches
2010-01-22  4:52 ` [PATCH 22/24] drivers/block/floppy.c: Convert int initialising to bool initialized Joe Perches
2010-01-22  4:52 ` [PATCH 23/24] drivers/block/floppy.c: Add function is_ready_state Joe Perches
2010-01-22  4:52 ` [PATCH 24/24] drivers/block/floppy.c: Remove unnecessary return and braces Joe Perches
2010-01-22 10:47 ` [PATCH 00/24] drivers/block/floppy.c cleanups Andi Kleen
2010-01-22 11:46   ` Alan Cox
2010-01-22 17:04     ` Stephen Hemminger

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=ede2cfe4c04a8c75df5703f4082cd6cb69d66dd3.1264133863.git.joe@perches.com \
    --to=joe@perches.com \
    --cc=akpm@linux-foundation.org \
    --cc=bzolnier@gmail.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®