From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BBBF5C43603 for ; Fri, 13 Dec 2019 00:09:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8F6EC214D8 for ; Fri, 13 Dec 2019 00:09:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=arista.com header.i=@arista.com header.b="fm7lZwBP" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731932AbfLMAJ5 (ORCPT ); Thu, 12 Dec 2019 19:09:57 -0500 Received: from mail-pj1-f67.google.com ([209.85.216.67]:33077 "EHLO mail-pj1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731923AbfLMAJz (ORCPT ); Thu, 12 Dec 2019 19:09:55 -0500 Received: by mail-pj1-f67.google.com with SMTP id r67so357276pjb.0 for ; Thu, 12 Dec 2019 16:09:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arista.com; s=googlenew; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+19+gHR9cQtzG0SbAxxpoIQN5hIivcDHXKstCXTe0SU=; b=fm7lZwBPfVm4Q9dAyUTsSOublHXDGdvf8myJOTPvONC2UZG03EWhvZAORYa6np0Yji Mtgjo9OqliSsL7PXfDBN1Nw9koZt1vVvtB6SyRrOAtnXqVBUcXniPkQsiXRnhzKniwhO 2d/2Ji1LwcwTyMq9y+WbFnyUcroFEf2neE0SyqyA/oDGrn+vtmDhpJjSoXuzJ2L6woDY OROvM/HbbT+NAeEOA+8qgZ5lGAG+buqiKaasYc/89Kld8071U1q1+ArZ+Gnh+tqAKL1s TDQUraO5ODxMK9lI1jvDB4dSDEXc0OXlU+msB+fvFdMtPwpHntAXs8Hc1IN5WvghnEOS IHFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+19+gHR9cQtzG0SbAxxpoIQN5hIivcDHXKstCXTe0SU=; b=VfjS5EMCjpeR7PShe+FlvsfmfVlnvcGCMVbW7fJso8XgWSQmFc3Coq3KGUy0rQLY66 /hLV97yS9e+YhmHT0NPS5P4l834MYdeRMwtrZF4t3l+xgiq1nhVbQibFW4+z3lXFJZRE BHkmoNq5CPtaJKjY8E0F4CbuowYdQZyR8UbS1C/T3IEhyeHaU7B3sv0WEbinY3et0hUe B/RXF5ai0LzMh65jWm6QfeGAoI7bz/CVP7YY90Rk/9UVRrNa3CPscNPO2EfeFQsQQj+5 ArY8GA4IAo58OG+AOcjckWKlrCP7zACayc3Y4wc5rWszDlmeyAU8jzIRachEm97ZRtp5 6fzA== X-Gm-Message-State: APjAAAU+WYQih7eAzrttYYqfBdwXKwitvHG+IPysrDYiYg/e/ycQ86/w WB2k/UzxSMasrsE6FzAYdT/LkIO+bag= X-Google-Smtp-Source: APXvYqyj2L1MOlbvvhInw0zzC+wmgjjo1MCSXcvzEW3SDiVgj0bmeMP0/UR2W5z8JzFr+HTm7Kwrqg== X-Received: by 2002:a17:902:be02:: with SMTP id r2mr12205174pls.76.1576195794481; Thu, 12 Dec 2019 16:09:54 -0800 (PST) Received: from Mindolluin.ire.aristanetworks.com ([217.173.96.166]) by smtp.gmail.com with ESMTPSA id j38sm8317647pgj.27.2019.12.12.16.09.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Dec 2019 16:09:53 -0800 (PST) From: Dmitry Safonov To: linux-kernel@vger.kernel.org Cc: Dmitry Safonov <0x7f454c46@gmail.com>, Dmitry Safonov , Greg Kroah-Hartman , Jiri Slaby , Vasiliy Khoruzhick , linux-serial@vger.kernel.org Subject: [PATCH 54/58] serial_core: Remove SUPPORT_SYSRQ ifdeffery Date: Fri, 13 Dec 2019 00:06:53 +0000 Message-Id: <20191213000657.931618-55-dima@arista.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191213000657.931618-1-dima@arista.com> References: <20191213000657.931618-1-dima@arista.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org No one defines it anymore. Signed-off-by: Dmitry Safonov --- include/linux/serial_core.h | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index 5f761c399282..9cf1682dc580 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h @@ -466,10 +466,7 @@ uart_handle_sysrq_char(struct uart_port *port, unsigned int ch) if (!IS_ENABLED(CONFIG_MAGIC_SYSRQ_SERIAL)) return 0; - if (!port->has_sysrq && !IS_ENABLED(SUPPORT_SYSRQ)) - return 0; - - if (!port->sysrq) + if (!port->has_sysrq || !port->sysrq) return 0; if (ch && time_before(jiffies, port->sysrq)) { @@ -487,10 +484,7 @@ uart_prepare_sysrq_char(struct uart_port *port, unsigned int ch) if (!IS_ENABLED(CONFIG_MAGIC_SYSRQ_SERIAL)) return 0; - if (!port->has_sysrq && !IS_ENABLED(SUPPORT_SYSRQ)) - return 0; - - if (!port->sysrq) + if (!port->has_sysrq || !port->sysrq) return 0; if (ch && time_before(jiffies, port->sysrq)) { @@ -507,7 +501,7 @@ uart_unlock_and_check_sysrq(struct uart_port *port, unsigned long irqflags) { int sysrq_ch; - if (!port->has_sysrq && !IS_ENABLED(SUPPORT_SYSRQ)) { + if (!port->has_sysrq) { spin_unlock_irqrestore(&port->lock, irqflags); return; } @@ -531,7 +525,7 @@ static inline int uart_handle_break(struct uart_port *port) if (port->handle_break) port->handle_break(port); - if (port->has_sysrq || IS_ENABLED(SUPPORT_SYSRQ)) { + if (port->has_sysrq) { if (port->cons && port->cons->index == port->line) { if (!port->sysrq) { port->sysrq = jiffies + HZ*5; -- 2.24.0