From nobody Sun Feb 8 00:26:50 2026 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (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 7CE05EAC7; Mon, 22 Apr 2024 22:19:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713824371; cv=none; b=UUHVDlhxvHobAu9lDrXj46qELyUYkdgSEmYF33KyafDFTH6MHtm5qMy/k01MVm0fLRlv6+SqQRCrUhR3lRxEZCYYrxutiRY9ak3nOKmPaqcUT86yMg5dyQXwd98RUK6PQIzJ7HV4ahUuKLAPBNnJpbJQtR5dsasRekKyD0UIu44= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713824371; c=relaxed/simple; bh=ND5tqPbLHiRmqAq3seb/NtLicLiXO1QrqUysWJXwAgc=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=WY5WTRT2/dxJq2pvITuFlrqnCsCNIRmYAkJGV0mkrESeB4xCRfOtVmtATIlhWM1kQdbc79o2FtFC0/gMBib+nNklaPh2/bWi3tY1XsqBDoQfIkIXAqgoF5ljOO8Zszx3rrKvMkiqueX14Ixhe96i1I6gpufQFKwGFClGurskq6I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=FdFLDAok; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=N2ghb6XS; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="FdFLDAok"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="N2ghb6XS" Date: Mon, 22 Apr 2024 22:19:27 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1713824368; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LswEfE44mEwAXWJoZftpskhklhezJOAQtEACpWEeju0=; b=FdFLDAokRv9uZfNHRV7ythB/y9kLqiNQykWHREWyjHBT9s7+wJoqp/1NGXhzoRTeOUGb1e Vt5TikLhFfUoEAJWo3ogtCx0Xr45PR18HVcD0BKyTvb9GF4DdDufai9mpyBERKSHG/FHVH I+pDi335MSvgUPgatEL7XIIx0ktqcneDi3MZTTfu1w4NyuOAnKvwEOa/5D9d0NLVaDbVVj gTqsgXT8rB7NLCjiFzyhsASVttcmKrP91wfDqJO6LSi5vKHxgolbH2HPB//BlV8G3sNsf4 5Q/9m5X6oHttWNqBmiQvyGbS/lDy/m/yr3rD5d8FrFCZtZ2Xq8NCh+OZWHVxpA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1713824368; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LswEfE44mEwAXWJoZftpskhklhezJOAQtEACpWEeju0=; b=N2ghb6XS85DeGDg/SNer0gj+WYov0ThrPAcuDDfx6E+EuiHCykHL9J1xL/RZ0OY8iafh1F KoH0DBXRyBaxupAg== From: "tip-bot2 for Jinjie Ruan" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: irq/core] genirq: Simplify the checks for irq_set_percpu_devid_partition() Cc: Jinjie Ruan , Thomas Gleixner , x86@kernel.org, linux-kernel@vger.kernel.org, maz@kernel.org In-Reply-To: <20240417085356.3785381-1-ruanjinjie@huawei.com> References: <20240417085356.3785381-1-ruanjinjie@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <171382436728.10875.7349999854043503567.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the irq/core branch of tip: Commit-ID: bb58c1baa501e3d695d8e13a5bd955fd00e2e879 Gitweb: https://git.kernel.org/tip/bb58c1baa501e3d695d8e13a5bd955fd0= 0e2e879 Author: Jinjie Ruan AuthorDate: Wed, 17 Apr 2024 16:53:56 +08:00 Committer: Thomas Gleixner CommitterDate: Tue, 23 Apr 2024 00:17:07 +02:00 genirq: Simplify the checks for irq_set_percpu_devid_partition() Since whether desc is NULL or desc->percpu_enabled is true, it returns -EINVAL, check them together, and assign desc->percpu_affinity using a ternary to simplify the code. Signed-off-by: Jinjie Ruan Signed-off-by: Thomas Gleixner Link: https://lore.kernel.org/r/20240417085356.3785381-1-ruanjinjie@huawei.= com --- kernel/irq/irqdesc.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/kernel/irq/irqdesc.c b/kernel/irq/irqdesc.c index 3820931..f0d4b98 100644 --- a/kernel/irq/irqdesc.c +++ b/kernel/irq/irqdesc.c @@ -911,10 +911,7 @@ int irq_set_percpu_devid_partition(unsigned int irq, { struct irq_desc *desc =3D irq_to_desc(irq); =20 - if (!desc) - return -EINVAL; - - if (desc->percpu_enabled) + if (!desc || desc->percpu_enabled) return -EINVAL; =20 desc->percpu_enabled =3D kzalloc(sizeof(*desc->percpu_enabled), GFP_KERNE= L); @@ -922,10 +919,7 @@ int irq_set_percpu_devid_partition(unsigned int irq, if (!desc->percpu_enabled) return -ENOMEM; =20 - if (affinity) - desc->percpu_affinity =3D affinity; - else - desc->percpu_affinity =3D cpu_possible_mask; + desc->percpu_affinity =3D affinity ? : cpu_possible_mask; =20 irq_set_percpu_devid_flags(irq); return 0;