Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp356837pxj; Thu, 24 Jun 2021 00:26:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxCTbmxRrD17umfIY+TesyPx6BJqQG/YaJRJNdNterkbY7+ed84zyaHdvk473m8iAaFvbC7 X-Received: by 2002:a05:6402:c03:: with SMTP id co3mr5246100edb.21.1624519570028; Thu, 24 Jun 2021 00:26:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624519570; cv=none; d=google.com; s=arc-20160816; b=DwmfY3xcqAh3uLUbsvhgH1jvWiTV2logSZ7toeVnCHrWVHVI7VmRbROJECzXlLjmZG qKmmiDJ3Rzh9qf1l3mZIyuvDAKfKOpsTzAb/op6XT+cLOKwocjhPUC26GD/bZG2qvhfJ NDa7qJHS6443OivsCH3guq6gpkffjAJ7Ch/JSS/s+sJwBOzMVYm5Ljn2Z3DfG6ImFBJF oq1JYoGSNVQRs/+BrczNoK/Ru2FMWurDJwGBDAJYh4h5p0jVVU5eFEJdUjPVxL/4QHvz iGBOR2H6NzJDrXPMElATGMF+OsZIaLYZtYbnJxve1EZFFhlFUki7GIlyUWVZu/arb6yF dn3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:content-language :in-reply-to:mime-version:user-agent:date:message-id:organization :from:references:to:subject:ironport-sdr:ironport-sdr; bh=LQgDuLElxsQ6+Ut5bKnWX2Kbi42e5sr0xYbv73jUL6I=; b=na7OuIu0kgVG16ytvCKfV66A4SUjFKESsmAnodWfHo/zg6GI32u+qwAc52CoLJUD6L OIMgvQHOqjxZLpssFhfV5gbddzdAtK2kn4lOg7edv4jmZbmRBoFgc7kvdPRtklT5BLg1 qeG/mlFp2MkWBaV4AFJ5fejuO4fe9Wjf721jILm+nKT0+xn00Lx06IMtme4ceJHAW29S hU40RA4fbmPjxplwn7M5PJBphhnhc7Z72uKEhizzmAUigno0VBxwJKpx2H7hi7/7a/UN YvrmhVZbfDI6SC+jIzRamSh4qx6qUUc2Jlk2WF1+ON0FaGj0ktfyf8GiYXmmwR86dX/K eOMA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id o22si2286732edq.154.2021.06.24.00.25.46; Thu, 24 Jun 2021 00:26:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231464AbhFXH1K (ORCPT + 99 others); Thu, 24 Jun 2021 03:27:10 -0400 Received: from mga02.intel.com ([134.134.136.20]:27903 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230402AbhFXH1K (ORCPT ); Thu, 24 Jun 2021 03:27:10 -0400 IronPort-SDR: ACeHjnRIxo5gq0/JnzROf0KdByGO+0b4dmDtCJPKZ4qMUjVnQXV5kotNWuu50jeAsNtZxS//Tr Y8hv0q6ceiAg== X-IronPort-AV: E=McAfee;i="6200,9189,10024"; a="194554410" X-IronPort-AV: E=Sophos;i="5.83,296,1616482800"; d="scan'208";a="194554410" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Jun 2021 00:24:46 -0700 IronPort-SDR: byMIhorD8aj1Ehow8p51UHfc6vAhTFBXZbY33EiRdkdvjL8brvMKiWK+coiPtEfgKjC0Yo7K6t BvDjWu/2E+Ew== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,295,1616482800"; d="scan'208";a="406555503" Received: from ahunter-desktop.fi.intel.com (HELO [10.237.72.79]) ([10.237.72.79]) by orsmga006.jf.intel.com with ESMTP; 24 Jun 2021 00:24:42 -0700 Subject: Re: [PATCH] scsi: ufs: Refactor ufshcd_is_intr_aggr_allowed() To: keosung.park@samsung.com, "joe@perches.com" , ALIM AKHTAR , "avri.altman@wdc.com" , "jejb@linux.ibm.com" , "martin.petersen@oracle.com" , "stanley.chu@mediatek.com" , "cang@codeaurora.org" , "beanhuo@micron.com" , "asutoshd@codeaurora.org" , Kiwoong Kim , "satyat@google.com" , "bvanassche@acm.org" , "linux-scsi@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Joao Pinto , Pedro Sousa , Pedro Sousa References: <1891546521.01624267081897.JavaMail.epsvc@epcpadp4> <37380050.31624517282371.JavaMail.epsvc@epcpadp4> From: Adrian Hunter Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki Message-ID: <42c2978f-f0ca-3efb-7762-cac813a0a5fe@intel.com> Date: Thu, 24 Jun 2021 10:25:03 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <37380050.31624517282371.JavaMail.epsvc@epcpadp4> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 24/06/21 9:41 am, Keoseong Park wrote: >> On 21/06/21 11:51 am, Keoseong Park wrote: >>> Change conditional compilation to IS_ENABLED macro, >>> and simplify if else statement to return statement. >>> No functional change. >>> >>> Signed-off-by: Keoseong Park >>> --- >>> drivers/scsi/ufs/ufshcd.h | 17 ++++++++--------- >>> 1 file changed, 8 insertions(+), 9 deletions(-) >>> >>> diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h >>> index c98d540ac044..6d239a855753 100644 >>> --- a/drivers/scsi/ufs/ufshcd.h >>> +++ b/drivers/scsi/ufs/ufshcd.h >>> @@ -893,16 +893,15 @@ static inline bool ufshcd_is_rpm_autosuspend_allowed(struct ufs_hba *hba) >>> >>> static inline bool ufshcd_is_intr_aggr_allowed(struct ufs_hba *hba) >>> { >>> -/* DWC UFS Core has the Interrupt aggregation feature but is not detectable*/ >>> -#ifndef CONFIG_SCSI_UFS_DWC >>> - if ((hba->caps & UFSHCD_CAP_INTR_AGGR) && >>> - !(hba->quirks & UFSHCD_QUIRK_BROKEN_INTR_AGGR)) >>> + /* >>> + * DWC UFS Core has the Interrupt aggregation feature >>> + * but is not detectable. >>> + */ >>> + if (IS_ENABLED(CONFIG_SCSI_UFS_DWC)) >> >> Why is this needed? It seems like you could just set UFSHCD_CAP_INTR_AGGR >> and clear UFSHCD_QUIRK_BROKEN_INTR_AGGR instead? > > Hello Adrian, > Sorry for late reply. > > The code that returns true when CONFIG_SCSI_UFS_DWC is set in the original code > is only changed using the IS_ENABLED macro. > (Linux kernel coding style, 21) Conditional Compilation) > > When CONFIG_SCSI_UFS_DWC is not defined, the code for checking quirk > and caps has been moved to the newly added return statement below. Looking closer I cannot find CONFIG_SCSI_UFS_DWC at all. It seems like it never existed. Why should we not remove the code related to CONFIG_SCSI_UFS_DWC entirely? > > Thanks, > Keoseong > >> >>> return true; >>> - else >>> - return false; >>> -#else >>> -return true; >>> -#endif >>> + >>> + return (hba->caps & UFSHCD_CAP_INTR_AGGR) && >>> + !(hba->quirks & UFSHCD_QUIRK_BROKEN_INTR_AGGR); >>> } >>> >>> static inline bool ufshcd_can_aggressive_pc(struct ufs_hba *hba) >>> >>