From patchwork Tue Nov 29 11:00:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 27177 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp264201wrr; Tue, 29 Nov 2022 03:02:29 -0800 (PST) X-Google-Smtp-Source: AA0mqf7wWzxqGhUI2/3E4xF7yPmu1fsghOjTEc/DCQ2QxCr8n3KivcUmZma0gKGwCS+f1+63Cvpy X-Received: by 2002:a17:906:99cd:b0:7be:9340:b3e4 with SMTP id s13-20020a17090699cd00b007be9340b3e4mr11268253ejn.402.1669719748861; Tue, 29 Nov 2022 03:02:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669719748; cv=none; d=google.com; s=arc-20160816; b=NK0H0pJ0Y3iAd8PAiOhiX9IIPS8D22CitwZcWYFmbci0z+soy/cCRQ4StmDil3yMgM T3P+4f5W0ORe2ChMA5+bZZxE08W3sxJ1a5zDaclEVYJ+POc2evu7Jv357MZ5+YEaSiX6 SG+rzZ0b3XkSuV8DxV2cxdiM2Gx2GV9iWvSJxhfoj8FpM0VOv5RGU1hYe54Jj/V1yPDe M75uU/6WVVrWtKE8r5jWoA/69HcW8Zk3SQB0tmOTXiT4LEHKqBcjseMxMysSy22AFNhz UYQng0h7YuKsnN3qu17cIUwu56B27NvQvfjbk4+Wk+mdWTbCrqD7nDycSE0IOWoPim49 ySGA== 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=hrodxjE3++JzSf9Q5uxlAVuutjj+cagca/Bct4wXLdY=; b=MpSXCd4cx4d0yqABnnV9j1eiROycTC/g87Yb7Kt3bbzbYGvUTTKLbz+JkGRJ9NyE01 gyTOnUZpdoiVayfZf3dtuNsN3/c9B4tjLvxzeH1rw5IPLB3NLWB9u23wO3R4idPK9/mw zETNxYbX0AVhlPYDiHLliwjJo7AIXNE+DaoEFbcpuQ8ZVkLj+XPExf813ossA2dJfDo0 fhp1yczzEo1XX1NWegh9AvdlUxYO67GR7mU+R+O7ATAdWLBJaTBeOO+TPaZ907QJIWnq nIAWcbnbVFVZI2KON2fcpFzh+ZZ6oJoErK4C960me/e8/Kc5A8KimIDZTFFP39UWsP/A 9ELg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20210112.gappssmtp.com header.s=20210112 header.b=f7KBupZK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id nc36-20020a1709071c2400b007b8b7da648dsi11849761ejc.658.2022.11.29.03.02.04; Tue, 29 Nov 2022 03:02:28 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@bgdev-pl.20210112.gappssmtp.com header.s=20210112 header.b=f7KBupZK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232740AbiK2LA4 (ORCPT + 99 others); Tue, 29 Nov 2022 06:00:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43254 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232490AbiK2LA2 (ORCPT ); Tue, 29 Nov 2022 06:00:28 -0500 Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DBF8560E93 for ; Tue, 29 Nov 2022 03:00:24 -0800 (PST) Received: by mail-wm1-x329.google.com with SMTP id h131-20020a1c2189000000b003d02dd48c45so8160472wmh.0 for ; Tue, 29 Nov 2022 03:00:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20210112.gappssmtp.com; s=20210112; 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=hrodxjE3++JzSf9Q5uxlAVuutjj+cagca/Bct4wXLdY=; b=f7KBupZKEv89MmEWL+Hpyk0X7yqUvKsNA2eKPe9MGoi6DP+Somr/3YKb7OsvtwSTL9 dPbAkNnxRy0WuXm+8OTJi49+lVB/BFdQFnW0kid+DoKNTybSKi9VXWQvUqGZj8cTeVqJ U3A9iRZYdjXEUHs1vpcHYhC/3SFrN1TxtEFI3B05Oj2ouJLmIfaKx0xPiuanMkmC1Y4d Ku5p0cblw0KdaQqG10TkMNTfF8OGlrKSV/aOaJgapXRU5bpNOQlIerlLZLjUafiIVfuL 2aLOSD7Ryz7lLNdwhBm7oEkTYu5/Mq0Unj1OomvGr35zP0BUpCwf4SULcOaNEwKpv8xI N2Dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=hrodxjE3++JzSf9Q5uxlAVuutjj+cagca/Bct4wXLdY=; b=2ch/JPyuBLk/bsO/YsHc3CGT+ROwvJHTOMogcxXjuYnUgh/KpQdpYUaHfAV1DHzxQB EZnXMXLYYlkWYghbCza7DU5V9tTTU/udqloH+/gRCOZl+dPeGhrerc9KSmBfYxxBdzeY sqdgPnyHVDCBSIl3qH1OV6zVBUv3HOTYMMYYN1MHcdIZAHzuTYhdyUW1qGQ/A8U7nkXf IjRL30gBo4uN2meGc664rAmZd2+Z9uFbijcUOXVoV+Bt4VQ8hBcdkzDLtlBOPEoPt2g9 T8/SCU0Az8xXcXQsQUNVMMJQC9pSyg0+gx1NFJ5GZolZF89uIi/jiTbeHWXf5fo4OjDl 9LWw== X-Gm-Message-State: ANoB5plZOEXB/TXgHdH0xHElBg5P/UR4R636FV1o4MFoRY4pN6H9eebF e2unajytPN5X5lyf7toaKVazhQ== X-Received: by 2002:a05:600c:6549:b0:3d0:5aa:b315 with SMTP id dn9-20020a05600c654900b003d005aab315mr38550158wmb.101.1669719623419; Tue, 29 Nov 2022 03:00:23 -0800 (PST) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:6b19:1d8e:fbca:fd02]) by smtp.gmail.com with ESMTPSA id q19-20020a1cf313000000b003a3170a7af9sm1617658wmq.4.2022.11.29.03.00.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Nov 2022 03:00:23 -0800 (PST) From: Bartosz Golaszewski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Greg Kroah-Hartman , Jiri Slaby , Srinivas Kandagatla , Vinod Koul , Alex Elder , =?utf-8?q?Ilp?= =?utf-8?q?o_J=C3=A4rvinen?= Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-serial@vger.kernel.org, Bartosz Golaszewski , Konrad Dybcio Subject: [PATCH v4 06/13] tty: serial: qcom-geni-serial: refactor qcom_geni_serial_isr() Date: Tue, 29 Nov 2022 12:00:05 +0100 Message-Id: <20221129110012.224685-7-brgl@bgdev.pl> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221129110012.224685-1-brgl@bgdev.pl> References: <20221129110012.224685-1-brgl@bgdev.pl> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_NONE 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750828055355855395?= X-GMAIL-MSGID: =?utf-8?q?1750828055355855395?= From: Bartosz Golaszewski Simplify the conditions in qcom_geni_serial_isr() and fix indentation. Signed-off-by: Bartosz Golaszewski Reviewed-by: Konrad Dybcio Reviewed-by: Ilpo Järvinen --- drivers/tty/serial/qcom_geni_serial.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qcom_geni_serial.c index ec2523736e99..fba02f71a874 100644 --- a/drivers/tty/serial/qcom_geni_serial.c +++ b/drivers/tty/serial/qcom_geni_serial.c @@ -827,20 +827,18 @@ static irqreturn_t qcom_geni_serial_isr(int isr, void *dev) if (m_irq_status & m_irq_en & (M_TX_FIFO_WATERMARK_EN | M_CMD_DONE_EN)) qcom_geni_serial_handle_tx(uport, m_irq_status & M_CMD_DONE_EN, - geni_status & M_GENI_CMD_ACTIVE); + geni_status & M_GENI_CMD_ACTIVE); - if (s_irq_status & S_GP_IRQ_0_EN || s_irq_status & S_GP_IRQ_1_EN) { + if (s_irq_status & (S_GP_IRQ_0_EN | S_GP_IRQ_1_EN)) { if (s_irq_status & S_GP_IRQ_0_EN) uport->icount.parity++; drop_rx = true; - } else if (s_irq_status & S_GP_IRQ_2_EN || - s_irq_status & S_GP_IRQ_3_EN) { + } else if (s_irq_status & (S_GP_IRQ_2_EN | S_GP_IRQ_3_EN)) { uport->icount.brk++; port->brk = true; } - if (s_irq_status & S_RX_FIFO_WATERMARK_EN || - s_irq_status & S_RX_FIFO_LAST_EN) + if (s_irq_status & (S_RX_FIFO_WATERMARK_EN | S_RX_FIFO_LAST_EN)) qcom_geni_serial_handle_rx(uport, drop_rx); out_unlock: