diff options
| author | Nicolin Chen <nicolinc@nvidia.com> | 2017-03-23 18:20:17 -0400 |
|---|---|---|
| committer | Stephen Wolfe <swolfe@nvidia.com> | 2018-07-27 17:12:44 -0400 |
| commit | 3ff9b80495a8c901d084f811594a7999d8bd620f (patch) | |
| tree | 616ead0baf99ee740441988dff8e9179b341b8c4 /include/linux | |
| parent | 76e7285415267ac9f21cb9acebe97edc5956aa80 (diff) | |
trusty: use #if IS_ENABLED() instead of #ifdef
The CONFIG_TRUSTY could be selected as a module while should
still work for trusty driver.
Prior to this patch, there're compile errors when selecting
CONFIG_TRUSTY=m:
drivers/trusty/trusty.c:93:5: error: redefinition of 'trusty_fast_call32'
drivers/trusty/trusty.c:109:5: error: redefinition of 'trusty_fast_call64'
So this patch just changes the "#ifdef" to "#if IS_ENABLED".
Bug 200305192
Change-Id: I867af8ce112be6eaf86c6bde311e248b1f601884
Signed-off-by: Nicolin Chen <nicolinc@nvidia.com>
Reviewed-on: http://git-master/r/1475902
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Sachin Nikam <snikam@nvidia.com>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/trusty/trusty.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/trusty/trusty.h b/include/linux/trusty/trusty.h index d6fffc710..542399d1b 100644 --- a/include/linux/trusty/trusty.h +++ b/include/linux/trusty/trusty.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (C) 2013 Google, Inc. | 2 | * Copyright (C) 2013 Google, Inc. |
| 3 | * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. | 3 | * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. |
| 4 | * | 4 | * |
| 5 | * This software is licensed under the terms of the GNU General Public | 5 | * This software is licensed under the terms of the GNU General Public |
| 6 | * License version 2, as published by the Free Software Foundation, and | 6 | * License version 2, as published by the Free Software Foundation, and |
| @@ -27,7 +27,7 @@ enum { | |||
| 27 | TRUSTY_DEV_ENABLED | 27 | TRUSTY_DEV_ENABLED |
| 28 | }; | 28 | }; |
| 29 | 29 | ||
| 30 | #ifdef CONFIG_TRUSTY | 30 | #if IS_ENABLED(CONFIG_TRUSTY) |
| 31 | s32 trusty_std_call32(struct device *dev, u32 smcnr, u32 a0, u32 a1, u32 a2); | 31 | s32 trusty_std_call32(struct device *dev, u32 smcnr, u32 a0, u32 a1, u32 a2); |
| 32 | s32 trusty_fast_call32(struct device *dev, u32 smcnr, u32 a0, u32 a1, u32 a2); | 32 | s32 trusty_fast_call32(struct device *dev, u32 smcnr, u32 a0, u32 a1, u32 a2); |
| 33 | #ifdef CONFIG_64BIT | 33 | #ifdef CONFIG_64BIT |
