Merge tag 'soc-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[linux.git] / arch / arm / mach-imx / pm-imx6.c

diff --git a/arch/arm/mach-imx/pm-imx6.c b/arch/arm/mach-imx/pm-imx6.c
index 16f0d249f6a7aa0ef4a7e989f823858961519320..9392a8f4ef24bcbb31ad58a14623b23c6511afc1 100644 (file)
--- a/arch/arm/mach-imx/pm-imx6.c
+++ b/arch/arm/mach-imx/pm-imx6.c
@@ -241,7 +241,7 @@ static void imx6q_enable_wb(bool enable)
 
 int imx6q_set_lpm(enum mxc_cpu_pwr_mode mode)
 {
-       struct irq_desc *iomuxc_irq_desc;
+       struct irq_data *iomuxc_irq_data = irq_get_irq_data(32);
        u32 val = readl_relaxed(ccm_base + CLPCR);
 
        val &= ~BM_CLPCR_LPM;
@@ -288,10 +288,9 @@ int imx6q_set_lpm(enum mxc_cpu_pwr_mode mode)
         * 3) Software should mask IRQ #32 right after CCM Low-Power mode
         *    is set (set bits 0-1 of CCM_CLPCR).
         */
-       iomuxc_irq_desc = irq_to_desc(32);
-       imx_gpc_irq_unmask(&iomuxc_irq_desc->irq_data);
+       imx_gpc_irq_unmask(iomuxc_irq_data);
        writel_relaxed(val, ccm_base + CLPCR);
-       imx_gpc_irq_mask(&iomuxc_irq_desc->irq_data);
+       imx_gpc_irq_mask(iomuxc_irq_data);
 
        return 0;
 }