staging: comedi, remove interrupt.h
PATCH RESEND 1/8 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.
--- drivers/staging/comedi/comedi_rt.h | 5 +- drivers/staging/comedi/comedidev.h | 1 - .../staging/comedi/drivers/addi-data/addi_common.c | 4 +- .../staging/comedi/drivers/addi-data/addi_common.h | 2 +- drivers/staging/comedi/drivers/adl_pci9111.c | 3 +- drivers/staging/comedi/drivers/adl_pci9118.c | 3 +- drivers/staging/comedi/drivers/adv_pci1710.c | 4 +- drivers/staging/comedi/drivers/amplc_dio200.c | 4 +- drivers/staging/comedi/drivers/amplc_pc236.c | 6 ++- drivers/staging/comedi/drivers/amplc_pci224.c | 4 +- drivers/staging/comedi/drivers/amplc_pci230.c | 6 ++- drivers/staging/comedi/drivers/cb_das16_cs.c | 4 +- drivers/staging/comedi/drivers/cb_pcidas.c | 5 +- drivers/staging/comedi/drivers/cb_pcidas64.c | 5 +- drivers/staging/comedi/drivers/comedi_parport.c | 3 +- drivers/staging/comedi/drivers/das16.c | 4 +- drivers/staging/comedi/drivers/das16m1.c | 4 +- drivers/staging/comedi/drivers/das1800.c | 4 +- drivers/staging/comedi/drivers/das6402.c | 2 +- drivers/staging/comedi/drivers/das800.c | 4 +- drivers/staging/comedi/drivers/dmm32at.c | 4 +- drivers/staging/comedi/drivers/dt2811.c | 2 +- drivers/staging/comedi/drivers/dt2814.c | 4 +- drivers/staging/comedi/drivers/dt282x.c | 2 +- drivers/staging/comedi/drivers/dt3000.c | 2 +- drivers/staging/comedi/drivers/gsc_hpdi.c | 4 +- drivers/staging/comedi/drivers/icp_multi.c | 2 +- drivers/staging/comedi/drivers/me4000.c | 4 +- drivers/staging/comedi/drivers/ni_6527.c | 2 +- drivers/staging/comedi/drivers/ni_65xx.c | 2 +- drivers/staging/comedi/drivers/ni_660x.c | 2 +- drivers/staging/comedi/drivers/ni_at_a2150.c | 4 +- drivers/staging/comedi/drivers/ni_atmio16d.c | 4 +- drivers/staging/comedi/drivers/ni_labpc.c | 4 +- drivers/staging/comedi/drivers/ni_mio_common.c | 2 +- drivers/staging/comedi/drivers/ni_pcidio.c | 2 +- drivers/staging/comedi/drivers/pcl711.c | 2 +- drivers/staging/comedi/drivers/pcl812.c | 2 +- drivers/staging/comedi/drivers/pcl816.c | 2 +- drivers/staging/comedi/drivers/pcl818.c | 2 +- drivers/staging/comedi/drivers/pcmmio.c | 4 +- drivers/staging/comedi/drivers/pcmuio.c | 4 +- drivers/staging/comedi/drivers/quatech_daqp_cs.c | 2 +- drivers/staging/comedi/drivers/rtd520.c | 5 +- drivers/staging/comedi/drivers/rti800.c | 4 +- drivers/staging/comedi/drivers/s626.c | 4 +- drivers/staging/comedi/drivers/usbduxfast.c | 2 +- drivers/staging/comedi/interrupt.h | 51 -------------------- drivers/staging/comedi/rt.c | 16 +++--- drivers/staging/comedi/rt_pend_tq.c | 2 +- 50 files changed, 94 insertions(+), 131 deletions(-) delete mode 100644 drivers/staging/comedi/interrupt.h
drivers/staging/comedi/comedi_rt.h +3 -2
@@ -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
@@ -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
@@ -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
@@ -457,6 +457,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
@@ -77,6 +77,7 @@ TODO:#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;
drivers/staging/comedi/drivers/adl_pci9118.c +2 -1
@@ -66,6 +66,7 @@ Configuration options:#include "../pci_ids.h" #include <linux/delay.h> +#include <linux/interrupt.h> #include "amcc_s5933.h" #include "8253.h"
@@ -674,7 +675,7 @@ static void interrupt_pci9118_ai_dma(struct comedi_device * dev, struct comedi_s/* ============================================================================== */ -static irqreturn_t interrupt_pci9118(int irq, void *d PT_REGS_ARG) +static irqreturn_t interrupt_pci9118 (int irq,void *d) {struct comedi_device *dev = d;unsigned int int_daq =0 , int_amcc, int_adstat;
drivers/staging/comedi/drivers/adv_pci1710.c +3 -1
@@ -41,6 +41,8 @@ Configuration options:device will be used. */ +#include <linux/interrupt.h> +#include "../comedidev.h" #include "comedi_pci.h"
@@ -760,7 +762,7 @@ static void interrupt_pci1710_half_fifo(void *d)/* ============================================================================== */ -static irqreturn_t interrupt_service_pci1710(int irq, void *d PT_REGS_ARG) +static irqreturn_t interrupt_service_pci1710 (int irq,void *d) {struct comedi_device *dev = d;
drivers/staging/comedi/drivers/amplc_dio200.c +3 -1
@@ -205,6 +205,8 @@ is packed into a short value, one bit per requested channel, in theorder they appear in the channel list. */ +#include <linux/interrupt.h> +#include "../comedidev.h" #include "comedi_pci.h"
@@ -1010,7 +1012,7 @@ dio200_subdev_intr_cleanup(struct comedi_device * dev, struct comedi_subdevice */* * Interrupt service routine. */ -static irqreturn_t dio200_interrupt(int irq, void *d PT_REGS_ARG) +static irqreturn_t dio200_interrupt (int irq,void *d) {struct comedi_device *dev = d;int handled;
drivers/staging/comedi/drivers/amplc_pc236.c +4 -2
@@ -52,6 +52,8 @@ the IRQ jumper. If no interrupt is connected, then subdevice 1 isunused. */ +#include <linux/interrupt.h> +#include "../comedidev.h" #include "comedi_pci.h"
@@ -194,7 +196,7 @@ static int pc236_intr_cmdtest(struct comedi_device * dev, struct comedi_subdevic struct comedi_cmd * cmd);static int pc236_intr_cmd (struct comedi_device * dev,struct comedi_subdevice * s);static int pc236_intr_cancel (struct comedi_device * dev,struct comedi_subdevice * s); -static irqreturn_t pc236_interrupt(int irq, void *d PT_REGS_ARG); +static irqreturn_t pc236_interrupt (int irq,void *d);/* * This function looks for a PCI device matching the requested board name,
@@ -638,7 +640,7 @@ static int pc236_intr_cancel(struct comedi_device * dev, struct comedi_subdevice* Interrupt service routine. * Based on the comedi_parport driver. */ -static irqreturn_t pc236_interrupt(int irq, void *d PT_REGS_ARG) +static irqreturn_t pc236_interrupt (int irq,void *d) {struct comedi_device *dev = d;struct comedi_subdevice *s = dev->subdevices +1 ;
drivers/staging/comedi/drivers/amplc_pci224.c +3 -1
@@ -103,6 +103,8 @@ Caveats:correctly. */ +#include <linux/interrupt.h> +#include "../comedidev.h" #include "comedi_pci.h"
@@ -1212,7 +1214,7 @@ pci224_ao_munge(struct comedi_device * dev, struct comedi_subdevice * s, void *d/* * Interrupt handler. */ -static irqreturn_t pci224_interrupt(int irq, void *d PT_REGS_ARG) +static irqreturn_t pci224_interrupt (int irq,void *d) {struct comedi_device *dev = d;struct comedi_subdevice *s = &dev->subdevices[0 ];
drivers/staging/comedi/drivers/amplc_pci230.c +4 -2
@@ -187,9 +187,11 @@ Extra triggered scan functionality, interrupt bug-fix added by Steve Sharples.Support for PCI230+/260+, more triggered scan functionality, and workarounds for (or detection of) various hardware problems added by Ian Abbott. */ +#include "../comedidev.h" #include <linux/delay.h> +#include <linux/interrupt.h> #include "comedi_pci.h" #include "8253.h"
@@ -625,7 +627,7 @@ static void pci230_ct_setup_ns_mode(struct comedi_device * dev, unsigned int ct, unsigned int mode, uint64_t ns, unsigned int round);static void pci230_ns_to_single_timer (unsigned int *ns,unsigned int round);static void pci230_cancel_ct (struct comedi_device * dev,unsigned int ct); -static irqreturn_t pci230_interrupt(int irq, void *d PT_REGS_ARG); +static irqreturn_t pci230_interrupt (int irq,void *d);static int pci230_ao_cmdtest (struct comedi_device * dev,struct comedi_subdevice * s,struct comedi_cmd * cmd);static int pci230_ao_cmd (struct comedi_device * dev,struct comedi_subdevice * s);
@@ -2559,7 +2561,7 @@ static void pci230_cancel_ct(struct comedi_device * dev, unsigned int ct) }/* Interrupt handler */ -static irqreturn_t pci230_interrupt(int irq, void *d PT_REGS_ARG) +static irqreturn_t pci230_interrupt (int irq,void *d) {unsigned char status_int, valid_status_int;struct comedi_device *dev = (struct comedi_device *) d;
drivers/staging/comedi/drivers/cb_das16_cs.c +2 -2
@@ -108,7 +108,7 @@ static const struct comedi_lrange das16cs_ai_range = { 4, { } }; -static irqreturn_t das16cs_interrupt(int irq, void *d PT_REGS_ARG); +static irqreturn_t das16cs_interrupt (int irq,void *d);static int das16cs_ai_rinsn (struct comedi_device * dev,struct comedi_subdevice * s,struct comedi_insn * insn,unsigned int * data);static int das16cs_ai_cmd (struct comedi_device * dev,struct comedi_subdevice * s);
@@ -276,7 +276,7 @@ static int das16cs_detach(struct comedi_device * dev)return 0 ; } -static irqreturn_t das16cs_interrupt(int irq, void *d PT_REGS_ARG) +static irqreturn_t das16cs_interrupt (int irq,void *d) {//struct comedi_device *dev = d; return IRQ_HANDLED ;
drivers/staging/comedi/drivers/cb_pcidas.c +3 -2
@@ -63,6 +63,7 @@ analog triggering on 1602 series#include "../comedidev.h" #include <linux/delay.h> +#include <linux/interrupt.h> #include "8253.h" #include "8255.h"
@@ -468,7 +469,7 @@ static int cb_pcidas_ao_inttrig(struct comedi_device *dev, unsigned int trig_num);static int cb_pcidas_ao_cmdtest (struct comedi_device * dev,struct comedi_subdevice * s,struct comedi_cmd * cmd); -static irqreturn_t cb_pcidas_interrupt(int irq, void *d PT_REGS_ARG); +static irqreturn_t cb_pcidas_interrupt (int irq,void *d);static void handle_ao_interrupt (struct comedi_device * dev,unsigned int status);static int cb_pcidas_cancel (struct comedi_device * dev,struct comedi_subdevice * s);static int cb_pcidas_ao_cancel (struct comedi_device * dev,struct comedi_subdevice * s);
@@ -1476,7 +1477,7 @@ static int cb_pcidas_ao_inttrig(struct comedi_device *dev,return 0 ; } -static irqreturn_t cb_pcidas_interrupt(int irq, void *d PT_REGS_ARG) +static irqreturn_t cb_pcidas_interrupt (int irq,void *d) {struct comedi_device *dev = (struct comedi_device *) d;struct comedi_subdevice *s = dev->read_subdev;
drivers/staging/comedi/drivers/cb_pcidas64.c +3 -2
@@ -85,6 +85,7 @@ TODO:#include "../comedidev.h" #include <linux/delay.h> +#include <linux/interrupt.h> #include <asm/system.h> #include "comedi_pci.h"
@@ -1152,7 +1153,7 @@ static int ao_inttrig(struct comedi_device * dev, struct comedi_subdevice * subd unsigned int trig_num);static int ao_cmdtest (struct comedi_device * dev,struct comedi_subdevice * s,struct comedi_cmd * cmd); -static irqreturn_t handle_interrupt(int irq, void *d PT_REGS_ARG); +static irqreturn_t handle_interrupt (int irq,void *d);static int ai_cancel (struct comedi_device * dev,struct comedi_subdevice * s);static int ao_cancel (struct comedi_device * dev,struct comedi_subdevice * s);static int dio_callback (int dir,int port,int data,unsigned long arg);
@@ -3128,7 +3129,7 @@ static void handle_ao_interrupt(struct comedi_device * dev, unsigned short statucfc_handle_events (dev, s); } -static irqreturn_t handle_interrupt(int irq, void *d PT_REGS_ARG) +static irqreturn_t handle_interrupt (int irq,void *d) {struct comedi_device *dev = d;unsigned short status;
drivers/staging/comedi/drivers/comedi_parport.c +2 -1
@@ -82,6 +82,7 @@ pin, which can be used to wake up tasks.*/ #include "../comedidev.h" +#include <linux/interrupt.h> #include <linux/ioport.h> #define PARPORT_SIZE 3
@@ -274,7 +275,7 @@ static int parport_intr_cancel(struct comedi_device *dev, struct comedi_subdevicreturn 0 ; } -static irqreturn_t parport_interrupt(int irq, void *d PT_REGS_ARG) +static irqreturn_t parport_interrupt (int irq,void *d) {struct comedi_device *dev = d;struct comedi_subdevice *s = dev->subdevices +3 ;
drivers/staging/comedi/drivers/das16.c +2 -2
@@ -343,7 +343,7 @@ static void das16_ai_munge(struct comedi_device * dev, struct comedi_subdevice * void *array, unsigned int num_bytes, unsigned int start_chan_index);static void das16_reset (struct comedi_device * dev); -static irqreturn_t das16_dma_interrupt(int irq, void *d PT_REGS_ARG); +static irqreturn_t das16_dma_interrupt (int irq,void *d);static void das16_timer_interrupt (unsigned long arg);static void das16_interrupt (struct comedi_device * dev);
@@ -1135,7 +1135,7 @@ static int das16_ao_winsn(struct comedi_device * dev, struct comedi_subdevice *return i; } -static irqreturn_t das16_dma_interrupt(int irq, void *d PT_REGS_ARG) +static irqreturn_t das16_dma_interrupt (int irq,void *d) {int status;struct comedi_device *dev = d;
drivers/staging/comedi/drivers/das16m1.c +2 -2
@@ -144,7 +144,7 @@ static int das16m1_cmd_exec(struct comedi_device * dev, struct comedi_subdevicestatic int das16m1_cancel (struct comedi_device * dev,struct comedi_subdevice * s);static int das16m1_poll (struct comedi_device * dev,struct comedi_subdevice * s); -static irqreturn_t das16m1_interrupt(int irq, void *d PT_REGS_ARG); +static irqreturn_t das16m1_interrupt (int irq,void *d);static void das16m1_handler (struct comedi_device * dev,unsigned int status); static unsigned int das16m1_set_pacer(struct comedi_device * dev, unsigned int ns,
@@ -476,7 +476,7 @@ static int das16m1_poll(struct comedi_device * dev, struct comedi_subdevice * s)return s->async->buf_write_count - s->async->buf_read_count; } -static irqreturn_t das16m1_interrupt(int irq, void *d PT_REGS_ARG) +static irqreturn_t das16m1_interrupt (int irq,void *d) {int status;struct comedi_device *dev = d;
drivers/staging/comedi/drivers/das1800.c +2 -2
@@ -184,7 +184,7 @@ static int das1800_attach(struct comedi_device * dev, struct comedi_devconfig *static int das1800_detach (struct comedi_device * dev);static int das1800_probe (struct comedi_device * dev);static int das1800_cancel (struct comedi_device * dev,struct comedi_subdevice * s); -static irqreturn_t das1800_interrupt(int irq, void *d PT_REGS_ARG); +static irqreturn_t das1800_interrupt (int irq,void *d);static int das1800_ai_poll (struct comedi_device * dev,struct comedi_subdevice * s);static void das1800_ai_handler (struct comedi_device * dev); static void das1800_handle_dma(struct comedi_device * dev, struct comedi_subdevice * s,
@@ -879,7 +879,7 @@ static int das1800_ai_poll(struct comedi_device * dev, struct comedi_subdevice *return s->async->buf_write_count - s->async->buf_read_count; } -static irqreturn_t das1800_interrupt(int irq, void *d PT_REGS_ARG) +static irqreturn_t das1800_interrupt (int irq,void *d) {struct comedi_device *dev = d;unsigned int status;
drivers/staging/comedi/drivers/das6402.c +1 -1
@@ -151,7 +151,7 @@ static void das6402_setcounter(struct comedi_device * dev)outb_p (p, dev->iobase +14 ); } -static irqreturn_t intr_handler(int irq, void *d PT_REGS_ARG) +static irqreturn_t intr_handler (int irq,void *d) {struct comedi_device *dev = d;struct comedi_subdevice *s = dev->subdevices;
drivers/staging/comedi/drivers/das800.c +2 -2
@@ -256,7 +256,7 @@ static struct comedi_driver driver_das800 = { offset:sizeof(struct das800_board), }; -static irqreturn_t das800_interrupt(int irq, void *d PT_REGS_ARG); +static irqreturn_t das800_interrupt (int irq,void *d);static void enable_das800 (struct comedi_device * dev);static void disable_das800 (struct comedi_device * dev); static int das800_ai_do_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s,
@@ -343,7 +343,7 @@ static int das800_probe(struct comedi_device * dev)COMEDI_INITCLEANUP (driver_das800);/* interrupt service routine */ -static irqreturn_t das800_interrupt(int irq, void *d PT_REGS_ARG) +static irqreturn_t das800_interrupt (int irq,void *d) {short i;/* loop index */ short dataPoint =0 ;
drivers/staging/comedi/drivers/dmm32at.c +2 -2
@@ -304,7 +304,7 @@ static int dmm32at_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevicstatic int dmm32at_ai_cmd (struct comedi_device * dev,struct comedi_subdevice * s);static int dmm32at_ai_cancel (struct comedi_device * dev,struct comedi_subdevice * s);static int dmm32at_ns_to_timer (unsigned int *ns,int round); -static irqreturn_t dmm32at_isr(int irq, void *d PT_REGS_ARG); +static irqreturn_t dmm32at_isr (int irq,void *d);void dmm32at_setaitimer (struct comedi_device * dev,unsigned int nansec);/*
@@ -828,7 +828,7 @@ static int dmm32at_ai_cancel(struct comedi_device * dev, struct comedi_subdevicereturn 0 ; } -static irqreturn_t dmm32at_isr(int irq, void *d PT_REGS_ARG) +static irqreturn_t dmm32at_isr (int irq,void *d) {unsigned char intstat;unsigned int samp;
drivers/staging/comedi/drivers/dt2811.c +1 -1
@@ -265,7 +265,7 @@ static const struct comedi_lrange *dac_range_types[] = {#define DT2811_TIMEOUT 5#if 0 -static irqreturn_t dt2811_interrupt(int irq, void *d PT_REGS_ARG) +static irqreturn_t dt2811_interrupt (int irq,void *d) {int lo, hi;int data;
drivers/staging/comedi/drivers/dt2814.c +2 -2
@@ -70,7 +70,7 @@ static struct comedi_driver driver_dt2814 = {COMEDI_INITCLEANUP (driver_dt2814); -static irqreturn_t dt2814_interrupt(int irq, void *dev PT_REGS_ARG); +static irqreturn_t dt2814_interrupt (int irq,void *dev);struct dt2814_private {
@@ -343,7 +343,7 @@ static int dt2814_detach(struct comedi_device * dev)return 0 ; } -static irqreturn_t dt2814_interrupt(int irq, void *d PT_REGS_ARG) +static irqreturn_t dt2814_interrupt (int irq,void *d) {int lo, hi;struct comedi_device *dev = d;
drivers/staging/comedi/drivers/dt282x.c +1 -1
@@ -577,7 +577,7 @@ static int prep_ao_dma(struct comedi_device * dev, int dma_index, int n)return n; } -static irqreturn_t dt282x_interrupt(int irq, void *d PT_REGS_ARG) +static irqreturn_t dt282x_interrupt (int irq,void *d) {struct comedi_device *dev = d;struct comedi_subdevice *s;
drivers/staging/comedi/drivers/dt3000.c +1 -1
@@ -347,7 +347,7 @@ static int debug_n_ints = 0;// FIXME! Assumes shared interrupt is for this card. // What's this debug_n_ints stuff? Obviously needs some work... -static irqreturn_t dt3k_interrupt(int irq, void *d PT_REGS_ARG) +static irqreturn_t dt3k_interrupt (int irq,void *d) {struct comedi_device *dev = d;struct comedi_subdevice *s;
drivers/staging/comedi/drivers/gsc_hpdi.c +2 -2
@@ -59,7 +59,7 @@ static int hpdi_cmd(struct comedi_device * dev, struct comedi_subdevice * s);static int hpdi_cmd_test (struct comedi_device * dev,struct comedi_subdevice * s,struct comedi_cmd * cmd);static int hpdi_cancel (struct comedi_device * dev,struct comedi_subdevice * s); -static irqreturn_t handle_interrupt(int irq, void *d PT_REGS_ARG); +static irqreturn_t handle_interrupt (int irq,void *d);static int dio_config_block_size (struct comedi_device * dev,unsigned int * data);#undef HPDI_DEBUG // disable debugging messages
@@ -945,7 +945,7 @@ static void drain_dma_buffers(struct comedi_device * dev, unsigned int channel)// XXX check for buffer overrun somehow } -static irqreturn_t handle_interrupt(int irq, void *d PT_REGS_ARG) +static irqreturn_t handle_interrupt (int irq,void *d) {struct comedi_device *dev = d;struct comedi_subdevice *s = dev->read_subdev;
drivers/staging/comedi/drivers/icp_multi.c +1 -1
@@ -618,7 +618,7 @@ static int icp_multi_insn_write_ctr(struct comedi_device *dev, struct comedi_sub============================================================================== */ -static irqreturn_t interrupt_service_icp_multi(int irq, void *d PT_REGS_ARG) +static irqreturn_t interrupt_service_icp_multi (int irq,void *d) {struct comedi_device *dev = d;int int_no;
drivers/staging/comedi/drivers/me4000.c +2 -2
@@ -183,7 +183,7 @@ static int ai_prepare(struct comedi_device *dev,static int ai_write_chanlist (struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_cmd *cmd); -static irqreturn_t me4000_ai_isr(int irq, void *dev_id PT_REGS_ARG); +static irqreturn_t me4000_ai_isr (int irq,void *dev_id);static int me4000_ai_do_cmd_test (struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_cmd *cmd);
@@ -1740,7 +1740,7 @@ static int me4000_ai_do_cmd_test(struct comedi_device *dev,return 0 ; } -static irqreturn_t me4000_ai_isr(int irq, void *dev_id PT_REGS_ARG) +static irqreturn_t me4000_ai_isr (int irq,void *dev_id) {unsigned int tmp;struct comedi_device *dev = dev_id;
drivers/staging/comedi/drivers/ni_6527.c +1 -1
@@ -212,7 +212,7 @@ static int ni6527_do_insn_bits(struct comedi_device * dev, struct comedi_subdevireturn 2 ; } -static irqreturn_t ni6527_interrupt(int irq, void *d PT_REGS_ARG) +static irqreturn_t ni6527_interrupt (int irq,void *d) {struct comedi_device *dev = d;struct comedi_subdevice *s = dev->subdevices +2 ;
drivers/staging/comedi/drivers/ni_65xx.c +1 -1
@@ -454,7 +454,7 @@ static int ni_65xx_dio_insn_bits(struct comedi_device * dev, struct comedi_subdereturn insn->n; } -static irqreturn_t ni_65xx_interrupt(int irq, void *d PT_REGS_ARG) +static irqreturn_t ni_65xx_interrupt (int irq,void *d) {struct comedi_device *dev = d;struct comedi_subdevice *s = dev->subdevices +2 ;
drivers/staging/comedi/drivers/ni_660x.c +1 -1
@@ -909,7 +909,7 @@ static void ni_660x_handle_gpct_interrupt(struct comedi_device * dev, } } -static irqreturn_t ni_660x_interrupt(int irq, void *d PT_REGS_ARG) +static irqreturn_t ni_660x_interrupt (int irq,void *d) {struct comedi_device *dev = d;struct comedi_subdevice *s;
drivers/staging/comedi/drivers/ni_at_a2150.c +2 -2
@@ -180,7 +180,7 @@ static struct comedi_driver driver_a2150 = { detach:a2150_detach, }; -static irqreturn_t a2150_interrupt(int irq, void *d PT_REGS_ARG); +static irqreturn_t a2150_interrupt (int irq,void *d);static int a2150_ai_cmdtest (struct comedi_device * dev,struct comedi_subdevice * s,struct comedi_cmd * cmd);static int a2150_ai_cmd (struct comedi_device * dev,struct comedi_subdevice * s);
@@ -209,7 +209,7 @@ static void ni_dump_regs(struct comedi_device * dev)#endif /* interrupt service routine */ -static irqreturn_t a2150_interrupt(int irq, void *d PT_REGS_ARG) +static irqreturn_t a2150_interrupt (int irq,void *d) {int i;int status;
drivers/staging/comedi/drivers/ni_atmio16d.c +2 -2
@@ -127,7 +127,7 @@ static const struct atmio16_board_t atmio16_boards[] = {/* function prototypes */ static int atmio16d_attach (struct comedi_device * dev,struct comedi_devconfig * it);static int atmio16d_detach (struct comedi_device * dev); -static irqreturn_t atmio16d_interrupt(int irq, void *d PT_REGS_ARG); +static irqreturn_t atmio16d_interrupt (int irq,void *d);static int atmio16d_ai_cmdtest (struct comedi_device * dev,struct comedi_subdevice * s,struct comedi_cmd * cmd);static int atmio16d_ai_cmd (struct comedi_device * dev,struct comedi_subdevice * s);
@@ -257,7 +257,7 @@ static void reset_atmio16d(struct comedi_device * dev)outw (2048 , dev->iobase +DAC1_REG ); } -static irqreturn_t atmio16d_interrupt(int irq, void *d PT_REGS_ARG) +static irqreturn_t atmio16d_interrupt (int irq,void *d) {struct comedi_device *dev = d;struct comedi_subdevice *s = dev->subdevices +0 ;
drivers/staging/comedi/drivers/ni_labpc.c +2 -2
@@ -165,7 +165,7 @@ NI manuals:static int labpc_attach (struct comedi_device * dev,struct comedi_devconfig * it);static int labpc_cancel (struct comedi_device * dev,struct comedi_subdevice * s); -static irqreturn_t labpc_interrupt(int irq, void *d PT_REGS_ARG); +static irqreturn_t labpc_interrupt (int irq,void *d);static int labpc_drain_fifo (struct comedi_device * dev);static void labpc_drain_dma (struct comedi_device * dev);static void handle_isa_dma (struct comedi_device * dev);
@@ -1309,7 +1309,7 @@ static int labpc_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s) }/* interrupt service routine */ -static irqreturn_t labpc_interrupt(int irq, void *d PT_REGS_ARG) +static irqreturn_t labpc_interrupt (int irq,void *d) {struct comedi_device *dev = d;struct comedi_subdevice *s = dev->read_subdev;
drivers/staging/comedi/drivers/ni_mio_common.c +1 -1
@@ -762,7 +762,7 @@ static inline void ni_set_bits(struct comedi_device * dev, int reg, unsigned bitni_set_bitfield (dev, reg, bits, bit_values); } -static irqreturn_t ni_E_interrupt(int irq, void *d PT_REGS_ARG) +static irqreturn_t ni_E_interrupt (int irq,void *d) {struct comedi_device *dev = d;unsigned short a_status;
drivers/staging/comedi/drivers/ni_pcidio.c +1 -1
@@ -479,7 +479,7 @@ void ni_pcidio_event(struct comedi_device * dev, struct comedi_subdevice * s)comedi_event (dev, s); } -static irqreturn_t nidio_interrupt(int irq, void *d PT_REGS_ARG) +static irqreturn_t nidio_interrupt (int irq,void *d) {struct comedi_device *dev = d;struct comedi_subdevice *s = dev->subdevices;
drivers/staging/comedi/drivers/pcl711.c +1 -1
@@ -185,7 +185,7 @@ struct pcl711_private {#define devpriv ((struct pcl711_private *)dev->private) -static irqreturn_t pcl711_interrupt(int irq, void *d PT_REGS_ARG) +static irqreturn_t pcl711_interrupt (int irq,void *d) {int lo, hi;int data;
drivers/staging/comedi/drivers/pcl812.c +1 -1
@@ -1061,7 +1061,7 @@ static irqreturn_t interrupt_pcl812_ai_dma(int irq, void *d)/* ============================================================================== */ -static irqreturn_t interrupt_pcl812(int irq, void *d PT_REGS_ARG) +static irqreturn_t interrupt_pcl812 (int irq,void *d) {struct comedi_device *dev = d;
drivers/staging/comedi/drivers/pcl816.c +1 -1
@@ -409,7 +409,7 @@ static irqreturn_t interrupt_pcl816_ai_mode13_dma(int irq, void *d)============================================================================== INT procedure */ -static irqreturn_t interrupt_pcl816(int irq, void *d PT_REGS_ARG) +static irqreturn_t interrupt_pcl816 (int irq,void *d) {struct comedi_device *dev = d;DPRINTK ("<I>" );
drivers/staging/comedi/drivers/pcl818.c +1 -1
@@ -810,7 +810,7 @@ static irqreturn_t interrupt_pcl818_ai_mode13_fifo(int irq, void *d)============================================================================== INT procedure */ -static irqreturn_t interrupt_pcl818(int irq, void *d PT_REGS_ARG) +static irqreturn_t interrupt_pcl818 (int irq,void *d) {struct comedi_device *dev = d;
drivers/staging/comedi/drivers/pcmmio.c +2 -2
@@ -300,7 +300,7 @@ static int pcmmio_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevstatic int pcmmio_dio_insn_config (struct comedi_device * dev,struct comedi_subdevice * s,struct comedi_insn * insn,unsigned int * data); -static irqreturn_t interrupt_pcmmio(int irq, void *d PT_REGS_ARG); +static irqreturn_t interrupt_pcmmio (int irq,void *d);static void pcmmio_stop_intr (struct comedi_device *,struct comedi_subdevice *);static int pcmmio_cancel (struct comedi_device * dev,struct comedi_subdevice * s);static int pcmmio_cmd (struct comedi_device * dev,struct comedi_subdevice * s);
@@ -765,7 +765,7 @@ static void unlock_port(struct comedi_device * dev, int asic, int port) }#endif /* notused */ -static irqreturn_t interrupt_pcmmio(int irq, void *d PT_REGS_ARG) +static irqreturn_t interrupt_pcmmio (int irq,void *d) {int asic, got1 =0 ;struct comedi_device *dev = (struct comedi_device *) d;
drivers/staging/comedi/drivers/pcmuio.c +2 -2
@@ -258,7 +258,7 @@ static int pcmuio_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevstatic int pcmuio_dio_insn_config (struct comedi_device * dev,struct comedi_subdevice * s,struct comedi_insn * insn,unsigned int * data); -static irqreturn_t interrupt_pcmuio(int irq, void *d PT_REGS_ARG); +static irqreturn_t interrupt_pcmuio (int irq,void *d);static void pcmuio_stop_intr (struct comedi_device *,struct comedi_subdevice *);static int pcmuio_cancel (struct comedi_device * dev,struct comedi_subdevice * s);static int pcmuio_cmd (struct comedi_device * dev,struct comedi_subdevice * s);
@@ -688,7 +688,7 @@ static void unlock_port(struct comedi_device * dev, int asic, int port) }#endif /* notused */ -static irqreturn_t interrupt_pcmuio(int irq, void *d PT_REGS_ARG) +static irqreturn_t interrupt_pcmuio (int irq,void *d) {int asic, got1 =0 ;struct comedi_device *dev = (struct comedi_device *) d;
drivers/staging/comedi/drivers/quatech_daqp_cs.c +1 -1
@@ -262,7 +262,7 @@ static int daqp_ai_cancel(struct comedi_device * dev, struct comedi_subdevice ** which run pretty quick. */ -static void daqp_interrupt(int irq, void *dev_id PT_REGS_ARG) +static void daqp_interrupt (int irq,void *dev_id) {struct local_info_t *local = (struct local_info_t *) dev_id;struct comedi_device *dev;
drivers/staging/comedi/drivers/rtd520.c +2 -3
@@ -706,7 +706,7 @@ static int rtd_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s);static int rtd_ai_cancel (struct comedi_device *dev,struct comedi_subdevice *s);/* static int rtd_ai_poll (struct comedi_device *dev,struct comedi_subdevice *s); */ static int rtd_ns_to_timer (unsigned int *ns,int roundMode); -static irqreturn_t rtd_interrupt(int irq, void *d PT_REGS_ARG); +static irqreturn_t rtd_interrupt (int irq,void *d);static int rtd520_probe_fifo_depth (struct comedi_device *dev);/*
@@ -1494,8 +1494,7 @@ static int ai_process_dma(struct comedi_device *dev, struct comedi_subdevice *s)The data conversion may someday happen in a "bottom half". */ static irqreturn_t rtd_interrupt (int irq,/* interrupt number (ignored) */ - void *d /* our data */ -PT_REGS_ARG ) +void *d)/* our data */ {/* cpu context (ignored) */ struct comedi_device *dev = d;/* must be called "dev" for devpriv */ u16 status;
drivers/staging/comedi/drivers/rti800.c +2 -2
@@ -145,7 +145,7 @@ static struct comedi_driver driver_rti800 = {COMEDI_INITCLEANUP (driver_rti800); -static irqreturn_t rti800_interrupt(int irq, void *dev PT_REGS_ARG); +static irqreturn_t rti800_interrupt (int irq,void *dev); struct rti800_private { enum {
@@ -172,7 +172,7 @@ struct rti800_private {#define RTI800_TIMEOUT 100 -static irqreturn_t rti800_interrupt(int irq, void *dev PT_REGS_ARG) +static irqreturn_t rti800_interrupt (int irq,void *dev) {return IRQ_HANDLED ; }
drivers/staging/comedi/drivers/s626.c +2 -2
@@ -253,7 +253,7 @@ static int s626_ns_to_timer(int *nanosec, int round_mode);static int s626_ai_load_polllist (uint8_t *ppl,struct comedi_cmd *cmd);static int s626_ai_inttrig (struct comedi_device *dev,struct comedi_subdevice *s,unsigned int trignum); -static irqreturn_t s626_irq_handler(int irq, void *d PT_REGS_ARG); +static irqreturn_t s626_irq_handler (int irq,void *d);static unsigned int s626_ai_reg_to_uint (int data);/* static unsigned int s626_uint_to_reg(struct comedi_subdevice *s, int data); */
@@ -968,7 +968,7 @@ static unsigned int s626_ai_reg_to_uint(int data)/* return 0; */ /* } */ -static irqreturn_t s626_irq_handler(int irq, void *d PT_REGS_ARG) +static irqreturn_t s626_irq_handler (int irq,void *d) {struct comedi_device *dev = d;struct comedi_subdevice *s;
drivers/staging/comedi/drivers/usbduxfast.c +1 -1
@@ -314,7 +314,7 @@ static int usbduxfast_ai_cancel(struct comedi_device *dev, struct comedi_subdevi* analogue IN * interrupt service routine */ -static void usbduxfastsub_ai_Irq(struct urb *urb PT_REGS_ARG) +static void usbduxfastsub_ai_Irq (struct urb *urb) {int n, err;struct usbduxfastsub_s *udfs;
drivers/staging/comedi/interrupt.h deleted +0 -51
51 lines not on this page · raw message
drivers/staging/comedi/rt.c +8 -8
@@ -27,6 +27,7 @@#include <linux/comedidev.h> #include <linux/errno.h> +#include <linux/interrupt.h> #include <linux/kernel.h> #include <linux/sched.h> #include <linux/fcntl.h>
@@ -54,7 +55,7 @@struct comedi_irq_struct {int rt;int irq; - irqreturn_t(*handler) (int irq, void *dev_id PT_REGS_ARG); +irq_handler_t handler;unsigned long flags;const char *device;struct comedi_device *dev_id;
@@ -65,9 +66,8 @@ static int comedi_rt_release_irq(struct comedi_irq_struct *it);static struct comedi_irq_struct *comedi_irqs[NR_IRQS ]; -int comedi_request_irq (unsigned irq,irqreturn_t (*handler) (int , -void *PT_REGS_ARG ),unsigned long flags,const char *device, -struct comedi_device *dev_id) +int comedi_request_irq (unsigned irq,irq_handler_t handler,unsigned long flags, +const char *device,struct comedi_device *dev_id) {struct comedi_irq_struct *it;int ret;
@@ -191,7 +191,7 @@ static void handle_void_irq(int irq)rt_printk ("comedi: null irq struct?\n" );return ; } - it->handler(irq, it->dev_id PT_REGS_NULL); + it->handler (irq, it->dev_id);rt_enable_irq (irq);/* needed by rtai-adeos, seems like it shouldn't hurt earlier versions */ }
@@ -307,7 +307,7 @@ static void fusion_handle_irq(unsigned int irq, void *cookie) {struct comedi_irq_struct *it = cookie; - it->handler(irq, it->dev_id PT_REGS_NULL); + it->handler (irq, it->dev_id);rthal_irq_enable (irq); }
@@ -340,14 +340,14 @@ void comedi_rt_cleanup(void)/* RTLinux section */ #ifdef CONFIG_COMEDI_RTL -static unsigned int handle_rtl_irq(unsigned int irq PT_REGS_ARG) +static unsigned int handle_rtl_irq (unsigned int irq) {struct comedi_irq_struct *it; it = comedi_irqs[irq];if (it ==NULL )return 0 ; - it->handler(irq, it->dev_id PT_REGS_NULL); + it->handler (irq, it->dev_id);rtl_hard_enable_irq (irq);return 0 ; }
drivers/staging/comedi/rt_pend_tq.c +1 -1
@@ -69,7 +69,7 @@ void rt_pend_irq_handler(void)#elif defined(CONFIG_COMEDI_FUSION ) void rt_pend_irq_handler(void *cookie)#elif defined(CONFIG_COMEDI_RTL ) -void rt_pend_irq_handler(int irq, void *dev PT_REGS_ARG) +void rt_pend_irq_handler(int irq, void *dev)#endif {while (rt_pend_head != rt_pend_tail) {
Signature · 1 line
1.6.2
PATCH RESEND 2/8 staging: agnx, probe cleanup
- switch printks to dev_*
- remove useless comments
- remove useless prints (for info we can obtain from lspci or /sys)
--- drivers/staging/agnx/pci.c | 34 ++++++++++++---------------------- 1 files changed, 12 insertions(+), 22 deletions(-)
drivers/staging/agnx/pci.c +12 -22
@@ -452,47 +452,39 @@ static int __devinit agnx_pci_probe(struct pci_dev *pdev, {struct ieee80211_hw *dev;struct agnx_priv *priv; -u32 mem_addr0, mem_len0; -u32 mem_addr1, mem_len1; +u32 mem_len0, mem_len1;int err;DECLARE_MAC_BUF (mac); err =pci_enable_device (pdev);if (err) { - printk(KERN_ERR PFX "Can't enable new PCI device\n"); +dev_err (&pdev->dev,"can't enable PCI device\n" );return err; } -/* get pci resource */ - mem_addr0 =pci_resource_start (pdev,0 ); mem_len0 =pci_resource_len (pdev,0 ); - mem_addr1 =pci_resource_start (pdev,1 ); mem_len1 =pci_resource_len (pdev,1 ); - printk(KERN_DEBUG PFX "Memaddr0 is %x, length is %x\n", mem_addr0, mem_len0); - printk(KERN_DEBUG PFX "Memaddr1 is %x, length is %x\n", mem_addr1, mem_len1); err =pci_request_regions (pdev,"agnx-pci" );if (err) { - printk(KERN_ERR PFX "Can't obtain PCI resource\n"); +dev_err (&pdev->dev,"can't reserve PCI resources\n" );return err; }if (pci_set_dma_mask (pdev,DMA_BIT_MASK (32 )) ||pci_set_consistent_dma_mask (pdev,DMA_BIT_MASK (32 ))) { - printk(KERN_ERR PFX "No suitable DMA available\n"); +dev_err (&pdev->dev,"no suitable DMA available\n" ); goto err_free_reg; }pci_set_master (pdev); - printk(KERN_DEBUG PFX "pdev->irq is %d\n", pdev->irq); dev =ieee80211_alloc_hw (sizeof (*priv), &agnx_ops);if (!dev) { - printk(KERN_ERR PFX "ieee80211 alloc failed\n"); +dev_err (&pdev->dev,"ieee80211 alloc failed\n" ); err = -ENOMEM ; goto err_free_reg; } -/* init priv */ priv = dev->priv;memset (priv,0 ,sizeof (*priv)); priv->mode =NL80211_IFTYPE_MONITOR ;
@@ -501,17 +493,15 @@ static int __devinit agnx_pci_probe(struct pci_dev *pdev,spin_lock_init (&priv->lock); priv->init_status =AGNX_UNINIT ; -/* Map mem #1 and #2 */ priv->ctl =pci_iomap (pdev,0 , mem_len0); -/* printk(KERN_DEBUG PFX"MEM1 mapped address is 0x%p\n", priv->ctl); */ +/* dev_dbg(&pdev->dev, "MEM1 mapped address is 0x%p\n", priv->ctl); */ if (!priv->ctl) { - printk(KERN_ERR PFX "Can't map device memory\n"); +dev_err (&pdev->dev,"can't map device memory\n" ); goto err_free_dev; } priv->data =pci_iomap (pdev,1 , mem_len1); - printk(KERN_DEBUG PFX "MEM2 mapped address is 0x%p\n", priv->data);if (!priv->data) { - printk(KERN_ERR PFX "Can't map device memory\n"); +dev_err (&pdev->dev,"can't map device memory\n" ); goto err_iounmap2; }
@@ -552,15 +542,15 @@ static int __devinit agnx_pci_probe(struct pci_dev *pdev, err =ieee80211_register_hw (dev);if (err) { - printk(KERN_ERR PFX "Can't register hardware\n"); +dev_err (&pdev->dev,"can't register hardware\n" ); goto err_iounmap; }agnx_hw_reset (priv); - -printk (PFX "%s: hwaddr %s, Rev 0x%02x\n" ,wiphy_name (dev->wiphy), -print_mac (mac, dev->wiphy->perm_addr), priv->revid); +dev_info (&pdev->dev,"%s: hwaddr %s, Rev 0x%02x\n" , +wiphy_name (dev->wiphy), +print_mac (mac, dev->wiphy->perm_addr), priv->revid);return 0 ; err_iounmap:
Signature · 1 line
1.6.2
PATCH RESEND 3/8 staging: agnx, remove memlens from probe
In reply to Jiri SlabyPass 0 to pci_iomap instead. It will cope with that per se.
--- drivers/staging/agnx/pci.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-)
drivers/staging/agnx/pci.c +2 -6
@@ -452,7 +452,6 @@ static int __devinit agnx_pci_probe(struct pci_dev *pdev, {struct ieee80211_hw *dev;struct agnx_priv *priv; -u32 mem_len0, mem_len1;int err;DECLARE_MAC_BUF (mac);
@@ -462,9 +461,6 @@ static int __devinit agnx_pci_probe(struct pci_dev *pdev,return err; } - mem_len0 =pci_resource_len (pdev,0 ); - mem_len1 =pci_resource_len (pdev,1 ); - err =pci_request_regions (pdev,"agnx-pci" );if (err) {dev_err (&pdev->dev,"can't reserve PCI resources\n" );
@@ -493,13 +489,13 @@ static int __devinit agnx_pci_probe(struct pci_dev *pdev,spin_lock_init (&priv->lock); priv->init_status =AGNX_UNINIT ; - priv->ctl =pci_iomap (pdev,0 , mem_len0); + priv->ctl =pci_iomap (pdev,0 ,0 );/* dev_dbg(&pdev->dev, "MEM1 mapped address is 0x%p\n", priv->ctl); */ if (!priv->ctl) {dev_err (&pdev->dev,"can't map device memory\n" ); goto err_free_dev; } - priv->data =pci_iomap (pdev,1 , mem_len1); + priv->data =pci_iomap (pdev,1 ,0 );if (!priv->data) {dev_err (&pdev->dev,"can't map device memory\n" ); goto err_iounmap2;
Signature · 1 line
1.6.2
PATCH RESEND 4/8 staging: agnx, fix fail paths in probe
In reply to Jiri SlabyReturn error on fail paths instead of 0.
--- drivers/staging/agnx/pci.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
drivers/staging/agnx/pci.c +3 -0
@@ -470,6 +470,7 @@ static int __devinit agnx_pci_probe(struct pci_dev *pdev,if (pci_set_dma_mask (pdev,DMA_BIT_MASK (32 )) ||pci_set_consistent_dma_mask (pdev,DMA_BIT_MASK (32 ))) {dev_err (&pdev->dev,"no suitable DMA available\n" ); + err = -EIO ; goto err_free_reg; }
@@ -493,11 +494,13 @@ static int __devinit agnx_pci_probe(struct pci_dev *pdev,/* dev_dbg(&pdev->dev, "MEM1 mapped address is 0x%p\n", priv->ctl); */ if (!priv->ctl) {dev_err (&pdev->dev,"can't map device memory\n" ); + err = -ENOMEM ; goto err_free_dev; } priv->data =pci_iomap (pdev,1 ,0 );if (!priv->data) {dev_err (&pdev->dev,"can't map device memory\n" ); + err = -ENOMEM ; goto err_iounmap2; }
Signature · 1 line
1.6.2
PATCH RESEND 5/8 staging: agnx, fix bssid compiler warnings
In reply to Jiri Slabyconf->bssid is const. Propagate const to not get compiler warnings:agnx/pci.c: In function ‘agnx_config_interface’:agnx/pci.c:319: warning: passing argument 2 of ‘agnx_set_bssid’ discards qualifiers from pointer target type agnx/pci.c:321: warning: passing argument 2 of ‘hash_write’ discards qualifiers from pointer target type
--- drivers/staging/agnx/phy.c | 4 ++-- drivers/staging/agnx/phy.h | 2 +- drivers/staging/agnx/sta.c | 2 +- drivers/staging/agnx/sta.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)
drivers/staging/agnx/phy.c +2 -2
@@ -118,7 +118,7 @@ static void mac_address_set(struct agnx_priv *priv)iowrite32 (reg, ctl +AGNX_RXM_MACLO ); } -static void receiver_bssid_set (struct agnx_priv *priv,u8 *bssid) +static void receiver_bssid_set (struct agnx_priv *priv,const u8 *bssid) {void __iomem *ctl = priv->ctl;u32 reg;
@@ -954,7 +954,7 @@ int agnx_set_ssid(struct agnx_priv *priv, u8 *ssid, size_t ssid_len)return 0 ; } -void agnx_set_bssid (struct agnx_priv *priv,u8 *bssid) +void agnx_set_bssid (struct agnx_priv *priv,const u8 *bssid) {receiver_bssid_set (priv, bssid); }
drivers/staging/agnx/phy.h +1 -1
@@ -401,7 +401,7 @@ u8 read_from_eeprom(struct agnx_priv *priv, u16 address);void agnx_hw_init (struct agnx_priv *priv);int agnx_hw_reset (struct agnx_priv *priv);int agnx_set_ssid (struct agnx_priv *priv,u8 *ssid,size_t ssid_len); -void agnx_set_bssid (struct agnx_priv *priv,u8 *bssid); +void agnx_set_bssid (struct agnx_priv *priv,const u8 *bssid);void enable_power_saving (struct agnx_priv *priv);void disable_power_saving (struct agnx_priv *priv);void calibrate_antenna_period (unsigned long data);
drivers/staging/agnx/sta.c +1 -1
@@ -22,7 +22,7 @@ void hash_read(struct agnx_priv *priv, u32 reghi, u32 reglo, u8 sta_id)printk (PFX "RX hash cmd are : %.8x%.8x\n" , reghi, reglo); } -void hash_write (struct agnx_priv *priv,u8 *mac_addr,u8 sta_id) +void hash_write (struct agnx_priv *priv,const u8 *mac_addr,u8 sta_id) {void __iomem *ctl = priv->ctl;u32 reghi, reglo;
drivers/staging/agnx/sta.h +1 -1
@@ -201,7 +201,7 @@ struct agnx_beacon_hdr {/* 802.11(abg) beacon */ } __attribute__((__packed__)); -void hash_write (struct agnx_priv *priv,u8 *mac_addr,u8 sta_id); +void hash_write (struct agnx_priv *priv,const u8 *mac_addr,u8 sta_id);void hash_dump (struct agnx_priv *priv,u8 sta_id);void hash_read (struct agnx_priv *priv,u32 reghi,u32 reglo,u8 sta_id);void hash_delete (struct agnx_priv *priv,u32 reghi,u32 reglo,u8 sta_id);
Signature · 1 line
1.6.2
PATCH RESEND 6/8 staging: meilhaus, switch to misc device
In reply to Jiri SlabyThere is no need to occupy one major number because of one device.
Switch to misc device, which also emits uevent, so that the dev node is also created by udev.
--- drivers/staging/meilhaus/memain.c | 64 ++++++------------------------------ 1 files changed, 11 insertions(+), 53 deletions(-)
drivers/staging/meilhaus/memain.c +11 -53
@@ -38,7 +38,7 @@//#include <linux/usb.h> #include <linux/errno.h> #include <linux/uaccess.h> -#include <linux/cdev.h> +#include <linux/miscdevice.h> #include <linux/rwsem.h> #include "medefines.h"
@@ -68,13 +68,6 @@ MODULE_PARM_DESC(me_bosch_fw, "Flags which signals the ME-4600 driver to load the bosch firmware (default = 0).");#endif //BOSCH -static unsigned int major =0 ; -#ifdef module_param -module_param (major, int,S_IRUGO ); -#else -MODULE_PARM (major,"i" ); -#endif -/* Global Driver Lock */
@@ -100,15 +93,10 @@ static int me_ioctl(struct inode *, struct file *, unsigned int, unsigned long);//static int me_probe_usb(struct usb_interface *interface, const struct usb_device_id *id); //static void me_disconnect_usb(struct usb_interface *interface); -/* Character device structure -*/ - -static struct cdev *cdevp; -/* File operations provided by the module */ -static struct file_operations me_file_operations = { +static const struct file_operations me_file_operations = { .owner =THIS_MODULE , .ioctl = me_ioctl, .open = me_open,
@@ -1910,11 +1898,16 @@ static int me_ioctl(struct inode *inodep,return -ENOTTY ; } +static struct miscdevice me_miscdev = { + .minor =MISC_DYNAMIC_MINOR , + .name =MEMAIN_NAME , + .fops = &me_file_operations, +}; +// Init and exit of module. static int memain_init (void ) {int result =0 ; -dev_t dev =MKDEV (major,0 );PDEBUG ("executed.\n" );
@@ -1943,46 +1936,14 @@ static int memain_init(void)} } */ -// Register the character device. -if (major) { - result =register_chrdev_region (dev,1 ,MEMAIN_NAME ); - }else { - result =alloc_chrdev_region (&dev,0 ,1 ,MEMAIN_NAME ); - major =MAJOR (dev); - } - + result =misc_register (&me_miscdev);if (result <0 ) { -PERROR ("Can't get major driver no.\n" ); + printk(KERN_ERR MEMAIN_NAME ": can't register misc device\n"); goto INIT_ERROR_3; } - cdevp =cdev_alloc (); - -if (!cdevp) { -PERROR ("Can't get character device structure.\n" ); - result = -ENOMEM ; - goto INIT_ERROR_4; - } - - cdevp->ops = &me_file_operations; - - cdevp->owner =THIS_MODULE ; - - result =cdev_add (cdevp, dev,1 ); - -if (result <0 ) { -PERROR ("Cannot add character device structure.\n" ); - goto INIT_ERROR_5; - } -return 0 ; - INIT_ERROR_5: -cdev_del (cdevp); - - INIT_ERROR_4: -unregister_chrdev_region (dev,1 ); - INIT_ERROR_3:// usb_deregister(&me_usb_driver);
@@ -1996,12 +1957,9 @@ static int memain_init(void) static void __exit memain_exit(void) { -dev_t dev =MKDEV (major,0 ); -PDEBUG ("executed.\n" ); -cdev_del (cdevp); -unregister_chrdev_region (dev,1 ); +misc_deregister (&me_miscdev);pci_unregister_driver (&me_pci_driver);// usb_deregister(&me_usb_driver); clear_device_list ();
Signature · 1 line
1.6.2
PATCH RESEND 7/8 staging: meilhaus, annotate cpi functions
In reply to Jiri SlabyAdd __devinit and __devexit to pci probe/remove. Also make pci_driver static.
--- drivers/staging/meilhaus/memain.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-)
drivers/staging/meilhaus/memain.c +5 -4
@@ -103,11 +103,11 @@ static const struct file_operations me_file_operations = { .release = me_release, }; -struct pci_driver me_pci_driver = { +static struct pci_driver me_pci_driver = { .name =MEMAIN_NAME , .id_table = me_pci_table, .probe = me_probe_pci, - .remove = me_remove_pci + .remove =__devexit_p (me_remove_pci), };/* //me_usb_driver
@@ -384,7 +384,8 @@ static me_device_t *get_dummy_instance(unsigned short vendor_id,return instance; } -static int me_probe_pci (struct pci_dev *dev,const struct pci_device_id *id) +static int __devinit me_probe_pci (struct pci_dev *dev, +const struct pci_device_id *id) {int err;me_pci_constructor_t constructor =NULL ;
@@ -582,7 +583,7 @@ static int insert_to_device_list(me_device_t *n_device)return 0 ; } -static void me_remove_pci (struct pci_dev *dev) +static void __devexit me_remove_pci(struct pci_dev *dev) {int vendor_id = dev->vendor;int device_id = dev->device;
Signature · 1 line
1.6.2
PATCH RESEND 8/8 staging: meilhaus, move tables to .c
In reply to Jiri SlabyRemove pci and usb tables from the header and place them directly in the code.
While at it, use PCI_VDEVICE() to shorten the code.
--- drivers/staging/meilhaus/memain.c | 109 ++++++++++++++++++++- drivers/staging/meilhaus/memain.h | 194 ------------------------------------- 2 files changed, 108 insertions(+), 195 deletions(-)
drivers/staging/meilhaus/memain.c +108 -1
@@ -103,6 +103,107 @@ static const struct file_operations me_file_operations = { .release = me_release, }; +static const struct pci_device_id me_pci_table[] = { + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME1000 ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME1000_A ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME1000_B ) }, + + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME1400 ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME140A ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME140B ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME14E0 ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME14EA ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME14EB ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME140C ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME140D ) }, + + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME1600_4U ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME1600_8U ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME1600_12U ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME1600_16U ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME1600_16U_8I ) }, + + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME4610 ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME4650 ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME4660 ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME4660I ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME4670 ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME4670I ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME4670S ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME4670IS ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME4680 ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME4680I ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME4680S ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME4680IS ) }, + + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME6004 ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME6008 ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME600F ) }, + + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME6014 ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME6018 ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME601F ) }, + + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME6034 ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME6038 ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME603F ) }, + + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME6104 ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME6108 ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME610F ) }, + + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME6114 ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME6118 ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME611F ) }, + + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME6134 ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME6138 ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME613F ) }, + + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME6044 ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME6048 ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME604F ) }, + + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME6054 ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME6058 ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME605F ) }, + + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME6074 ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME6078 ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME607F ) }, + + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME6144 ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME6148 ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME614F ) }, + + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME6154 ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME6158 ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME615F ) }, + + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME6174 ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME6178 ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME617F ) }, + + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME6259 ) }, + + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME6359 ) }, + + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME0630 ) }, + + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME8100_A ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME8100_B ) }, + + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME8200_A ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME8200_B ) }, + + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME0940 ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME0950 ) }, + {PCI_VDEVICE (MEILHAUS ,PCI_DEVICE_ID_MEILHAUS_ME0960 ) }, + + { } +}; +MODULE_DEVICE_TABLE (pci, me_pci_table); +static struct pci_driver me_pci_driver = { .name =MEMAIN_NAME , .id_table = me_pci_table,
@@ -110,7 +211,13 @@ static struct pci_driver me_pci_driver = { .remove = __devexit_p(me_remove_pci), }; -/* //me_usb_driver +/* +static struct usb_device_id me_usb_table[] = { +{ USB_DEVICE(USB_VENDOR_ID_MEPHISTO_S1, USB_DEVICE_ID_MEPHISTO_S1) }, +{ 0 } +}; +MODULE_DEVICE_TABLE (usb, me_usb_table); +static struct usb_driver me_usb_driver = { .name = MEMAIN_NAME,
drivers/staging/meilhaus/memain.h +0 -194
200 lines not on this page · raw message
Signature · 1 line
1.6.2