redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

irq-imx-irqsteer: fix compile error if CONFIG_PM_SLEEP is not set 

- Fixed a compile error in imx_irqsteer_chans_enable where the type name
  was used instead of the variable name
- Removed CONFIG_PM_SLEEP guards and marked runtime suspend api with
  __maybe_unused

Fixes: 1b98a50887 ("MLK-17290-01 irqchip: imx-irqsteer: add runtime pm support")
Signed-off-by: Michael Doswald <michael.doswald@schiller.ch>
(cherry picked from commit 391a7c6dfd13dbece8211b269d74c37875da0f67)
Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
5.4-rM2-2.2.x-imx-squashed
Michael Doswald 2020-11-05 14:31:10 +01:00 committed by Andrey Zhizhikin
parent 4068d70849
commit 7642303e41
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/irqchip/irq-imx-irqsteer.c
View File

@ -199,7 +199,7 @@ static int imx_irqsteer_chans_enable(struct irqsteer_data *data)
{
int ret;
ret = clk_prepare_enable(irqsteer_data->ipg_clk);
ret = clk_prepare_enable(data->ipg_clk);
if (ret) {
dev_err(data->dev, "failed to enable ipg clk: %d\n", ret);
return ret;
@ -329,8 +329,7 @@ static int imx_irqsteer_remove(struct platform_device *pdev)
return pm_runtime_force_suspend(&pdev->dev);
}
#ifdef CONFIG_PM_SLEEP
static void imx_irqsteer_init(struct irqsteer_data *data)
static void __maybe_unused imx_irqsteer_init(struct irqsteer_data *data)
{
/* steer all IRQs into configured channel */
writel_relaxed(BIT(data->channel), data->regs + CHANCTRL);
@ -341,7 +340,7 @@ static void imx_irqsteer_init(struct irqsteer_data *data)
data->inited = true;
}
static void imx_irqsteer_save_regs(struct irqsteer_data *data)
static void __maybe_unused imx_irqsteer_save_regs(struct irqsteer_data *data)
{
int i;
@ -350,7 +349,7 @@ static void imx_irqsteer_save_regs(struct irqsteer_data *data)
CHANMASK(i, data->reg_num));
}
static void imx_irqsteer_restore_regs(struct irqsteer_data *data)
static void __maybe_unused imx_irqsteer_restore_regs(struct irqsteer_data *data)
{
int i;
@ -360,7 +359,7 @@ static void imx_irqsteer_restore_regs(struct irqsteer_data *data)
data->regs + CHANMASK(i, data->reg_num));
}
static int imx_irqsteer_runtime_suspend(struct device *dev)
static int __maybe_unused imx_irqsteer_runtime_suspend(struct device *dev)
{
struct irqsteer_data *irqsteer_data = dev_get_drvdata(dev);
@ -370,7 +369,7 @@ static int imx_irqsteer_runtime_suspend(struct device *dev)
return 0;
}
static int imx_irqsteer_runtime_resume(struct device *dev)
static int __maybe_unused imx_irqsteer_runtime_resume(struct device *dev)
{
struct irqsteer_data *irqsteer_data = dev_get_drvdata(dev);
int ret;
@ -389,7 +388,6 @@ static int imx_irqsteer_runtime_resume(struct device *dev)
return 0;
}
#endif
static const struct dev_pm_ops imx_irqsteer_pm_ops = {
SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,