Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73507e6c authored by Joe Perches's avatar Joe Perches Committed by Linus Torvalds
Browse files

drivers/block/floppy.c: remove unnecessary argument from [__]reschedule_timeout 



Prior to patch "drivers/block/floppy.c: Use pr_<level>" only
reschedule_timeout(,"request done"...) printed a numeric value after a
reschedule_timeout event message.

Restore that behavior and remove the now unnecessary argument.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Cc: Stephen Hemminger <shemminger@vyatta.com>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: Marcin Slusarz <marcin.slusarz@gmail.com>
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0da3132f

drivers/block/floppy.c

+12 −10
Original line number Diff line number Diff line
@@ -668,7 +668,7 @@ static int output_log_pos; 
#define current_reqD -1

#define MAXTIMEOUT -2



static void __reschedule_timeout(int drive, const char *message, int marg)

static void __reschedule_timeout(int drive, const char *message)

{

	if (drive == current_reqD)

		drive = current_drive;
@@ -680,16 +680,16 @@ static void __reschedule_timeout(int drive, const char *message, int marg) 
		fd_timeout.expires = jiffies + UDP->timeout;

	add_timer(&fd_timeout);

	if (UDP->flags & FD_DEBUG)

		DPRINT("reschedule timeout %s %d\n", message, marg);

		DPRINT("reschedule timeout %s\n", message);

	timeout_message = message;

}



static void reschedule_timeout(int drive, const char *message, int marg)

static void reschedule_timeout(int drive, const char *message)

{

	unsigned long flags;



	spin_lock_irqsave(&floppy_lock, flags);

	__reschedule_timeout(drive, message, marg);

	__reschedule_timeout(drive, message);

	spin_unlock_irqrestore(&floppy_lock, flags);

}
@@ -900,7 +900,7 @@ static int _lock_fdc(int drive, bool interruptible, int line) 
	}

	command_status = FD_COMMAND_NONE;



	__reschedule_timeout(drive, "lock fdc", 0);

	__reschedule_timeout(drive, "lock fdc");

	set_fdc(drive);

	return 0;

}
@@ -1983,7 +1983,7 @@ static void floppy_ready(void) 


static void floppy_start(void)

{

	reschedule_timeout(current_reqD, "floppy start", 0);

	reschedule_timeout(current_reqD, "floppy start");



	scandrives();

	debug_dcl(DP->flags, "setting NEWCHANGE in floppy_start\n");
@@ -2007,7 +2007,7 @@ static void floppy_start(void) 


static void do_wakeup(void)

{

	reschedule_timeout(MAXTIMEOUT, "do wakeup", 0);

	reschedule_timeout(MAXTIMEOUT, "do wakeup");

	cont = NULL;

	command_status += 2;

	wake_up(&command_done);
@@ -2306,9 +2306,11 @@ static void request_done(int uptodate) 
	struct request *req = current_req;

	unsigned long flags;

	int block;

	char msg[sizeof("request done ") + sizeof(int) * 3];



	probing = 0;

	reschedule_timeout(MAXTIMEOUT, "request done", uptodate);

	snprintf(msg, sizeof(msg), "request done %d", uptodate);

	reschedule_timeout(MAXTIMEOUT, msg);



	if (!req) {

		pr_info("floppy.c: no request in request_done\n");
@@ -2908,7 +2910,7 @@ static void redo_fd_request(void) 
	}

	drive = (long)current_req->rq_disk->private_data;

	set_fdc(drive);

	reschedule_timeout(current_reqD, "redo fd request", 0);

	reschedule_timeout(current_reqD, "redo fd request");



	set_floppy(drive);

	raw_cmd = &default_raw_cmd;
@@ -4254,7 +4256,7 @@ static int __init floppy_init(void) 
		else

			floppy_sizes[i] = MAX_DISK_SIZE << 1;



	reschedule_timeout(MAXTIMEOUT, "floppy init", MAXTIMEOUT);

	reschedule_timeout(MAXTIMEOUT, "floppy init");

	config_types();



	for (i = 0; i < N_FDC; i++) {