From 7ae39500fa2414d8b31d4660402e163fdd8fcfce Mon Sep 17 00:00:00 2001 From: David Collins Date: Wed, 6 Nov 2019 16:11:55 -0800 Subject: [PATCH] soc: qcom: qpnp-pbs: replace #ifdef with #if IS_ENABLED() Replace #ifdef CONFIG_QPNP_PBS with #if IS_ENABLED(CONFIG_QPNP_PBS). This fixes a function redefinition error when compiling the qpnp-pbs driver as a module with CONFIG_QPNP_PBS=m in a defconfig file. Change-Id: I2a6201a7a94423ce333c203c475dce319f922fdd Signed-off-by: David Collins --- include/linux/qpnp/qpnp-pbs.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/qpnp/qpnp-pbs.h b/include/linux/qpnp/qpnp-pbs.h index 6fcf78c839ae..5d410c31b5f5 100644 --- a/include/linux/qpnp/qpnp-pbs.h +++ b/include/linux/qpnp/qpnp-pbs.h @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * Copyright (c) 2017-2018, The Linux Foundation. All rights reserved. + * Copyright (c) 2017-2019, The Linux Foundation. All rights reserved. */ #ifndef _QPNP_PBS_H #define _QPNP_PBS_H -#ifdef CONFIG_QPNP_PBS +#if IS_ENABLED(CONFIG_QPNP_PBS) int qpnp_pbs_trigger_event(struct device_node *dev_node, u8 bitmap); #else static inline int qpnp_pbs_trigger_event(struct device_node *dev_node,