From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f47.google.com (mail-ed1-f47.google.com [209.85.208.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 24494AD21; Thu, 16 Mar 2023 20:00:41 +0000 (UTC) Received: by mail-ed1-f47.google.com with SMTP id fd5so12176093edb.7; Thu, 16 Mar 2023 13:00:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678996839; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=Eh0eniamDzXzJa+4xC931IM0RpAD3LQ4EQK6d9LHlcQ=; b=OuGZm7CfXaw6onDLIApDpgXlLcDwJA0yqR2XyXe545Ql98ea6mxMrYLIzAsAitpJz5 b2orAPdLRaUT6H/Llazo5labm4jeCE1D/+HzMKZGbYea7P+NL3uK+pSvfP0KzIjhdLN3 J3xG/EFGpi5urQaEerFHSFEduGtkR7TMZKU6Hy5e0M0DUoD/+HR7rJSvcxWF+Hp2li0D wCOcW5OBnzDND3zXHpSGX8tZe2w5B4kML8MIdfjophVmmvJc1lft/Wp0j8y0eBI5WY+s rJt+11KmasBP7lCDB3Z6ZYvTofqn/pOcb6u2ZNJ4eYFnUAXzRPznfGeslCTMHZPBXow6 koig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678996839; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Eh0eniamDzXzJa+4xC931IM0RpAD3LQ4EQK6d9LHlcQ=; b=hwTI2YXXyRymTfexeEb8+4AQsGxxRYMnemZYpR7eSqk0IUfnMKEDXl+xQOfe9NZ4iU u0Pp8rpplSw2B+++ZUGo+nFrfAqc243rL0MvCdYM5txod4KAGArb22vsiVW9ADZF6rUP 7+mWZavuzg5NCnbdqikVBTR6HH1oz5veTyuNhgJqAERRke1qj5kly0DtCnvzCPRjFGmr Tz/QmY5saWL2VX7zUYNtJE6pbeqjnB0Jjkd3mbRv6300HAPyhgAMBpxfSnRIrlupbm60 jrHsINZciqQzhnYX9wHBgvhTTuz+varJZ9plaOU60bW2clkWKKN8JIRU1Z9mxw1ZHOC5 5bQw== X-Gm-Message-State: AO0yUKWMfvjdGXV1XUWoSm1tUTDjkpAOaZ8i6lsqtzmuP6n6nxRtQchd ynL8bcYWmy/dnqtl6vaZGCtOWauIOsu4EU+xGRg= X-Google-Smtp-Source: AK7set+lwndJhVrFVuftXWKnsa20HItOMuJpE6uwdAahWC76TUCtJfKBgM7SeSsy3X8dN3YxYdQGpQ== X-Received: by 2002:a17:906:5a95:b0:7e0:eed0:8beb with SMTP id l21-20020a1709065a9500b007e0eed08bebmr11266601ejq.41.1678996839098; Thu, 16 Mar 2023 13:00:39 -0700 (PDT) Received: from khadija-virtual-machine ([39.41.53.192]) by smtp.gmail.com with ESMTPSA id lt11-20020a170906fa8b00b008e54ac90de1sm39825ejb.74.2023.03.16.13.00.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Mar 2023 13:00:38 -0700 (PDT) Date: Fri, 17 Mar 2023 01:00:36 +0500 From: Khadija Kamran To: outreachy@lists.linux.dev Cc: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v7] staging: axis-fifo: initialize timeouts in init only Message-ID: Precedence: bulk X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Initialize the module parameters, read_timeout and write_timeout once in init(). Module parameters can only be set once and cannot be modified later, so we don't need to evaluate them again when passing the parameters to wait_event_interruptible_timeout(). Convert datatype of {read,write}_timeout from 'int' to 'long int' because implicit conversion of 'long int' to 'int' in statement '{read,write}_timeout = MAX_SCHEDULE_TIMEOUT' results in an overflow. Change format specifier for {read,write}_timeout from %i to %li. Reviewed-by: Fabio M. De Francesco Suggested-by: Greg Kroah-Hartman Signed-off-by: Khadija Kamran --- Changes in v7: - Fixed a gramattical error Changes in v6: - Initialize module parameters in init instead of probe function. - Change the subject and description - Change format specifiers of module parameters to "%li" Changes in v5: - Convert module parameters datatype from int to long. - Link to patch: https://lore.kernel.org/outreachy/ZBMR4s8xyHGqMm72@khadija-virtual-machine/ Changes in v4: - Initialize timeouts once as suggested by Greg; this automatically fixes the indentation problems. - Change the subject and description. - Link to patch: https://lore.kernel.org/outreachy/ZA4M3+ZeB1Rl2fbs@khadija-virtual-machine/ Changes in v3: - Correct grammatical mistakes - Do not change the second argument's indentation in split lines Changes in v2: - Instead of matching alignment to open parenthesis, align second and the last argument. - Change the subject and use imperative language. - Link to patch: https://lore.kernel.org/outreachy/ZAxNYw2rFQkrdtKl@khadija-virtual-machine/ Link to first patch: https://lore.kernel.org/outreachy/ZAZSmPpB6fcozGa4@khadija-virtual-machine/ drivers/staging/axis-fifo/axis-fifo.c | 28 ++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/drivers/staging/axis-fifo/axis-fifo.c b/drivers/staging/axis-fifo/axis-fifo.c index dfd2b357f484..0a85ea667a1b 100644 --- a/drivers/staging/axis-fifo/axis-fifo.c +++ b/drivers/staging/axis-fifo/axis-fifo.c @@ -103,17 +103,17 @@ * globals * ---------------------------- */ -static int read_timeout = 1000; /* ms to wait before read() times out */ -static int write_timeout = 1000; /* ms to wait before write() times out */ +static long read_timeout = 1000; /* ms to wait before read() times out */ +static long write_timeout = 1000; /* ms to wait before write() times out */ /* ---------------------------- * module command-line arguments * ---------------------------- */ -module_param(read_timeout, int, 0444); +module_param(read_timeout, long, 0444); MODULE_PARM_DESC(read_timeout, "ms to wait before blocking read() timing out; set to -1 for no timeout"); -module_param(write_timeout, int, 0444); +module_param(write_timeout, long, 0444); MODULE_PARM_DESC(write_timeout, "ms to wait before blocking write() timing out; set to -1 for no timeout"); /* ---------------------------- @@ -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) { @@ -948,7 +944,17 @@ static struct platform_driver axis_fifo_driver = { static int __init axis_fifo_init(void) { - pr_info("axis-fifo driver loaded with parameters read_timeout = %i, write_timeout = %i\n", + 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; + + pr_info("axis-fifo driver loaded with parameters read_timeout = %li, write_timeout = %li\n", read_timeout, write_timeout); return platform_driver_register(&axis_fifo_driver); } -- 2.34.1