Message ID | 20230130151612.212732-102-sjg@chromium.org |
---|---|
State | Changes Requested |
Delegated to: | Tom Rini |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=PT+ulf58; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5BsN6FFcz1yhq for <incoming@patchwork.ozlabs.org>; Tue, 31 Jan 2023 02:28:24 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1F4A7859CE; Mon, 30 Jan 2023 16:23:19 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="PT+ulf58"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 965FA859A2; Mon, 30 Jan 2023 16:18:37 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x12b.google.com (mail-il1-x12b.google.com [IPv6:2607:f8b0:4864:20::12b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 247038583C for <u-boot@lists.denx.de>; Mon, 30 Jan 2023 16:17:15 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12b.google.com with SMTP id i17so5067096ils.11 for <u-boot@lists.denx.de>; Mon, 30 Jan 2023 07:17:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=e+76jZxRTMvkgfOZJifznKg0bHD89S4meHa7xyqw1kk=; b=PT+ulf58QPvT2wQPZacJavnyaKD2PyRGHQAKxjNQTVXKLbFWP/iyrvMgLRIBIOalO2 dEy5pgV4j4D4dz9/YyvDTm93Wo7Mm0AqcKpRu/uf0beDPtBCi43g4KkBCywUiTZATjbA GypIpRqCWLWGWhkHbW0C4DGP0WtaWiw1//jHc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=e+76jZxRTMvkgfOZJifznKg0bHD89S4meHa7xyqw1kk=; b=VfRzeOXoi09Q2k9x3ydBlBkuA98H9M903JTL1wwZSGSy2zQNWoRNW/32yBimvR75qt 47l0wIYTdJAjZ7hgSQ0G2yAhpW2Mwsa1+YPCYu0uwZyD0A+mgfZc+vDyxYjqKOc9oqCA FIn44Rru8JZVsoUp9fsBUSYzhbEstDN0Swb/8WJDt2bLSNj27PdIZFVu6iaAm9Dd254J vNP7OytKtEDk8g5KQ+pSy0obHm2L0fsMzm3/dWeM35h5E2A/OOSkKIqYo4j2f3IU12Tz j2LuRWysNfGGIXi6qqbg7WMDEansVxQowilZgdbJMmd9C3BvLsjjBI/hsD2uVRbzsxPZ Cejw== X-Gm-Message-State: AO0yUKUGfwsWRou8vJHOpiYtJV6GCAw74+z/pD5PLDAvM5AMRJLC/1l0 /XfDxt7ij1qIWJajoc+Z7+ylxkT6VfS1HjcO X-Google-Smtp-Source: AK7set+fjj+RX7QoVI7F/IvQGQ2PefiObxV73Q/Dv1V59aQzs6d3G3lyw2iIAzHvYaWxuqNkQuFzyQ== X-Received: by 2002:a05:6e02:1e06:b0:310:d05b:3a1 with SMTP id g6-20020a056e021e0600b00310d05b03a1mr10440420ila.20.1675091827003; Mon, 30 Jan 2023 07:17:07 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:06 -0800 (PST) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Tom Rini <trini@konsulko.com>, Simon Glass <sjg@chromium.org>, Bin Meng <bmeng.cn@gmail.com> Subject: [PATCH 101/171] Correct SPL uses of I8259_PIC Date: Mon, 30 Jan 2023 08:15:02 -0700 Message-Id: <20230130151612.212732-102-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean |
Series |
None
|
expand
|
diff --git a/arch/x86/lib/interrupts.c b/arch/x86/lib/interrupts.c index ff52959ed28..33d6eb49d75 100644 --- a/arch/x86/lib/interrupts.c +++ b/arch/x86/lib/interrupts.c @@ -66,7 +66,7 @@ void irq_install_handler(int irq, interrupt_handler_t *handler, void *arg) irq_handlers[irq].arg = arg; irq_handlers[irq].count = 0; - if (CONFIG_IS_ENABLED(I8259_PIC)) + if (IS_ENABLED(CONFIG_I8259_PIC)) unmask_irq(irq); if (status) @@ -86,7 +86,7 @@ void irq_free_handler(int irq) status = disable_interrupts(); - if (CONFIG_IS_ENABLED(I8259_PIC)) + if (IS_ENABLED(CONFIG_I8259_PIC)) mask_irq(irq); irq_handlers[irq].handler = NULL; @@ -108,13 +108,13 @@ void do_irq(int hw_irq) } if (irq_handlers[irq].handler) { - if (CONFIG_IS_ENABLED(I8259_PIC)) + if (IS_ENABLED(CONFIG_I8259_PIC)) mask_irq(irq); irq_handlers[irq].handler(irq_handlers[irq].arg); irq_handlers[irq].count++; - if (CONFIG_IS_ENABLED(I8259_PIC)) { + if (IS_ENABLED(CONFIG_I8259_PIC)) { unmask_irq(irq); specific_eoi(irq); }
This converts 4 usages of this option to the non-SPL form, since there is no SPL_I8259_PIC defined in Kconfig Signed-off-by: Simon Glass <sjg@chromium.org> --- arch/x86/lib/interrupts.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)