Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 415a88ee authored by Abhimanyu Kapur's avatar Abhimanyu Kapur
Browse files

include: irqchip: msm-gpio: Fix the #ifdefs around gpio and pinctrl 



The #ifdefs were defined in such a way that PINCTRL and GPIO_MSM
were still related. Clean the #ifdefs and make PINCTRL and GPIO_MSM
be selectable individually.

Change-Id: I8212cd7e36a9b2924292afcd454ba1d3518d7ab5
Signed-off-by: default avatarAbhimanyu Kapur <abhimany@codeaurora.org>
parent ce42a34f

include/linux/irqchip/msm-gpio-irq.h

+8 −11
Original line number Diff line number Diff line
@@ -15,27 +15,24 @@ 


#include <linux/irq.h>



#if defined(CONFIG_GPIO_MSM_V1) || defined(CONFIG_GPIO_MSM_V2) \

		|| defined(CONFIG_GPIO_MSM_V3)

#ifndef CONFIG_USE_PINCTRL_IRQ

#if (defined(CONFIG_GPIO_MSM_V1) || defined(CONFIG_GPIO_MSM_V2) \

	|| defined(CONFIG_GPIO_MSM_V3) && !defined(CONFIG_USE_PINCTRL_IRQ))

int __init msm_gpio_of_init(struct device_node *node,

					struct device_node *parent);

extern struct irq_chip msm_gpio_irq_extn;

static inline int __init msm_tlmm_of_irq_init(struct device_node *node,

					struct device_node *parent)

{

	return 0;

}

#else

int __init msm_tlmm_of_irq_init(struct device_node *node,

					struct device_node *parent);

extern struct irq_chip mpm_tlmm_irq_extn;

#endif

#else

static inline int __init msm_gpio_of_init(struct device_node *node,

					struct device_node *parent)

{

	return 0;

}

static inline int __init msm_tlmm_of_irq_init(struct device_node *node,

					struct device_node *parent)

{

	return 0;

}

#endif

#endif /* MSM_GPIO_IRQ_H */
 
#endif