From patchwork Fri Nov 17 20:12:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Lechner X-Patchwork-Id: 166305 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9910:0:b0:403:3b70:6f57 with SMTP id i16csp787461vqn; Fri, 17 Nov 2023 12:14:37 -0800 (PST) X-Google-Smtp-Source: AGHT+IGMDE6fk5qYuy1sbz9i2PshaoEqIofBYYxGn2HiOBhWXT1mDlDhtoDxHS5fU6RW1qPp3496 X-Received: by 2002:a05:6a20:43a1:b0:187:6fb0:85ba with SMTP id i33-20020a056a2043a100b001876fb085bamr326989pzl.43.1700252076826; Fri, 17 Nov 2023 12:14:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700252076; cv=none; d=google.com; s=arc-20160816; b=FRO5/Qk1YCR+J15htCDzUz0JVlhrN/ONUXZEIVSOkjUi8YAa6I8lAHgFW0A6QTMYTe kFuXKJTmN14yqg4ZCrkUc6thir1z5bemnHuQxXYbk2pHqNu/Obqsa7XFOBDhrAGTTdt9 WGEpFI/9Vz21OKPIx6MoJ+Ky2M+v1EnEd0qexqRZSC6yBKnilz0tOywG9CDTQ4d7WNfj 0lvoHw7XJWxHKKTz9OXlB5zJVS4USEmxZOv8pAq/cJVhQyjP8ypeybE7HFVymRTUP5NR T0aRDdbLw8S5YZUsPyymRuyiF9XBUQKyCg783XJwQOuO2RNh7yEmWqyDkwhE5fNMXg18 JL0w== 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=7LNYfVKcT7JMz9dURfBMFGVc3NYglRs5IQioTfjD6HM=; fh=iMzJmnbboC4LJtlxOKimqPq82YSRfb3zCJyFaxC9c3g=; b=pQ8Hb+bLpzx3B08TFPIqzHPVyEpsCGRR17vjRmyfgeM8Ji66Tw1k0QGczXTA2RrKql S7sfhhGC5VHGoDHoX7ZPu1Rn334ho9I7Wm/yoRIfWevKhMqiHNl/K4wGu6JKQz8NDfL1 V0hvvXlF/pAOUslmeeGBn2FkeCcHs02wU5GcounSL/MTODVdFVCfeypP/zInIs+kcQhu yB0+AAAqnTDsCdDrGAIAPmTiauvt+wxuXBmif8Fv2DI31X8wZZC71P4irckvucR7Sfwi qlzqMRw3BKzBGP29pyQ5+ezPMIGX/sREC64xmJRM/8wepLHP0iyEhbZrsOn5Zm3svRbS KHjg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20230601.gappssmtp.com header.s=20230601 header.b=GlzlcKT6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id o188-20020a6341c5000000b005bdfda8e04esi2551708pga.800.2023.11.17.12.14.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Nov 2023 12:14:36 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20230601.gappssmtp.com header.s=20230601 header.b=GlzlcKT6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (Postfix) with ESMTP id C24B582A7560; Fri, 17 Nov 2023 12:14:19 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235727AbjKQUOM (ORCPT + 29 others); Fri, 17 Nov 2023 15:14:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43988 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235724AbjKQUOB (ORCPT ); Fri, 17 Nov 2023 15:14:01 -0500 Received: from mail-oi1-x236.google.com (mail-oi1-x236.google.com [IPv6:2607:f8b0:4864:20::236]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E63A3D7A for ; Fri, 17 Nov 2023 12:13:56 -0800 (PST) Received: by mail-oi1-x236.google.com with SMTP id 5614622812f47-3b3f55e1bbbso1513218b6e.2 for ; Fri, 17 Nov 2023 12:13:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1700252036; x=1700856836; 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=7LNYfVKcT7JMz9dURfBMFGVc3NYglRs5IQioTfjD6HM=; b=GlzlcKT63c7jWtIAMe3jmcQOBcMb0qs+2CwppZtzYE+Ko5QS+cljsUj442lH/CKqB8 rKoERKdZTydDrroa3t0J28oaO8BUgPBJYZ5BNkicbImd4zDFF5OX6LjrrpYTOQ/OPadl vWi4jp+F2VN+d+T7nRLMgJFO1EUeujAnR8Kt+YhPLYohMhK3wjzcPySUdT4dWHfBDs9I QxOBr1NbHZy7hyxxPjbY3P6JrU4V5XlFpHwinvsv5NneThCJRjro71Z4AOC2ikHxiiI9 CdflXTfKqFxB/Sc9cf7yzj7qHXGZpJ6kRQa3NX9hyz5AQUDMppbmJAR6KDdf/quTWY5W jJ3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700252036; x=1700856836; 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=7LNYfVKcT7JMz9dURfBMFGVc3NYglRs5IQioTfjD6HM=; b=hQdCcrNZNXAGrO5b6GASfVQviodzD9WV+yRxCSh5nWJMT2YzZ0PNPouwY29jKt59V4 +iRIrJFGQOUWhgbPNRZMJ0iRe7YP6kjXrmK71y+x3bIaizbAksd95vxM796BS29gQMPD i8wqOZZAmuPM4GIYanLe85gL9v1UVa+8uRw6Txc8FT68IsUX1H57W4ab2UddrBCfD+c6 Clx9euK3XfhCQilDNMLawdFjlwIrWGp36k3QZj9o32ExgF+Qsq/4oLTIMrzsfOQ29Pp0 Q85O8a35dle7hTUZ32xkbSACTWNJlA8KG0N+NJNgL5Ws1dDC5wMNfRfWUUPztxbwiwnB UcHQ== X-Gm-Message-State: AOJu0YxvFRWZQzUu+q5IAT7w8TLeDVgAL+sGuPx9ZSIEofw8KKJCVRDi p95o4bgcvzS4Y+VTDs0MIAlnIg== X-Received: by 2002:a05:6808:1410:b0:3b5:a58c:cca6 with SMTP id w16-20020a056808141000b003b5a58ccca6mr608163oiv.3.1700252036277; Fri, 17 Nov 2023 12:13:56 -0800 (PST) Received: from freyr.lechnology.com (ip98-183-112-25.ok.ok.cox.net. [98.183.112.25]) by smtp.gmail.com with ESMTPSA id l21-20020a544515000000b003a8560a9d34sm393814oil.25.2023.11.17.12.13.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Nov 2023 12:13:55 -0800 (PST) From: David Lechner To: linux-spi@vger.kernel.org, devicetree@vger.kernel.org Cc: David Lechner , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Michael Hennerich , =?utf-8?q?Nuno_S=C3=A1?= , Lars-Peter Clausen , linux-kernel@vger.kernel.org Subject: [PATCH 06/14] spi: axi-spi-engine: use devm_request_irq() Date: Fri, 17 Nov 2023 14:12:57 -0600 Message-ID: <20231117-axi-spi-engine-series-1-v1-6-cc59db999b87@baylibre.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231117-axi-spi-engine-series-1-v1-0-cc59db999b87@baylibre.com> References: <20231117-axi-spi-engine-series-1-v1-0-cc59db999b87@baylibre.com> MIME-Version: 1.0 X-Mailer: b4 0.12.4 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Fri, 17 Nov 2023 12:14:19 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782843521480575437 X-GMAIL-MSGID: 1782843521480575437 This replaces request_irq() with devm_request_irq() in the AXI SPI Engine driver. This simplifies the error path and removes the need to call free_irq() in the remove function. Signed-off-by: David Lechner --- drivers/spi/spi-axi-spi-engine.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/spi/spi-axi-spi-engine.c b/drivers/spi/spi-axi-spi-engine.c index c18a4b34777e..81d7352d2b8b 100644 --- a/drivers/spi/spi-axi-spi-engine.c +++ b/drivers/spi/spi-axi-spi-engine.c @@ -520,7 +520,8 @@ static int spi_engine_probe(struct platform_device *pdev) if (ret) return ret; - ret = request_irq(irq, spi_engine_irq, 0, pdev->name, host); + ret = devm_request_irq(&pdev->dev, irq, spi_engine_irq, 0, pdev->name, + host); if (ret) return ret; @@ -533,24 +534,18 @@ static int spi_engine_probe(struct platform_device *pdev) ret = spi_register_controller(host); if (ret) - goto err_free_irq; + return ret; platform_set_drvdata(pdev, host); return 0; -err_free_irq: - free_irq(irq, host); - return ret; } static void spi_engine_remove(struct platform_device *pdev) { struct spi_controller *host = platform_get_drvdata(pdev); - int irq = platform_get_irq(pdev, 0); spi_unregister_controller(host); - - free_irq(irq, host); } static const struct of_device_id spi_engine_match_table[] = {