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

Commit 70265d24 authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

staging: comedi, remove interrupt.h 



Remove interrupt wraparound. Use defines from linux/interrupt.h
instead.

Change also parameter types of functions taking ISR to irq_handler_t.

Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Cc: David Schleef <ds@schleef.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 232f6502

drivers/staging/comedi/comedi_rt.h

+3 −2
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <linux/errno.h>

#include <linux/spinlock.h>

#include <linux/delay.h>

#include <linux/interrupt.h>



#ifdef CONFIG_COMEDI_RT
@@ -56,8 +57,8 @@ 
#define rt_printk printk

#endif



int comedi_request_irq(unsigned int irq, irqreturn_t(*handler) (int,

		void *PT_REGS_ARG), unsigned long flags, const char *device,

int comedi_request_irq(unsigned int irq, irq_handler_t handler,

		unsigned long flags, const char *device,

		struct comedi_device *dev_id);

void comedi_free_irq(unsigned int irq, struct comedi_device *dev_id);

void comedi_rt_init(void);

drivers/staging/comedi/comedidev.h

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
#include <linux/mm.h>

#include <linux/init.h>

#include <linux/vmalloc.h>

#include "interrupt.h"

#include <linux/dma-mapping.h>

#include <linux/uaccess.h>

#include <linux/io.h>

drivers/staging/comedi/drivers/addi-data/addi_common.c

+2 −2
Original line number Diff line number Diff line
@@ -3003,7 +3003,7 @@ static int i_ADDI_Reset(struct comedi_device * dev) 
/*

+----------------------------------------------------------------------------+

| Function name     :                                                        |

|static void v_ADDI_Interrupt(int irq, void *d  PT_REGS_ARG)                 |

|static void v_ADDI_Interrupt(int irq, void *d)                 |

|                                        									 |

+----------------------------------------------------------------------------+

| Task              : Registerd interrupt routine						     |
@@ -3018,7 +3018,7 @@ static int i_ADDI_Reset(struct comedi_device * dev) 
+----------------------------------------------------------------------------+

*/



static irqreturn_t v_ADDI_Interrupt(int irq, void *d PT_REGS_ARG)

static irqreturn_t v_ADDI_Interrupt(int irq, void *d)

{

	struct comedi_device *dev = d;

	this_board->v_hwdrv_Interrupt(irq, d);

drivers/staging/comedi/drivers/addi-data/addi_common.h

+1 −1
Original line number Diff line number Diff line
@@ -443,6 +443,6 @@ static int i_ADDI_Attach(struct comedi_device *dev, struct comedi_devconfig *it) 
static int i_ADDI_Detach(struct comedi_device *dev);

static int i_ADDI_Reset(struct comedi_device *dev);



static irqreturn_t v_ADDI_Interrupt(int irq, void *d PT_REGS_ARG);

static irqreturn_t v_ADDI_Interrupt(int irq, void *d);

static int i_ADDIDATA_InsnReadEeprom(struct comedi_device *dev, struct comedi_subdevice *s,

				     struct comedi_insn *insn, unsigned int *data);

drivers/staging/comedi/drivers/adl_pci9111.c

+2 −1
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ Configuration options: 
#include "../comedidev.h"



#include <linux/delay.h>

#include <linux/interrupt.h>



#include "8253.h"

#include "comedi_pci.h"
@@ -884,7 +885,7 @@ static void pci9111_ai_munge(struct comedi_device * dev, struct comedi_subdevice 


#undef INTERRUPT_DEBUG



static irqreturn_t pci9111_interrupt(int irq, void *p_device PT_REGS_ARG)

static irqreturn_t pci9111_interrupt(int irq, void *p_device)

{

	struct comedi_device *dev = p_device;

	struct comedi_subdevice *subdevice = dev->read_subdev;