floppy: cleanup: get rid of current_reqD in favor of current_drive

This macro equals -1 and is used as an alternative for current_drive when
calling reschedule_timeout(), which in turn needs to remap it. This only
adds obfuscation, let's simply use current_drive.

Link: https://lore.kernel.org/r/20200410101904.14652-2-w@1wt.eu
Signed-off-by: Willy Tarreau <w@1wt.eu>
Signed-off-by: Denis Efremov <efremov@linux.com>

diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index b102f55..20646d4 100644 (file)
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -668,16 +668,12 @@ static struct output_log {
 
 static int output_log_pos;
 
-#define current_reqD -1
 #define MAXTIMEOUT -2
 
 static void __reschedule_timeout(int drive, const char *message)
 {
        unsigned long delay;
 
-       if (drive == current_reqD)
-               drive = current_drive;
-
        if (drive < 0 || drive >= N_DRIVE) {
                delay = 20UL * HZ;
                drive = 0;
@@ -1960,7 +1956,7 @@ static void floppy_ready(void)
 
 static void floppy_start(void)
 {
-       reschedule_timeout(current_reqD, "floppy start");
+       reschedule_timeout(current_drive, "floppy start");
 
        scandrives();
        debug_dcl(drive_params[current_drive].flags,
@@ -2874,7 +2870,7 @@ do_request:
        }
        drive = (long)current_req->rq_disk->private_data;
        set_fdc(drive);
-       reschedule_timeout(current_reqD, "redo fd request");
+       reschedule_timeout(current_drive, "redo fd request");
 
        set_floppy(drive);
        raw_cmd = &default_raw_cmd;