Commit 2e4aa2f2 authored May 29, 2015 by Nicholas Mc Guire Committed by Martin Schwidefsky Jun 15, 2015

s390/sclp: pass timeout as HZ independent value

schedule_timeout takes a timeout in jiffies but the code currently is
passing in a constant SDIAS_SLEEP_TICKS, as this is otherwise unused
it is replaced by 500ms as recommended by Michael Holzheu
<holzheu@linux.vnet.ibm.com> and converted with msecs_to_jiffies();
As SDIAS_SLEEP_TICKS was only used in this one location it is dropped.

Patch was compile tested with (s390) defconfig +
CONFIG_MARCH_Z10=y, (implies CONFIG_CRASH_DUMP=y)

Patch is against 4.1-rc5 (localversion-next is -next-20150529)

Link: http://lkml.org/lkml/2015/5/29/235


Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

parent 4e0a6412

drivers/s390/char/sclp_sdias.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@
		#define TRACE(x...) debug_sprintf_event(sdias_dbf, 1, x)

		#define SDIAS_RETRIES 300
		#define SDIAS_SLEEP_TICKS 50

		static struct debug_info *sdias_dbf;

		@@ -68,7 +67,7 @@ static int sdias_sclp_send(struct sclp_req *req)
		/* not initiated, wait some time and retry */
		set_current_state(TASK_INTERRUPTIBLE);
		TRACE("add request failed: rc = %i\n",rc);
		schedule_timeout(SDIAS_SLEEP_TICKS);
		schedule_timeout(msecs_to_jiffies(500));
		continue;
		}
		/* initiated, wait for completion of service call */