Skip to content

Commit

Permalink
irq-imx-irqsteer: fix compile error if CONFIG_PM_SLEEP is not set
Browse files Browse the repository at this point in the history
- 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: 1b98a50 ("MLK-17290-01 irqchip: imx-irqsteer: add runtime pm support")
Signed-off-by: Michael Doswald <michael.doswald@schiller.ch>
  • Loading branch information
MDoswaldSchiller committed Nov 6, 2020
1 parent 70d1232 commit 391a7c6
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions drivers/irqchip/irq-imx-irqsteer.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand All @@ -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;

Expand All @@ -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;

Expand All @@ -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);

Expand All @@ -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;
Expand All @@ -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,
Expand Down

0 comments on commit 391a7c6

Please sign in to comment.