Skip to content

Commit bb58c1b

Browse files
ruanjinjie-engKAGA-KOKO
authored andcommitted
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 <ruanjinjie@huawei.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Link: https://lore.kernel.org/r/20240417085356.3785381-1-ruanjinjie@huawei.com
1 parent 35d77eb commit bb58c1b

1 file changed

Lines changed: 2 additions & 8 deletions

File tree

kernel/irq/irqdesc.c

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -911,21 +911,15 @@ int irq_set_percpu_devid_partition(unsigned int irq,
911911
{
912912
struct irq_desc *desc = irq_to_desc(irq);
913913

914-
if (!desc)
915-
return -EINVAL;
916-
917-
if (desc->percpu_enabled)
914+
if (!desc || desc->percpu_enabled)
918915
return -EINVAL;
919916

920917
desc->percpu_enabled = kzalloc(sizeof(*desc->percpu_enabled), GFP_KERNEL);
921918

922919
if (!desc->percpu_enabled)
923920
return -ENOMEM;
924921

925-
if (affinity)
926-
desc->percpu_affinity = affinity;
927-
else
928-
desc->percpu_affinity = cpu_possible_mask;
922+
desc->percpu_affinity = affinity ? : cpu_possible_mask;
929923

930924
irq_set_percpu_devid_flags(irq);
931925
return 0;

0 commit comments

Comments
 (0)