aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/parport/parport_ip32.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/parport/parport_ip32.c')
-rw-r--r--drivers/parport/parport_ip32.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/parport/parport_ip32.c b/drivers/parport/parport_ip32.c
index 46e06e596d7..e3e19277030 100644
--- a/drivers/parport/parport_ip32.c
+++ b/drivers/parport/parport_ip32.c
@@ -548,10 +548,8 @@ static void parport_ip32_dma_setup_context(unsigned int limit)
548 * parport_ip32_dma_interrupt - DMA interrupt handler 548 * parport_ip32_dma_interrupt - DMA interrupt handler
549 * @irq: interrupt number 549 * @irq: interrupt number
550 * @dev_id: unused 550 * @dev_id: unused
551 * @regs: pointer to &struct pt_regs
552 */ 551 */
553static irqreturn_t parport_ip32_dma_interrupt(int irq, void *dev_id, 552static irqreturn_t parport_ip32_dma_interrupt(int irq, void *dev_id)
554 struct pt_regs *regs)
555{ 553{
556 if (parport_ip32_dma.left) 554 if (parport_ip32_dma.left)
557 pr_trace(NULL, "(%d): ctx=%d", irq, parport_ip32_dma.ctx); 555 pr_trace(NULL, "(%d): ctx=%d", irq, parport_ip32_dma.ctx);
@@ -560,8 +558,7 @@ static irqreturn_t parport_ip32_dma_interrupt(int irq, void *dev_id,
560} 558}
561 559
562#if DEBUG_PARPORT_IP32 560#if DEBUG_PARPORT_IP32
563static irqreturn_t parport_ip32_merr_interrupt(int irq, void *dev_id, 561static irqreturn_t parport_ip32_merr_interrupt(int irq, void *dev_id)
564 struct pt_regs *regs)
565{ 562{
566 pr_trace1(NULL, "(%d)", irq); 563 pr_trace1(NULL, "(%d)", irq);
567 return IRQ_HANDLED; 564 return IRQ_HANDLED;
@@ -772,13 +769,11 @@ static inline void parport_ip32_wakeup(struct parport *p)
772 * parport_ip32_interrupt - interrupt handler 769 * parport_ip32_interrupt - interrupt handler
773 * @irq: interrupt number 770 * @irq: interrupt number
774 * @dev_id: pointer to &struct parport 771 * @dev_id: pointer to &struct parport
775 * @regs: pointer to &struct pt_regs
776 * 772 *
777 * Caught interrupts are forwarded to the upper parport layer if IRQ_mode is 773 * Caught interrupts are forwarded to the upper parport layer if IRQ_mode is
778 * %PARPORT_IP32_IRQ_FWD. 774 * %PARPORT_IP32_IRQ_FWD.
779 */ 775 */
780static irqreturn_t parport_ip32_interrupt(int irq, void *dev_id, 776static irqreturn_t parport_ip32_interrupt(int irq, void *dev_id)
781 struct pt_regs *regs)
782{ 777{
783 struct parport * const p = dev_id; 778 struct parport * const p = dev_id;
784 struct parport_ip32_private * const priv = p->physport->private_data; 779 struct parport_ip32_private * const priv = p->physport->private_data;