Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2843e7f7 authored by Michael Ellerman's avatar Michael Ellerman Committed by Jeff Garzik
Browse files

Remove msic_dcr_read() in axon_msi.c 



msic_dcr_read() doesn't really do anything useful, just replace it with
direct calls to dcr_read().

Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent cdbd3865

arch/powerpc/platforms/cell/axon_msi.c

+2 −7
Original line number Diff line number Diff line
@@ -80,18 +80,13 @@ static void msic_dcr_write(struct axon_msic *msic, unsigned int dcr_n, u32 val) 
	dcr_write(msic->dcr_host, dcr_n, val);

}



static u32 msic_dcr_read(struct axon_msic *msic, unsigned int dcr_n)

{

	return dcr_read(msic->dcr_host, dcr_n);

}



static void axon_msi_cascade(unsigned int irq, struct irq_desc *desc)

{

	struct axon_msic *msic = get_irq_data(irq);

	u32 write_offset, msi;

	int idx;



	write_offset = msic_dcr_read(msic, MSIC_WRITE_OFFSET_REG);

	write_offset = dcr_read(msic->dcr_host, MSIC_WRITE_OFFSET_REG);

	pr_debug("axon_msi: original write_offset 0x%x\n", write_offset);



	/* write_offset doesn't wrap properly, so we have to mask it */
@@ -306,7 +301,7 @@ static int axon_msi_notify_reboot(struct notifier_block *nb, 
	list_for_each_entry(msic, &axon_msic_list, list) {

		pr_debug("axon_msi: disabling %s\n",

			  msic->irq_host->of_node->full_name);

		tmp  = msic_dcr_read(msic, MSIC_CTRL_REG);

		tmp  = dcr_read(msic->dcr_host, MSIC_CTRL_REG);

		tmp &= ~MSIC_CTRL_ENABLE & ~MSIC_CTRL_IRQ_ENABLE;

		msic_dcr_write(msic, MSIC_CTRL_REG, tmp);

	}