From patchwork Wed Sep 20 07:55:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 142337 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp4027288vqi; Wed, 20 Sep 2023 03:28:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFDk/m84IcNliEP2LEvqHPB7WBcoMHJ9DYFETdbzvdP3T6EU/dQr2g5YU+iEF6p4lMoiKm7 X-Received: by 2002:a17:902:f7d5:b0:1c5:c38a:421 with SMTP id h21-20020a170902f7d500b001c5c38a0421mr462354plw.30.1695205718770; Wed, 20 Sep 2023 03:28:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695205718; cv=none; d=google.com; s=arc-20160816; b=HaOWXvj8EOS/2QTZKBl6PO1/Bvo2XFep49P03cMhGWt08sLDZuan0o0s/QFW2kCk45 haqOyKibLvBjN3J9UzevQ9xezzhomIXqSlA7CRRccSNQRZq8byDo/FEytAavgq6t25rQ aHCs0OKQnxYxizeHTdWI4ZCKsMufgBZCS+3ur8K1Ghr1qtNHouQVKdc0tlgknGdQcrtf vBhblwjayhsu7DtlAf67izJMItw242d6v4mHEal6DppEYdPvpjmuZKJouh0qfizlISHr Ra/ZJ25FtHWVzzS6X4R9woTrmS2STjxQBiAXUy0yQD+81qKUuarzWKxlWp0wYWm1IjDV 5K4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=B+hhScSa68yGcwdNh6Yw39YhA0WpD2wyeMxz+ezDQj8=; fh=El7U+Cg75FrEsqBKE0pb+XSRaZD7UUWlPElNZyAnAj8=; b=YAQysh9wxJ5LWJp0zoJcMvAfoO6nCvPM8EvoXl1qg1RTcnnpJgnf6emALOV4vS4mj2 ladW4e+awxamOnDUjGypLmZiKx1cdkEeg7nc1VvyfUlKprUyAwQ/NHdGWh2hfsGBleIq HmABAHaSHYLhtpMOtUgaTRJcC246GGNpwtKnfNBKd8KN4Y7kWJGaHhsa5b1QiQPh4phh kUfieF2b5ce187hvfJPbKcAbiPLTgiD7jBI0h7L8EBnjYKfJ/YbxmPLTpAX6TGsquv1P Cn7cKtJxCG0Y5auv9ysAQ/BcW6eFsqgjFKEr9xkEQxhtWMzNx/2rg3mnGSVrObgM3zr4 dzVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=SuO+tIgy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id kp14-20020a170903280e00b001c56ede4c97si2675604plb.239.2023.09.20.03.28.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Sep 2023 03:28:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=SuO+tIgy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 37015808693B; Wed, 20 Sep 2023 00:55:52 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233543AbjITHzg (ORCPT + 26 others); Wed, 20 Sep 2023 03:55:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54224 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233308AbjITHz1 (ORCPT ); Wed, 20 Sep 2023 03:55:27 -0400 Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BAD7497 for ; Wed, 20 Sep 2023 00:55:20 -0700 (PDT) Received: by mail-ed1-x535.google.com with SMTP id 4fb4d7f45d1cf-52f3ba561d9so1344742a12.1 for ; Wed, 20 Sep 2023 00:55:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1695196519; x=1695801319; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=B+hhScSa68yGcwdNh6Yw39YhA0WpD2wyeMxz+ezDQj8=; b=SuO+tIgyu2ompYirr2AZN/z6fLFdTDh3SDXLOiwIVojIpx1WVcEKuwZG1g9pcQ/YzO rQdptQNrNQ0qD7IKVhrekQMxmdR8XeDzllJszz8EWF9SaibBLcltyZE9IrMhJY+a2zsh fsxL/raG2VCTTSqvH2Ls0kDv1S9D0Pv0wZVcDV3HhovjU6cfWLutwVwKDpvu4DsCrSiq DpEOSEwsu4skiZlEa85c89SQREaTPoPoBFw/pBGNgjMoZ8lcWRAx06ZkFqfQNzubGKEn ukkSdPhI4uwkB3mVs8sXnWi6rzRVYgzNGfq7gQ11LGLGmfcDRV9KcOaz7+FjhJbh///O 11zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695196519; x=1695801319; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=B+hhScSa68yGcwdNh6Yw39YhA0WpD2wyeMxz+ezDQj8=; b=LYjQhxsp3QBDzLSbKYiyXLuOFPCphLcETSgHDNFBNB+hgHhwgKlCc3hO+I53IWA7w5 hyGB/R7p78rKMcvVtKkyh0Yo65LgipFXvexP2nbtjHa8mgnNeeT09CBvJFWpQJH3/q7i HTRRXx1jRyJMglId2gTv2a1iRuJD1rIfcRV9v27MFDsVHi36ElEAWqmxipaTD8XcTRaa 8g/dHKZS7fk9ADzuT3s7f4viiLyiRNDnzDEIZ7B+8Ty1bfi8mEXot//UlUjyxNO+hmNu +kZpteIQ2LX/9PcORlWGQibmQrGtxIMAHclJoQ8dcuC4WyxgpObWeXBT2y5jXCNEL5VR tmhw== X-Gm-Message-State: AOJu0YxPaN9xfh7ggKXKYGS5FSwGs5XfiIMao58S6lmoZlskBNFWThab 52sIZvXqMLcuCYtZwV6zqQ07cQ== X-Received: by 2002:a05:6402:2803:b0:532:7daa:e50e with SMTP id h3-20020a056402280300b005327daae50emr6306611ede.6.1695196519343; Wed, 20 Sep 2023 00:55:19 -0700 (PDT) Received: from brgl-uxlite.. (static-212-193-78-212.thenetworkfactory.nl. [212.78.193.212]) by smtp.gmail.com with ESMTPSA id d9-20020a05640208c900b0051bed21a635sm8481981edz.74.2023.09.20.00.55.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Sep 2023 00:55:18 -0700 (PDT) From: Bartosz Golaszewski To: Yury Norov , Andy Shevchenko , Rasmus Villemoes , Thomas Gleixner , Marc Zyngier , Peter Zijlstra Cc: linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH v2 4/4] genirq/irq_sim: shrink code by using cleanup helpers Date: Wed, 20 Sep 2023 09:55:00 +0200 Message-Id: <20230920075500.96260-5-brgl@bgdev.pl> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230920075500.96260-1-brgl@bgdev.pl> References: <20230920075500.96260-1-brgl@bgdev.pl> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Wed, 20 Sep 2023 00:55:52 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777552031709859159 X-GMAIL-MSGID: 1777552031709859159 From: Bartosz Golaszewski Use the new __free helper from linux/cleanup.h to remove all gotos and simplify the error paths. Signed-off-by: Bartosz Golaszewski --- kernel/irq/irq_sim.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/kernel/irq/irq_sim.c b/kernel/irq/irq_sim.c index b0d50b48dbd1..82b7b5051249 100644 --- a/kernel/irq/irq_sim.c +++ b/kernel/irq/irq_sim.c @@ -4,6 +4,7 @@ * Copyright (C) 2020 Bartosz Golaszewski */ +#include #include #include #include @@ -163,33 +164,27 @@ static const struct irq_domain_ops irq_sim_domain_ops = { struct irq_domain *irq_domain_create_sim(struct fwnode_handle *fwnode, unsigned int num_irqs) { - struct irq_sim_work_ctx *work_ctx; - - work_ctx = kmalloc(sizeof(*work_ctx), GFP_KERNEL); + struct irq_sim_work_ctx *work_ctx __free(kfree) = + kmalloc(sizeof(*work_ctx), GFP_KERNEL); if (!work_ctx) - goto err_out; + return ERR_PTR(-ENOMEM); - work_ctx->pending = bitmap_zalloc(num_irqs, GFP_KERNEL); - if (!work_ctx->pending) - goto err_free_work_ctx; + unsigned long *pending __free(bitmap) = bitmap_zalloc(num_irqs, + GFP_KERNEL); + if (!pending) + return ERR_PTR(-ENOMEM); work_ctx->domain = irq_domain_create_linear(fwnode, num_irqs, &irq_sim_domain_ops, work_ctx); if (!work_ctx->domain) - goto err_free_bitmap; + return ERR_PTR(-ENOMEM); work_ctx->irq_count = num_irqs; work_ctx->work = IRQ_WORK_INIT_HARD(irq_sim_handle_irq); + work_ctx->pending = no_free_ptr(pending); - return work_ctx->domain; - -err_free_bitmap: - bitmap_free(work_ctx->pending); -err_free_work_ctx: - kfree(work_ctx); -err_out: - return ERR_PTR(-ENOMEM); + return no_free_ptr(work_ctx)->domain; } EXPORT_SYMBOL_GPL(irq_domain_create_sim);