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

Commit 86e84862 authored by Nishanth Aravamudan's avatar Nishanth Aravamudan Committed by Linus Torvalds
Browse files

[PATCH] drivers/block: fix-up schedule_timeout() usage 



Use schedule_timeout_{un,}interruptible() instead of
set_current_state()/schedule_timeout() to reduce kernel size.

Signed-off-by: default avatarNishanth Aravamudan <nacc@us.ibm.com>
Cc: Jens Axboe <axboe@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 310b587e

drivers/block/cciss.c

+3 −4
Original line number Diff line number Diff line
@@ -1713,10 +1713,9 @@ static unsigned long pollcomplete(int ctlr) 


	for (i = 20 * HZ; i > 0; i--) {

		done = hba[ctlr]->access.command_completed(hba[ctlr]);

		if (done == FIFO_EMPTY) {

			set_current_state(TASK_UNINTERRUPTIBLE);

			schedule_timeout(1);

		} else

		if (done == FIFO_EMPTY)

			schedule_timeout_uninterruptible(1);

		else

			return (done);

	}

	/* Invalid address to tell caller we ran out of time */

drivers/block/paride/pcd.c

+1 −2
Original line number Diff line number Diff line
@@ -516,8 +516,7 @@ static int pcd_tray_move(struct cdrom_device_info *cdi, int position) 


static void pcd_sleep(int cs)

{

	current->state = TASK_INTERRUPTIBLE;

	schedule_timeout(cs);

	schedule_timeout_interruptible(cs);

}



static int pcd_reset(struct pcd_unit *cd)

drivers/block/paride/pf.c

+1 −2
Original line number Diff line number Diff line
@@ -507,8 +507,7 @@ static void pf_eject(struct pf_unit *pf) 


static void pf_sleep(int cs)

{

	current->state = TASK_INTERRUPTIBLE;

	schedule_timeout(cs);

	schedule_timeout_interruptible(cs);

}



/* the ATAPI standard actually specifies the contents of all 7 registers

drivers/block/paride/pg.c

+1 −2
Original line number Diff line number Diff line
@@ -276,8 +276,7 @@ static inline u8 DRIVE(struct pg *dev) 


static void pg_sleep(int cs)

{

	current->state = TASK_INTERRUPTIBLE;

	schedule_timeout(cs);

	schedule_timeout_interruptible(cs);

}



static int pg_wait(struct pg *dev, int go, int stop, unsigned long tmo, char *msg)

drivers/block/paride/pt.c

+1 −2
Original line number Diff line number Diff line
@@ -383,8 +383,7 @@ static int pt_atapi(struct pt_unit *tape, char *cmd, int dlen, char *buf, char * 


static void pt_sleep(int cs)

{

	current->state = TASK_INTERRUPTIBLE;

	schedule_timeout(cs);

	schedule_timeout_interruptible(cs);

}



static int pt_poll_dsc(struct pt_unit *tape, int pause, int tmo, char *msg)