Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795056074; b=zRwHg8OQhOtmK3NrunYASuxVLE1D444ugi4WE3GB124rfZR2KMBCz62SabpRsbgoQL8e w2YAMEPpiq18UjxYSD1SydLDbc5EnOJlbsRltMdY0Ua8uhSfgApmHGqDPcqvktc8eDIdI BBAcKrjHkc30VjIKoj2kwh5SuYCs/kN74SlAJBUnSVguawopZ574jorLPGcFFvo8v+naP x31EACFzVW8GOhGpDqUMj3WSrwe9yuDYOjzwu/P1n4MKQgbhq+jEjdYv3IkjKMzXNuv2N c/8rN4fGrAvXIdnY28wzrU/3MwgHvF8A2Oqxzn5Wizludry10SptJBdwc/1h39kpV4A== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795056074; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=VFMHODgvzNMZd2d9VCJ/p8ehAPWNcWaMi2kDGlgmQ6c=; b=cMnjB9RTugd5R9mh86UFUNDwmO4sFjEus9NhKS+SzIp9VUl++XRzaOBHZ9T/OVY/qhNP vGSGfPZkwm9C7lr7MeSeNPnlujdBAlTzQGiz+VD3XLqdquYIqQmfzaF3O+yFTqBGyDE7s VZgfh5CHgcJgU7hyv0WndpgtnB3sW6WB5lXrjPhVTpufVCFmwcDHifalu5GaXVP7oRGwa vihC7NbWUOjiXciGl4HNsB7OdpOKyRN66u4qND7K1fJV8EBlvYCR9Ns9La4UD9iu5CnHL TYP6hZwqBTwwLuzY1ne2t0hbjaUX1vFwADDe7FeZ5yeMucPwEeh4rFIV5Oqa0PCcF/g== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=F5ZpmL6e; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1560D606A31C; Thu, 19 Nov 2026 02:41:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=F5ZpmL6e Received: by smtp.kernel.org (Postfix) with ESMTPSA id 629521F000C4; Thu, 19 Nov 2026 02:41:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795056073; bh=VFMHODgvzNMZd2d9VCJ/p8ehAPWNcWaMi2kDGlgmQ6c=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=F5ZpmL6eb+3sAQtgxd9QZcPZh04XrC81dBlNJuVMnc5a7Kp4T85tY+tUDOAo3xlia NpUcPF/nUBYW8vcAIK9evYXk1KCNjNfi9zm7XErJeaXr3PNm1ezmsEvDclsRqv006I VE1Zd5Etpz9Tj5VGiVuWNM5Jf3K5iiej1gHALtvk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Rosen Penev , Herbert Xu , Sasha Levin Subject: [PATCH 5.15 1817/2214] crypto: talitos - Use platform_get_irq() to retrieve interrupt Date: Wed, 18 Nov 2026 15:58:13 +0100 Message-ID: <20261118150124.157772964@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150009.797899913@linuxfoundation.org> References: <20261118150009.797899913@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Rosen Penev [ Upstream commit 4a1c7518cc31430b96458202b6a5b4064ff0cfa0 ] Remove the need to call irq_dispose_mapping as needed by irq_of_parse_and_map(). Simplify the function as a result. No need for gotos anymore. Add a missing free_irq. Signed-off-by: Rosen Penev Signed-off-by: Herbert Xu Stable-dep-of: 666d66df2525 ("crypto: talitos - init tasklets before requesting IRQs") Signed-off-by: Sasha Levin --- drivers/crypto/talitos.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c index 78fbf8b457bd4..a0cd39784a2ef 100644 --- a/drivers/crypto/talitos.c +++ b/drivers/crypto/talitos.c @@ -192,7 +192,7 @@ static int reset_device(struct device *dev) && --timeout) cpu_relax(); - if (priv->irq[1]) { + if (priv->irq[1] > 0) { mcr = TALITOS_MCR_RCA1 | TALITOS_MCR_RCA3; setbits32(priv->reg + TALITOS_MCR, mcr); } @@ -3174,13 +3174,11 @@ static int talitos_remove(struct platform_device *ofdev) talitos_unregister_rng(dev); for (i = 0; i < 2; i++) - if (priv->irq[i]) { + if (priv->irq[i] > 0) free_irq(priv->irq[i], dev); - irq_dispose_mapping(priv->irq[i]); - } tasklet_kill(&priv->done_task[0]); - if (priv->irq[1]) + if (priv->irq[1] > 0) tasklet_kill(&priv->done_task[1]); return 0; @@ -3286,26 +3284,26 @@ static struct talitos_crypto_alg *talitos_alg_alloc(struct device *dev, static int talitos_probe_irq(struct platform_device *ofdev) { struct device *dev = &ofdev->dev; - struct device_node *np = ofdev->dev.of_node; struct talitos_private *priv = dev_get_drvdata(dev); int err; bool is_sec1 = has_ftr_sec1(priv); - priv->irq[0] = irq_of_parse_and_map(np, 0); - if (!priv->irq[0]) { - dev_err(dev, "failed to map irq\n"); - return -EINVAL; - } + priv->irq[0] = platform_get_irq(ofdev, 0); + if (priv->irq[0] < 0) + return priv->irq[0]; + if (is_sec1) { err = request_irq(priv->irq[0], talitos1_interrupt_4ch, 0, dev_driver_string(dev), dev); goto primary_out; } - priv->irq[1] = irq_of_parse_and_map(np, 1); + priv->irq[1] = platform_get_irq_optional(ofdev, 1); + if (priv->irq[1] == -EPROBE_DEFER) + return priv->irq[1]; /* get the primary irq line */ - if (!priv->irq[1]) { + if (priv->irq[1] < 0) { err = request_irq(priv->irq[0], talitos2_interrupt_4ch, 0, dev_driver_string(dev), dev); goto primary_out; @@ -3321,7 +3319,6 @@ static int talitos_probe_irq(struct platform_device *ofdev) dev_driver_string(dev), dev); if (err) { dev_err(dev, "failed to request secondary irq\n"); - irq_dispose_mapping(priv->irq[1]); priv->irq[1] = 0; } @@ -3330,7 +3327,6 @@ static int talitos_probe_irq(struct platform_device *ofdev) primary_out: if (err) { dev_err(dev, "failed to request primary irq\n"); - irq_dispose_mapping(priv->irq[0]); priv->irq[0] = 0; } @@ -3431,7 +3427,7 @@ static int talitos_probe(struct platform_device *ofdev) tasklet_init(&priv->done_task[0], talitos1_done_4ch, (unsigned long)dev); } else { - if (priv->irq[1]) { + if (priv->irq[1] > 0) { tasklet_init(&priv->done_task[0], talitos2_done_ch0_2, (unsigned long)dev); tasklet_init(&priv->done_task[1], talitos2_done_ch1_3, @@ -3449,7 +3445,7 @@ static int talitos_probe(struct platform_device *ofdev) for (i = 0; i < priv->num_channels; i++) { priv->chan[i].reg = priv->reg + stride * (i + 1); - if (!priv->irq[1] || !(i & 1)) + if (priv->irq[1] < 0 || !(i & 1)) priv->chan[i].reg += TALITOS_CH_BASE_OFFSET; spin_lock_init(&priv->chan[i].head_lock); -- 2.53.0