diff mbox series

[v8,2/7] x86/dma: use IS_ENABLED() to simplify the code

Message ID 20190530034831.4184-3-thunder.leizhen@huawei.com
State Superseded
Headers show
Series iommu: enhance IOMMU default DMA mode build options | expand

Commit Message

Leizhen (ThunderTown) May 30, 2019, 3:48 a.m. UTC
This patch removes the ifdefs around CONFIG_IOMMU_DEFAULT_PASSTHROUGH to
improve readablity.

Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>

---
 arch/x86/kernel/pci-dma.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

-- 
1.8.3

Comments

Borislav Petkov June 12, 2019, 5:16 a.m. UTC | #1
On Thu, May 30, 2019 at 11:48:26AM +0800, Zhen Lei wrote:
> This patch removes the ifdefs around CONFIG_IOMMU_DEFAULT_PASSTHROUGH to

> improve readablity.


Avoid having "This patch" or "This commit" in the commit message. It is
tautologically useless.

Also, do

$ git grep 'This patch' Documentation/process

for more details.

> Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>

> ---

>  arch/x86/kernel/pci-dma.c | 7 ++-----

>  1 file changed, 2 insertions(+), 5 deletions(-)

> 

> diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c

> index dcd272dbd0a9330..9f2b19c35a060df 100644

> --- a/arch/x86/kernel/pci-dma.c

> +++ b/arch/x86/kernel/pci-dma.c

> @@ -43,11 +43,8 @@

>   * It is also possible to disable by default in kernel config, and enable with

>   * iommu=nopt at boot time.

>   */

> -#ifdef CONFIG_IOMMU_DEFAULT_PASSTHROUGH

> -int iommu_pass_through __read_mostly = 1;

> -#else

> -int iommu_pass_through __read_mostly;

> -#endif

> +int iommu_pass_through __read_mostly =

> +			IS_ENABLED(CONFIG_IOMMU_DEFAULT_PASSTHROUGH);


Let that line stick out.

Thx.

-- 
Regards/Gruss,
    Boris.

Good mailing practices for 400: avoid top-posting and trim the reply.
Leizhen (ThunderTown) June 12, 2019, 6:26 a.m. UTC | #2
On 2019/6/12 13:16, Borislav Petkov wrote:
> On Thu, May 30, 2019 at 11:48:26AM +0800, Zhen Lei wrote:

>> This patch removes the ifdefs around CONFIG_IOMMU_DEFAULT_PASSTHROUGH to

>> improve readablity.

> 

> Avoid having "This patch" or "This commit" in the commit message. It is

> tautologically useless.


OK, thanks.

> 

> Also, do

> 

> $ git grep 'This patch' Documentation/process

> 

> for more details.

> 

>> Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>

>> ---

>>  arch/x86/kernel/pci-dma.c | 7 ++-----

>>  1 file changed, 2 insertions(+), 5 deletions(-)

>>

>> diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c

>> index dcd272dbd0a9330..9f2b19c35a060df 100644

>> --- a/arch/x86/kernel/pci-dma.c

>> +++ b/arch/x86/kernel/pci-dma.c

>> @@ -43,11 +43,8 @@

>>   * It is also possible to disable by default in kernel config, and enable with

>>   * iommu=nopt at boot time.

>>   */

>> -#ifdef CONFIG_IOMMU_DEFAULT_PASSTHROUGH

>> -int iommu_pass_through __read_mostly = 1;

>> -#else

>> -int iommu_pass_through __read_mostly;

>> -#endif

>> +int iommu_pass_through __read_mostly =

>> +			IS_ENABLED(CONFIG_IOMMU_DEFAULT_PASSTHROUGH);

> 

> Let that line stick out.


OK, I will merge them on the same line.

> 

> Thx.

>
diff mbox series

Patch

diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
index dcd272dbd0a9330..9f2b19c35a060df 100644
--- a/arch/x86/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma.c
@@ -43,11 +43,8 @@ 
  * It is also possible to disable by default in kernel config, and enable with
  * iommu=nopt at boot time.
  */
-#ifdef CONFIG_IOMMU_DEFAULT_PASSTHROUGH
-int iommu_pass_through __read_mostly = 1;
-#else
-int iommu_pass_through __read_mostly;
-#endif
+int iommu_pass_through __read_mostly =
+			IS_ENABLED(CONFIG_IOMMU_DEFAULT_PASSTHROUGH);
 
 extern struct iommu_table_entry __iommu_table[], __iommu_table_end[];