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

Commit e8f2af17 authored by Jeff Garzik's avatar Jeff Garzik Committed by Russell King
Browse files

[ARM] Misc minor interrupt handler cleanups 



mach-integrator/pci_v3.c: no need to reference 'irq' arg, its constant

mach-omap1/pm.c: remove extra whitespace

arch/arm/mach-sa1100/ssp.c: remove braces around single C stmt

arch/arm/plat-omap/mcbsp.c:
	- remove pointless casts from void*
	- make longer lines more readable

Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
Acked-by: default avatarLennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent f1a6de9c

arch/arm/mach-integrator/pci_v3.c

+5 −3
Original line number Diff line number Diff line
@@ -440,7 +440,7 @@ v3_pci_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs) 
	return 1;

}



static irqreturn_t v3_irq(int irq, void *devid)

static irqreturn_t v3_irq(int dummy, void *devid)

{

#ifdef CONFIG_DEBUG_LL

	struct pt_regs *regs = get_irq_regs();
@@ -448,8 +448,10 @@ static irqreturn_t v3_irq(int irq, void *devid) 
	unsigned long instr = *(unsigned long *)pc;

	char buf[128];



	sprintf(buf, "V3 int %d: pc=0x%08lx [%08lx] LBFADDR=%08x LBFCODE=%02x ISTAT=%02x\n", irq,

		pc, instr, __raw_readl(SC_LBFADDR), __raw_readl(SC_LBFCODE) & 255,

	sprintf(buf, "V3 int %d: pc=0x%08lx [%08lx] LBFADDR=%08x LBFCODE=%02x "

		"ISTAT=%02x\n", IRQ_AP_V3INT, pc, instr,

		__raw_readl(SC_LBFADDR),

		__raw_readl(SC_LBFCODE) & 255,

		v3_readb(V3_LB_ISTAT));

	printascii(buf);

#endif

arch/arm/mach-sa1100/ssp.c

+1 −2
Original line number Diff line number Diff line
@@ -29,9 +29,8 @@ static irqreturn_t ssp_interrupt(int irq, void *dev_id) 
{

	unsigned int status = Ser4SSSR;



	if (status & SSSR_ROR) {

	if (status & SSSR_ROR)

		printk(KERN_WARNING "SSP: receiver overrun\n");

	}



	Ser4SSSR = SSSR_ROR;

arch/arm/plat-omap/mcbsp.c

+12 −8
Original line number Diff line number Diff line
@@ -98,9 +98,10 @@ static void omap_mcbsp_dump_reg(u8 id) 


static irqreturn_t omap_mcbsp_tx_irq_handler(int irq, void *dev_id)

{

	struct omap_mcbsp * mcbsp_tx = (struct omap_mcbsp *)(dev_id);

	struct omap_mcbsp *mcbsp_tx = dev_id;



	DBG("TX IRQ callback : 0x%x\n", OMAP_MCBSP_READ(mcbsp_tx->io_base, SPCR2));

	DBG("TX IRQ callback : 0x%x\n",

	    OMAP_MCBSP_READ(mcbsp_tx->io_base, SPCR2));



	complete(&mcbsp_tx->tx_irq_completion);

	return IRQ_HANDLED;
@@ -108,9 +109,10 @@ static irqreturn_t omap_mcbsp_tx_irq_handler(int irq, void *dev_id) 


static irqreturn_t omap_mcbsp_rx_irq_handler(int irq, void *dev_id)

{

	struct omap_mcbsp * mcbsp_rx = (struct omap_mcbsp *)(dev_id);

	struct omap_mcbsp *mcbsp_rx = dev_id;



	DBG("RX IRQ callback : 0x%x\n", OMAP_MCBSP_READ(mcbsp_rx->io_base, SPCR2));

	DBG("RX IRQ callback : 0x%x\n",

	    OMAP_MCBSP_READ(mcbsp_rx->io_base, SPCR2));



	complete(&mcbsp_rx->rx_irq_completion);

	return IRQ_HANDLED;
@@ -118,9 +120,10 @@ static irqreturn_t omap_mcbsp_rx_irq_handler(int irq, void *dev_id) 


static void omap_mcbsp_tx_dma_callback(int lch, u16 ch_status, void *data)

{

	struct omap_mcbsp * mcbsp_dma_tx = (struct omap_mcbsp *)(data);

	struct omap_mcbsp *mcbsp_dma_tx = data;



	DBG("TX DMA callback : 0x%x\n", OMAP_MCBSP_READ(mcbsp_dma_tx->io_base, SPCR2));

	DBG("TX DMA callback : 0x%x\n",

	    OMAP_MCBSP_READ(mcbsp_dma_tx->io_base, SPCR2));



	/* We can free the channels */

	omap_free_dma(mcbsp_dma_tx->dma_tx_lch);
@@ -131,9 +134,10 @@ static void omap_mcbsp_tx_dma_callback(int lch, u16 ch_status, void *data) 


static void omap_mcbsp_rx_dma_callback(int lch, u16 ch_status, void *data)

{

	struct omap_mcbsp * mcbsp_dma_rx = (struct omap_mcbsp *)(data);

	struct omap_mcbsp *mcbsp_dma_rx = data;



	DBG("RX DMA callback : 0x%x\n", OMAP_MCBSP_READ(mcbsp_dma_rx->io_base, SPCR2));

	DBG("RX DMA callback : 0x%x\n",

	    OMAP_MCBSP_READ(mcbsp_dma_rx->io_base, SPCR2));



	/* We can free the channels */

	omap_free_dma(mcbsp_dma_rx->dma_rx_lch);

arch/arm/mach-omap1/pm.c

+1 −1

File changed.

Contains only whitespace changes.