From patchwork Fri Jul 5 10:40:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 13724927 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B7196C3271F for ; Fri, 5 Jul 2024 10:41:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=O7oWBhtqk3xwW6JyxZwaMMLkFEk7F/Zbtq+Lnku9XgY=; b=HGcDGqvEDUtSGCqX0j7D4YDU2c C10xWFCQlDgwJVbyrVmuPklrnB01FZCWJnJVPxaPPsUqALVMt0cfYw2Mf4CKSOED97Pe/MCvwGWdM r7ENFfPQe8hHqKUjyZGjjlybCSucy5zy3NFH/TF5dpxmvh7spEhDb8gUhAAn65qXbV4jO9Gu3Si2F m6Hp1UgKn8GC2vMkyyM6YR+P9Q+bcdLn2Ix2Hvak0xCXp0GWvBNPFnz994UHSD5unZEAJIr4O3vCW 5432djwankBS/r7b9snErtnBJwe+64J2g6PM/k/7jg9xLjSI1sITP/RoorLIp+Xe3stb5BGuKRt8E kuNLAV4A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sPgNr-0000000Ffyo-0r8O; Fri, 05 Jul 2024 10:41:43 +0000 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sPgN9-0000000FfkT-3FY4 for linux-arm-kernel@lists.infradead.org; Fri, 05 Jul 2024 10:41:01 +0000 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-367ab76d5e1so140026f8f.3 for ; Fri, 05 Jul 2024 03:40:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1720176058; x=1720780858; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=O7oWBhtqk3xwW6JyxZwaMMLkFEk7F/Zbtq+Lnku9XgY=; b=OZ7DpXJvtxdDzmZdIt5Uv1xl3w8TIbVoGbbBqD0vAOk4eVlabvwuK9M/qiIjHplVrj 0IhZTuKBb3QTbgHfnWfVfgsF++nQeeqU++wQzCVfX0rhdVMt0dbOc5NUE6g3xGKfLOwP SJHtSwNCdUliiRhINGVmN/0vPW5FiDByKz6MvWDo3iUXVY1tC7Y8ZpRhUGk8mqXUufgy jztwgBWP9POt7lrAYAUETXIeXgoJv/C4zlBeKjBmKRcItQ0TW7BXhyPwZijR0Z++P0fX CkoCZZz7bCKDnhZ0Dc/Voph6lBlGzpL9SddkWcbYPZFQX+1kXO2WsQRJsXFZzJO+5lp6 5BMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720176058; x=1720780858; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=O7oWBhtqk3xwW6JyxZwaMMLkFEk7F/Zbtq+Lnku9XgY=; b=AwbkXE7v+JWcn7m95svT1pKqxM8x9xBbX4t8h9gGve9q7cgFe3U0JML1mIC0jL3W+T lnymaDtHyr+ejX8lp0pH4FRauwhhN6lzhzLK6CUjNLUbM39N6R9ObE7nRglT6PBlEzQJ TCL10R9Y1zkxyfV4f6ZJngJe3pPgUyNXOuwCVbUkqaJWsPpCkoicKRBP6JCqW2YYC8cn raBqQOZoYs+D3LFK+yt8paIyiBN1v4va8vwuMRtRyGRRPuMkfWSGFnp0YNq+rHaMfmnn Nf0+rtet/ldyiHi+5JEDdxY2KK/fhyymNpH9tffi9t4mhCAqL3XNFxiPRvqDIqKSV263 FFPA== X-Forwarded-Encrypted: i=1; AJvYcCWnJOTYEnKkl5K4VEAxM917lOfIYjcLnZV6eGnOBFkt+51hJJ6q9x2Oe3oSTG1k+3W//VE2rWmZYniWjpp94/xwLwlR2B48Z/cKM52GL7poB8dYTTA= X-Gm-Message-State: AOJu0YxkHYFzAulRdAYesF42aomhgcBf/15FX27VWETi76oVbc4UijZm aeW4oAeoe2PfvePOKK+lWfc2aC8Pk/e+mGiEzORRFLQgWvN2+jRAY1/cbNhBkXw= X-Google-Smtp-Source: AGHT+IHPMMzu5kdlcoZYnKj2xBCDHrdAzNmKY1tb0qjEiMJJj0RsjyKrxPl+gMGzYZqJroN4prirIQ== X-Received: by 2002:adf:e68a:0:b0:35f:11c5:5c74 with SMTP id ffacd0b85a97d-3679dd34d4bmr3095033f8f.36.1720176058373; Fri, 05 Jul 2024 03:40:58 -0700 (PDT) Received: from [127.0.1.1] ([178.197.219.137]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-36789d5ec1csm8680446f8f.37.2024.07.05.03.40.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jul 2024 03:40:57 -0700 (PDT) From: Krzysztof Kozlowski Date: Fri, 05 Jul 2024 12:40:46 +0200 Subject: [PATCH 3/6] iio: adc: at91: simplify with cleanup.h MIME-Version: 1.0 Message-Id: <20240705-cleanup-h-iio-v1-3-77114c7e84c5@linaro.org> References: <20240705-cleanup-h-iio-v1-0-77114c7e84c5@linaro.org> In-Reply-To: <20240705-cleanup-h-iio-v1-0-77114c7e84c5@linaro.org> To: Dan Robertson , Jonathan Cameron , Lars-Peter Clausen , Michael Hennerich , Nicolas Ferre , Alexandre Belloni , Claudiu Beznea , Oleksij Rempel , kernel@pengutronix.de Cc: linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Krzysztof Kozlowski X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1335; i=krzysztof.kozlowski@linaro.org; h=from:subject:message-id; bh=p8oWdKJIvI/s9h6AmtHd1y9/mEFkDnWkbWLkspoDv58=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBmh82v0r6Jh34sMwY1mn3FW86/CEhm6tM4W7RnL uiEVj4Vr+mJAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCZofNrwAKCRDBN2bmhouD 1/3TD/9Na/SvzzL4bKKGkbGVC3TdFpp+yHgCyH52qQr8o7KQlHBEJKaH1jYv9NZmWAfRjEp/6WM DX8l8spwS2QfhfjRD61w2RJxeNHKpMOhfRUVIL3iBAHrwDkv2wUlIi6iYH421pgx8LKaMK7Oadh ZI8wacXDVGz0RHyrdOt5dYKeE/bzhdXMc6PD3z/VfdipVRtAkyUqdkqaof9EW1cm24JddMncVl7 GgUa2VE6T9e59sqS3YfaM3QfvlZsxRdPFfGHba5PyoE4dUv0ppeTyKzWouv9GySZayvSnNVDQmd Sncvw4nm/LyKQKKIpLpjRv6t8r4aKWGastRB8/Xkq/6CaeR9geqf8/cepA6LiNsd5XqtTMgyCy0 x/tyceFDPl7QQaZXKGuD4CbscN2FxQyZYNsxx1YGEopceTWnUa09mmhHCGKCnCJplvXIlHGa2F+ fHZj0Z9dGL0kS8rP5ZdeEAZ+213jyU+fzDu9kapEegaH/3ycs+i/+6roOFLOONLTdJi3kbfykKl HwM/9WrCzw2ruPd5Kx1vu51mz7IU9QgbsKj9QqfhRRoxvK/9bKdWhvOLBSkz4ofs8CbE1zpJSFi eiARICHKU25nhyGaKKZUWQRdrUnt1N6n1Z5Xv7340vFdMMvK5C58k/NoPAoimRL1HlKPrF7Pery tEe0GOCnirntzpw== X-Developer-Key: i=krzysztof.kozlowski@linaro.org; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240705_034059_854031_6692BEF5 X-CRM114-Status: GOOD ( 14.05 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Allocate the memory with scoped/cleanup.h to reduce error handling and make the code a bit simpler. Signed-off-by: Krzysztof Kozlowski --- drivers/iio/adc/at91_adc.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c index eb501e3c86a5..7bcda203436b 100644 --- a/drivers/iio/adc/at91_adc.c +++ b/drivers/iio/adc/at91_adc.c @@ -7,6 +7,7 @@ #include #include +#include #include #include #include @@ -543,22 +544,18 @@ static int at91_adc_get_trigger_value_by_name(struct iio_dev *idev, int i; for (i = 0; i < st->caps->trigger_number; i++) { - char *name = kasprintf(GFP_KERNEL, - "%s-dev%d-%s", - idev->name, - iio_device_id(idev), - triggers[i].name); + char *name __free(kfree) = kasprintf(GFP_KERNEL, "%s-dev%d-%s", + idev->name, + iio_device_id(idev), + triggers[i].name); if (!name) return -ENOMEM; if (strcmp(trigger_name, name) == 0) { - kfree(name); if (triggers[i].value == 0) return -EINVAL; return triggers[i].value; } - - kfree(name); } return -EINVAL;