From a842509e8fe27200abe1bf1d26bf740ea9ad8744 Mon Sep 17 00:00:00 2001 From: Matthias Maennich Date: Tue, 10 Dec 2019 10:59:17 +0000 Subject: [PATCH] ANDROID: Drop out of tree leftovers in drivers: pinctrl The patch "FROMLIST: drivers: pinctrl: msm: setup GPIO chip in hierarchy" got an equivalent change merged upstream. The merged version upstream differs from our version. Based on the comment in https://lore.kernel.org/lkml/20191113183506.GA18786@codeaurora.org/, we can drop this difference. See the leftover patch here: https://android.googlesource.com/kernel/common-patches/+/9df68ac052d13e6e5035d8c131a51cf55eb78c99/android-mainline/FROMLIST-drivers-pinctrl-msm-setup-GPIO-chip-in-hierarchy.patch This we can drop with this merged. Change-Id: If4c850701a6d095dccfe54cef9749513b3d89698 Cc: Lina Iyer Fixes: d3a196a37197 ("Merge 5.5-rc1 into android-mainline") Signed-off-by: Matthias Maennich --- drivers/pinctrl/qcom/pinctrl-msm.c | 10 ---------- drivers/pinctrl/qcom/pinctrl-msm.h | 2 -- 2 files changed, 12 deletions(-) diff --git a/drivers/pinctrl/qcom/pinctrl-msm.c b/drivers/pinctrl/qcom/pinctrl-msm.c index 059c5deb32d9..5d6f9f61ce02 100644 --- a/drivers/pinctrl/qcom/pinctrl-msm.c +++ b/drivers/pinctrl/qcom/pinctrl-msm.c @@ -1174,16 +1174,6 @@ static int msm_gpio_init(struct msm_pinctrl *pctrl) } } - /* - * Since we are chained to the GIC using the TLMM summary line - * and in hierarchy with the wakeup parent interrupt controller, - * explicitly set the chained summary line. We need to do this because - * the summary line is not routed to the wakeup parent but directly - * to the GIC. - */ - gpiochip_set_chained_irqchip(chip, &pctrl->irq_chip, pctrl->irq, - msm_gpio_irq_handler); - return 0; } diff --git a/drivers/pinctrl/qcom/pinctrl-msm.h b/drivers/pinctrl/qcom/pinctrl-msm.h index 3ebf9493ad69..9452da18a78b 100644 --- a/drivers/pinctrl/qcom/pinctrl-msm.h +++ b/drivers/pinctrl/qcom/pinctrl-msm.h @@ -5,8 +5,6 @@ #ifndef __PINCTRL_MSM_H__ #define __PINCTRL_MSM_H__ -#include - struct pinctrl_pin_desc; /**