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 49BCEC2D0C9 for ; Fri, 13 Dec 2019 00:09:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1DF392464B for ; Fri, 13 Dec 2019 00:09:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=arista.com header.i=@arista.com header.b="gG+e7w/T" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731769AbfLMAJC (ORCPT ); Thu, 12 Dec 2019 19:09:02 -0500 Received: from mail-pl1-f193.google.com ([209.85.214.193]:40103 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731764AbfLMAI6 (ORCPT ); Thu, 12 Dec 2019 19:08:58 -0500 Received: by mail-pl1-f193.google.com with SMTP id g6so382627plp.7 for ; Thu, 12 Dec 2019 16:08:58 -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=pf5ob1U+UmoKzgDEzAnzQgACPOvLCz33gyddDWcn/3Q=; b=gG+e7w/TGyyz+ZaD86YvhLiM8336JsknsKMNUHmpJax11tUtppv6QhFeVOS1Fdwcq2 d9lq9ZvjabgLZa44cfOBp6ytNjsU9ABE4+6q3kA0Lz6WoGjOJgtEYBfZRX7ms9KVk0uV Rb0g/8Km+YNXdbqkjrnByC5oIkZipi1aC73gbqropB+icwL8aCMKTsOnkzMVr1Sr3QuI 3ULYFXs9p+O8J4XEKCp9lFINfoMiLayVAGcKilgWQPs1W87lNfVV81ZYGQymCUJZeE19 aBEX469mRgpMsghnIScJnurtL1MYj2Jl3onYn9yOpvLYgdktbB/ds6ew9MYzx6aS28xU TXvQ== 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=pf5ob1U+UmoKzgDEzAnzQgACPOvLCz33gyddDWcn/3Q=; b=ZL+P4N2O9UAiwbHDeX1gPbdIDHgkjJVdo6mMkDu0Rd1wjmNCeimiPlY9PaN/jRYY0A RtbmHp8Ys0gdnSXFqVJsdJkwSvwLKS/DpKRzOz9vMt1srqaHdzXT1YBkilSHAdsjZ+r7 Vk2BXxle7eiG9WlGxKpkKc0hyGC7SGKhSLcPjtCSlUXhTNqQeZ8tIBdPyFfOauPSq1r1 Hq01j+ipUIOYe19rDqa3DhhTTFfDU9h+2oNMwrrwKCjTqwdQi3fiEeHkYa+aHMoiR8oP 1bqMxEWAkQO2CcEDY+gVKJjPY3Vf36eSU7BnqieUTKZwVPqoLwcKhaR1/YXI5uScOgFL RY7A== X-Gm-Message-State: APjAAAXp/xGWDLH40+nP+fO6rE8VmmtsQ70vQ+9T2aGlhpyeDt3sKhKf waiY283Gt18EeZUM/lgM1VJm1GXDRLc= X-Google-Smtp-Source: APXvYqyHTbGmqYibkbM8oEcdOzkAtnmMdHELW1D7VRNlqC9GC/KqxwN8jSmAVTbEvEKQQQEfAyNnzA== X-Received: by 2002:a17:90b:f06:: with SMTP id br6mr13014258pjb.125.1576195737771; Thu, 12 Dec 2019 16:08:57 -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.08.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Dec 2019 16:08:57 -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, Andy Gross , Bjorn Andersson , linux-arm-msm@vger.kernel.org Subject: [PATCH 35/58] tty/serial: Migrate qcom_geni_serial to use has_sysrq Date: Fri, 13 Dec 2019 00:06:34 +0000 Message-Id: <20191213000657.931618-36-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 The SUPPORT_SYSRQ ifdeffery is not nice as: - May create misunderstanding about sizeof(struct uart_port) between different objects - Prevents moving functions from serial_core.h - Reduces readability (well, it's ifdeffery - it's hard to follow) In order to remove SUPPORT_SYSRQ, has_sysrq variable has been added. Initialise it in driver's probe and remove ifdeffery. Cc: Andy Gross Cc: Bjorn Andersson Cc: linux-arm-msm@vger.kernel.org Signed-off-by: Dmitry Safonov --- drivers/tty/serial/qcom_geni_serial.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qcom_geni_serial.c index ff63728a95f4..c41c766d6c7c 100644 --- a/drivers/tty/serial/qcom_geni_serial.c +++ b/drivers/tty/serial/qcom_geni_serial.c @@ -1,10 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 // Copyright (c) 2017-2018, The Linux foundation. All rights reserved. -#if defined(CONFIG_SERIAL_QCOM_GENI_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) -# define SUPPORT_SYSRQ -#endif - #include #include #include @@ -1308,6 +1304,7 @@ static int qcom_geni_serial_probe(struct platform_device *pdev) if (irq < 0) return irq; uport->irq = irq; + uport->has_sysrq = IS_ENABLED(CONFIG_SERIAL_QCOM_GENI_CONSOLE); irq_set_status_flags(uport->irq, IRQ_NOAUTOEN); ret = devm_request_irq(uport->dev, uport->irq, qcom_geni_serial_isr, -- 2.24.0