Unverified Commit aa0f58b4 authored by Petr Cvek's avatar Petr Cvek Committed by Paul Burton
Browse files

MIPS: lantiq: Move macro directly to iomem function 



Using the variable as a temporary holder for the macro of the register
offset value is not necessary. Move it directly to the IOMEM read/write
call.

Signed-off-by: default avatarPetr Cvek <petrcvekcz@gmail.com>
Signed-off-by: default avatarPaul Burton <paul.burton@mips.com>
Cc: hauke@hauke-m.de
Cc: john@phrozen.org
Cc: linux-mips@vger.kernel.org
Cc: openwrt-devel@lists.openwrt.org
Cc: pakahmar@hotmail.com
parent 1e279144

arch/mips/lantiq/irq.c

+8 −10
Original line number Diff line number Diff line
@@ -77,44 +77,42 @@ int ltq_eiu_get_irq(int exin) 


void ltq_disable_irq(struct irq_data *d)

{

	u32 ier = LTQ_ICU_IM0_IER;

	int offset = d->hwirq - MIPS_CPU_IRQ_CASCADE;

	int im = offset / INT_NUM_IM_OFFSET;



	offset %= INT_NUM_IM_OFFSET;

	ltq_icu_w32(im, ltq_icu_r32(im, ier) & ~BIT(offset), ier);

	ltq_icu_w32(im, ltq_icu_r32(im, LTQ_ICU_IM0_IER) & ~BIT(offset),

		    LTQ_ICU_IM0_IER);

}



void ltq_mask_and_ack_irq(struct irq_data *d)

{

	u32 ier = LTQ_ICU_IM0_IER;

	u32 isr = LTQ_ICU_IM0_ISR;

	int offset = d->hwirq - MIPS_CPU_IRQ_CASCADE;

	int im = offset / INT_NUM_IM_OFFSET;



	offset %= INT_NUM_IM_OFFSET;

	ltq_icu_w32(im, ltq_icu_r32(im, ier) & ~BIT(offset), ier);

	ltq_icu_w32(im, BIT(offset), isr);

	ltq_icu_w32(im, ltq_icu_r32(im, LTQ_ICU_IM0_IER) & ~BIT(offset),

		    LTQ_ICU_IM0_IER);

	ltq_icu_w32(im, BIT(offset), LTQ_ICU_IM0_ISR);

}



static void ltq_ack_irq(struct irq_data *d)

{

	u32 isr = LTQ_ICU_IM0_ISR;

	int offset = d->hwirq - MIPS_CPU_IRQ_CASCADE;

	int im = offset / INT_NUM_IM_OFFSET;



	offset %= INT_NUM_IM_OFFSET;

	ltq_icu_w32(im, BIT(offset), isr);

	ltq_icu_w32(im, BIT(offset), LTQ_ICU_IM0_ISR);

}



void ltq_enable_irq(struct irq_data *d)

{

	u32 ier = LTQ_ICU_IM0_IER;

	int offset = d->hwirq - MIPS_CPU_IRQ_CASCADE;

	int im = offset / INT_NUM_IM_OFFSET;



	offset %= INT_NUM_IM_OFFSET;

	ltq_icu_w32(im, ltq_icu_r32(im, ier) | BIT(offset), ier);

	ltq_icu_w32(im, ltq_icu_r32(im, LTQ_ICU_IM0_IER) | BIT(offset),

		    LTQ_ICU_IM0_IER);

}



static int ltq_eiu_settype(struct irq_data *d, unsigned int type)

CRA Git | Maintained and supported by SUSTech CRA and CCSE