public inbox for linux-staging@lists.linux.dev
 help / color / mirror / Atom feed
* [PATCH v4] staging: axis-fifo: initialize read_timeout and write_timeout once in probe function
@ 2023-03-12 17:33 Khadija Kamran
  2023-03-13  6:37 ` Greg Kroah-Hartman
  2023-03-13 14:13 ` Fabio M. De Francesco
  0 siblings, 2 replies; 8+ messages in thread
From: Khadija Kamran @ 2023-03-12 17:33 UTC (permalink / raw)
  To: outreachy; +Cc: Greg Kroah-Hartman, linux-staging, linux-kernel

Module parameter, read_timeout, can only be set at loading time. As it
can only be modified once, initialize read_timeout once in the probe
function.
As a result, only use read_timeout as the last argument in
wait_event_interruptible_timeout() call.

Same goes for write_timeout.

Signed-off-by: Khadija Kamran <kamrankhadijadj@gmail.com>
---
 drivers/staging/axis-fifo/axis-fifo.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/axis-fifo/axis-fifo.c b/drivers/staging/axis-fifo/axis-fifo.c
index b119cec25a60..7ec8722cef7d 100644
--- a/drivers/staging/axis-fifo/axis-fifo.c
+++ b/drivers/staging/axis-fifo/axis-fifo.c
@@ -384,9 +384,7 @@ static ssize_t axis_fifo_read(struct file *f, char __user *buf,
 		mutex_lock(&fifo->read_lock);
 		ret = wait_event_interruptible_timeout(fifo->read_queue,
 			ioread32(fifo->base_addr + XLLF_RDFO_OFFSET),
-			(read_timeout >= 0) ?
-			msecs_to_jiffies(read_timeout) :
-			MAX_SCHEDULE_TIMEOUT);
+			read_timeout);
 
 		if (ret <= 0) {
 			if (ret == 0) {
@@ -528,9 +526,7 @@ static ssize_t axis_fifo_write(struct file *f, const char __user *buf,
 		ret = wait_event_interruptible_timeout(fifo->write_queue,
 			ioread32(fifo->base_addr + XLLF_TDFV_OFFSET)
 				 >= words_to_write,
-			(write_timeout >= 0) ?
-			msecs_to_jiffies(write_timeout) :
-			MAX_SCHEDULE_TIMEOUT);
+			write_timeout);
 
 		if (ret <= 0) {
 			if (ret == 0) {
@@ -814,6 +810,16 @@ static int axis_fifo_probe(struct platform_device *pdev)
 	struct axis_fifo *fifo = NULL;
 	char *device_name;
 	int rc = 0; /* error return value */
+	
+	if (read_timeout >= 0)
+		read_timeout = msecs_to_jiffies(read_timeout);
+	else
+		read_timeout = MAX_SCHEDULE_TIMEOUT;
+	
+	if (write_timeout >= 0)
+		write_timeout = msecs_to_jiffies(write_timeout);
+	else
+		write_timeout = MAX_SCHEDULE_TIMEOUT;
 
 	/* ----------------------------
 	 *     init wrapper device
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2023-03-13 18:26 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-12 17:33 [PATCH v4] staging: axis-fifo: initialize read_timeout and write_timeout once in probe function Khadija Kamran
2023-03-13  6:37 ` Greg Kroah-Hartman
2023-03-13 14:13 ` Fabio M. De Francesco
2023-03-13 14:48   ` Khadija Kamran
2023-03-13 15:04     ` Dan Carpenter
2023-03-13 15:18       ` Khadija Kamran
2023-03-13 17:12     ` Alison Schofield
2023-03-13 18:26       ` Khadija Kamran

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox