From 31cfc1a256309859117c982c8799d951aa8446ab Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 30 Aug 2024 06:49:18 +0000 Subject: [PATCH] Revert "irqchip/imx-irqsteer: Handle runtime power management correctly" This reverts commit a590e8dea3df2639921f874d763be961dd74e8f9 which is commit 33b1c47d1fc0b5f06a393bb915db85baacba18ea upstream. It breaks the Android kernel abi and can be brought back in the future in an abi-safe way if it is really needed. Bug: 161946584 Change-Id: I881226ff7d30ae45297dfe4b4dc7337d7381b907 Signed-off-by: Greg Kroah-Hartman --- drivers/irqchip/irq-imx-irqsteer.c | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/drivers/irqchip/irq-imx-irqsteer.c b/drivers/irqchip/irq-imx-irqsteer.c index 23aafc52768c..e622dbd61463 100644 --- a/drivers/irqchip/irq-imx-irqsteer.c +++ b/drivers/irqchip/irq-imx-irqsteer.c @@ -35,7 +35,6 @@ struct irqsteer_data { int channel; struct irq_domain *domain; u32 *saved_reg; - struct device *dev; }; static int imx_irqsteer_get_reg_index(struct irqsteer_data *data, @@ -72,26 +71,10 @@ static void imx_irqsteer_irq_mask(struct irq_data *d) raw_spin_unlock_irqrestore(&data->lock, flags); } -static void imx_irqsteer_irq_bus_lock(struct irq_data *d) -{ - struct irqsteer_data *data = d->chip_data; - - pm_runtime_get_sync(data->dev); -} - -static void imx_irqsteer_irq_bus_sync_unlock(struct irq_data *d) -{ - struct irqsteer_data *data = d->chip_data; - - pm_runtime_put_autosuspend(data->dev); -} - static const struct irq_chip imx_irqsteer_irq_chip = { - .name = "irqsteer", - .irq_mask = imx_irqsteer_irq_mask, - .irq_unmask = imx_irqsteer_irq_unmask, - .irq_bus_lock = imx_irqsteer_irq_bus_lock, - .irq_bus_sync_unlock = imx_irqsteer_irq_bus_sync_unlock, + .name = "irqsteer", + .irq_mask = imx_irqsteer_irq_mask, + .irq_unmask = imx_irqsteer_irq_unmask, }; static int imx_irqsteer_irq_map(struct irq_domain *h, unsigned int irq, @@ -169,7 +152,6 @@ static int imx_irqsteer_probe(struct platform_device *pdev) if (!data) return -ENOMEM; - data->dev = &pdev->dev; data->regs = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(data->regs)) { dev_err(&pdev->dev, "failed to initialize reg\n");