From nobody Tue Feb 10 21:38:52 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7CD4FC7618A for ; Thu, 16 Mar 2023 20:01:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229534AbjCPUBU (ORCPT ); Thu, 16 Mar 2023 16:01:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49216 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230218AbjCPUBL (ORCPT ); Thu, 16 Mar 2023 16:01:11 -0400 Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0BBC611167 for ; Thu, 16 Mar 2023 13:00:41 -0700 (PDT) Received: by mail-ed1-x52c.google.com with SMTP id cy23so12111283edb.12 for ; 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=7kgYHx2pm228gVphGR0euoNkX5+fity40U6xC80sDY+RSvcjj1zFYdL2q8ZEsO1Zyo xqZQn3CPXpK59hAtSaJIpDwsK4A/MALfGg6ZuaxkWlBM7+A0oUxBinQk7rg/4LIcQBA5 QqYBFyLYWaBGQP8TfflDNgvxJ2R+C1ztV6d2GsVSx/G8nF/G5HMnZ7sTF4Yu4MMx7kKm 5Vo26OXse8Mq2dp6cElmEordJ99DkXswX8176KuZcu5wEyd1U9G/H2L8+XAnHwJOjLKd pEztYNWZHHDO3lhtU8dmYYVJ5wcuxTnVLm1tWGPeuf4OYf59vuo4zMhIJOjaHnh4ajUU IuJg== X-Gm-Message-State: AO0yUKWkAkUqkezcVO2gUntJs3VKCPcrSg+bwbmcfvU+AK/r+DrFPcnT kikO1RHZO6eM2onEXiREq5X7UGfTTioJb1H9J/s= 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: MIME-Version: 1.0 Content-Disposition: inline Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 =3D 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-f= ifo/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 =3D 1000; /* ms to wait before read() times out */ -static int write_timeout =3D 1000; /* ms to wait before write() times out = */ +static long read_timeout =3D 1000; /* ms to wait before read() times out */ +static long write_timeout =3D 1000; /* ms to wait before write() times out= */ =20 /* ---------------------------- * module command-line arguments * ---------------------------- */ =20 -module_param(read_timeout, int, 0444); +module_param(read_timeout, long, 0444); MODULE_PARM_DESC(read_timeout, "ms to wait before blocking read() timing o= ut; 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"); =20 /* ---------------------------- @@ -384,9 +384,7 @@ static ssize_t axis_fifo_read(struct file *f, char __us= er *buf, mutex_lock(&fifo->read_lock); ret =3D wait_event_interruptible_timeout(fifo->read_queue, ioread32(fifo->base_addr + XLLF_RDFO_OFFSET), - (read_timeout >=3D 0) ? - msecs_to_jiffies(read_timeout) : - MAX_SCHEDULE_TIMEOUT); + read_timeout); =20 if (ret <=3D 0) { if (ret =3D=3D 0) { @@ -528,9 +526,7 @@ static ssize_t axis_fifo_write(struct file *f, const ch= ar __user *buf, ret =3D wait_event_interruptible_timeout(fifo->write_queue, ioread32(fifo->base_addr + XLLF_TDFV_OFFSET) >=3D words_to_write, - (write_timeout >=3D 0) ? - msecs_to_jiffies(write_timeout) : - MAX_SCHEDULE_TIMEOUT); + write_timeout); =20 if (ret <=3D 0) { if (ret =3D=3D 0) { @@ -948,7 +944,17 @@ static struct platform_driver axis_fifo_driver =3D { =20 static int __init axis_fifo_init(void) { - pr_info("axis-fifo driver loaded with parameters read_timeout =3D %i, wri= te_timeout =3D %i\n", + if (read_timeout >=3D 0) + read_timeout =3D msecs_to_jiffies(read_timeout); + else + read_timeout =3D MAX_SCHEDULE_TIMEOUT; + + if (write_timeout >=3D 0) + write_timeout =3D msecs_to_jiffies(write_timeout); + else + write_timeout =3D MAX_SCHEDULE_TIMEOUT; + + pr_info("axis-fifo driver loaded with parameters read_timeout =3D %li, wr= ite_timeout =3D %li\n", read_timeout, write_timeout); return platform_driver_register(&axis_fifo_driver); } --=20 2.34.1