From nobody Fri Feb 13 04:54:51 2026 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8545A3D549 for ; Mon, 3 Jun 2024 09:15:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.117.254.33 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717406152; cv=none; b=IkfJhmYCuIUDwlbu+SqbCMlyzCsq/F80jwX3mFcGvlmICGM3xcusM7ssf3te37WXS3+Py9sfp6od9Xm+1enuYgHqfPJ6ojms+bxYU2fXezSuAHhfW2hJMI5jJbj1370MntFmlSILdWcql3rBAc08QgCLuHyUr5sQJRHT1BrxrzE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717406152; c=relaxed/simple; bh=HhBt6/7iPORMx5Kl1Z9ooKI2OQsHyjjVeOMZLg9WLBM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=e+RPbedpQpSU/uCoYLUcTOjAroVV9uDu3+HbA2XSS4eH1L+twQsubOyQvsJo7bkvDIZO1HstIKPG6MctfJiB+bmnfb30plLLHbMCrW8SoJ2kYnh+8wT/Ox9YL6yHrcovvz98/ehq9g3qhW7O21VuEhiRv48I9x9iAhHHY9lGpn8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com; spf=pass smtp.mailfrom=sang-engineering.com; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b=EvD5HKBD; arc=none smtp.client-ip=194.117.254.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sang-engineering.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sang-engineering.com header.i=@sang-engineering.com header.b="EvD5HKBD" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= sang-engineering.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; s=k1; bh=9OJSdBKqUt1d4Vs+wHfk7HzuxjMx44r5nI8Q9nIvLBM=; b=EvD5HK BDgvJx56of1aDyIKNpwjw6wHq9xxahazmkblmjiw/RXovc5RWigo85Cxs68OYQ63 yK88U4RKeeMnliv5NAjtC3ljHYNh3Dnmk74bpipBrElhtnI3qxLhP+F7TTWG6HnV 2mjbm1sjwCuHbcXg2lO+Krkb60giVZ4vIF8eh9jbuecAeLTq4rNxwoRvoJcLwkQp YT7JTjLugYjBumkonA/TdeVYD572H2cRmAzuczTJ6MpWLfz0WFCqrSbYbr200i4K 2yzTvDSUD1pU/jhm84uewpv58Ghx4rzmsSsFafTfjwjziymdZ+GWkUwN8RjHHSu0 uV/MhEpw2/qsB13g== Received: (qmail 1899365 invoked from network); 3 Jun 2024 11:15:48 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 3 Jun 2024 11:15:48 +0200 X-UD-Smtp-Session: l3s3148p1@A4Rmx/gZHIYgAwDPXzLGAH1eNELjOc3g From: Wolfram Sang To: linux-kernel@vger.kernel.org Cc: Wolfram Sang , Christian Lamparter , Kalle Valo , linux-wireless@vger.kernel.org Subject: [PATCH 4/6] wifi: p54: use 'time_left' variable with wait_for_completion_interruptible_timeout() Date: Mon, 3 Jun 2024 11:15:37 +0200 Message-ID: <20240603091541.8367-5-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240603091541.8367-1-wsa+renesas@sang-engineering.com> References: <20240603091541.8367-1-wsa+renesas@sang-engineering.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" There is a confusing pattern in the kernel to use a variable named 'timeout= ' to store the result of wait_for_completion_interruptible_timeout() causing pat= terns like: timeout =3D wait_for_completion_interruptible_timeout(...) if (!timeout) return -ETIMEDOUT; with all kinds of permutations. Use 'time_left' as a variable to make the c= ode self explaining. Fix to the proper variable type 'long' while here. Signed-off-by: Wolfram Sang --- drivers/net/wireless/intersil/p54/fwio.c | 6 +++--- drivers/net/wireless/intersil/p54/p54pci.c | 8 ++++---- drivers/net/wireless/intersil/p54/p54spi.c | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/net/wireless/intersil/p54/fwio.c b/drivers/net/wireles= s/intersil/p54/fwio.c index c4fe70e05b9b..772084a9bd8d 100644 --- a/drivers/net/wireless/intersil/p54/fwio.c +++ b/drivers/net/wireless/intersil/p54/fwio.c @@ -216,7 +216,7 @@ int p54_download_eeprom(struct p54_common *priv, void *= buf, struct sk_buff *skb; size_t eeprom_hdr_size; int ret =3D 0; - long timeout; + long time_left; =20 if (priv->fw_var >=3D 0x509) eeprom_hdr_size =3D sizeof(*eeprom_hdr); @@ -245,9 +245,9 @@ int p54_download_eeprom(struct p54_common *priv, void *= buf, =20 p54_tx(priv, skb); =20 - timeout =3D wait_for_completion_interruptible_timeout( + time_left =3D wait_for_completion_interruptible_timeout( &priv->eeprom_comp, HZ); - if (timeout <=3D 0) { + if (time_left <=3D 0) { wiphy_err(priv->hw->wiphy, "device does not respond or signal received!\n"); ret =3D -EBUSY; diff --git a/drivers/net/wireless/intersil/p54/p54pci.c b/drivers/net/wirel= ess/intersil/p54/p54pci.c index e97ee547b9f3..6588f5477762 100644 --- a/drivers/net/wireless/intersil/p54/p54pci.c +++ b/drivers/net/wireless/intersil/p54/p54pci.c @@ -434,7 +434,7 @@ static int p54p_open(struct ieee80211_hw *dev) { struct p54p_priv *priv =3D dev->priv; int err; - long timeout; + long time_left; =20 init_completion(&priv->boot_comp); err =3D request_irq(priv->pdev->irq, p54p_interrupt, @@ -472,12 +472,12 @@ static int p54p_open(struct ieee80211_hw *dev) P54P_WRITE(dev_int, cpu_to_le32(ISL38XX_DEV_INT_RESET)); P54P_READ(dev_int); =20 - timeout =3D wait_for_completion_interruptible_timeout( + time_left =3D wait_for_completion_interruptible_timeout( &priv->boot_comp, HZ); - if (timeout <=3D 0) { + if (time_left <=3D 0) { wiphy_err(dev->wiphy, "Cannot boot firmware!\n"); p54p_stop(dev); - return timeout ? -ERESTARTSYS : -ETIMEDOUT; + return time_left ? -ERESTARTSYS : -ETIMEDOUT; } =20 P54P_WRITE(int_enable, cpu_to_le32(ISL38XX_INT_IDENT_UPDATE)); diff --git a/drivers/net/wireless/intersil/p54/p54spi.c b/drivers/net/wirel= ess/intersil/p54/p54spi.c index 0073b5e0f9c9..d33a994906a7 100644 --- a/drivers/net/wireless/intersil/p54/p54spi.c +++ b/drivers/net/wireless/intersil/p54/p54spi.c @@ -518,7 +518,7 @@ static void p54spi_work(struct work_struct *work) static int p54spi_op_start(struct ieee80211_hw *dev) { struct p54s_priv *priv =3D dev->priv; - unsigned long timeout; + long time_left; int ret =3D 0; =20 if (mutex_lock_interruptible(&priv->mutex)) { @@ -538,10 +538,10 @@ static int p54spi_op_start(struct ieee80211_hw *dev) =20 mutex_unlock(&priv->mutex); =20 - timeout =3D msecs_to_jiffies(2000); - timeout =3D wait_for_completion_interruptible_timeout(&priv->fw_comp, - timeout); - if (!timeout) { + time_left =3D msecs_to_jiffies(2000); + time_left =3D wait_for_completion_interruptible_timeout(&priv->fw_comp, + time_left); + if (!time_left) { dev_err(&priv->spi->dev, "firmware boot failed"); p54spi_power_off(priv); ret =3D -1; --=20 2.43.0