Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 325216
b: refs/heads/master
c: 80f3023
h: refs/heads/master
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Sep 12, 2012
1 parent fe98d3b commit 14c2477
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 81 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ca82a6e7e37693a84de542d06f3700037cc56525
refs/heads/master: 80f3023b452655155e1e216dfc64ce6767982d0a
80 changes: 0 additions & 80 deletions trunk/drivers/staging/comedi/drivers/adl_pci9118.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -344,10 +344,6 @@ struct pci9118_private {
unsigned int ai_inttrig_start; /* TRIG_INT for start */
};

/*
==============================================================================
*/

static int check_channel_list(struct comedi_device *dev,
struct comedi_subdevice *s, int n_chan,
unsigned int *chanlist, int frontadd,
Expand All @@ -370,9 +366,6 @@ static void pci9118_calc_divisors(char mode, struct comedi_device *dev,
unsigned int *div1, unsigned int *div2,
char usessh, unsigned int chnsshfront);

/*
==============================================================================
*/
static int pci9118_insn_read_ai(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
Expand Down Expand Up @@ -427,9 +420,6 @@ static int pci9118_insn_read_ai(struct comedi_device *dev,

}

/*
==============================================================================
*/
static int pci9118_insn_write_ao(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
Expand All @@ -452,9 +442,6 @@ static int pci9118_insn_write_ao(struct comedi_device *dev,
return n;
}

/*
==============================================================================
*/
static int pci9118_insn_read_ao(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
Expand All @@ -469,9 +456,6 @@ static int pci9118_insn_read_ao(struct comedi_device *dev,
return n;
}

/*
==============================================================================
*/
static int pci9118_insn_bits_di(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
Expand All @@ -481,9 +465,6 @@ static int pci9118_insn_bits_di(struct comedi_device *dev,
return insn->n;
}

/*
==============================================================================
*/
static int pci9118_insn_bits_do(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
Expand All @@ -498,9 +479,6 @@ static int pci9118_insn_bits_do(struct comedi_device *dev,
return insn->n;
}

/*
==============================================================================
*/
static void interrupt_pci9118_ai_mode4_switch(struct comedi_device *dev)
{
struct pci9118_private *devpriv = dev->private;
Expand Down Expand Up @@ -541,9 +519,6 @@ static unsigned int defragment_dma_buffer(struct comedi_device *dev,
return j;
}

/*
==============================================================================
*/
static int move_block_from_dma(struct comedi_device *dev,
struct comedi_subdevice *s,
short *dma_buffer,
Expand All @@ -565,9 +540,6 @@ static int move_block_from_dma(struct comedi_device *dev,
return 0;
}

/*
==============================================================================
*/
static char pci9118_decode_error_status(struct comedi_device *dev,
struct comedi_subdevice *s,
unsigned char m)
Expand Down Expand Up @@ -621,9 +593,6 @@ static void pci9118_ai_munge(struct comedi_device *dev,
}
}

/*
==============================================================================
*/
static void interrupt_pci9118_ai_onesample(struct comedi_device *dev,
struct comedi_subdevice *s,
unsigned short int_adstat,
Expand Down Expand Up @@ -675,9 +644,6 @@ static void interrupt_pci9118_ai_onesample(struct comedi_device *dev,
comedi_event(dev, s);
}

/*
==============================================================================
*/
static void interrupt_pci9118_ai_dma(struct comedi_device *dev,
struct comedi_subdevice *s,
unsigned short int_adstat,
Expand Down Expand Up @@ -758,9 +724,6 @@ static void interrupt_pci9118_ai_dma(struct comedi_device *dev,
comedi_event(dev, s);
}

/*
==============================================================================
*/
static irqreturn_t interrupt_pci9118(int irq, void *d)
{
struct comedi_device *dev = d;
Expand Down Expand Up @@ -827,9 +790,6 @@ static irqreturn_t interrupt_pci9118(int irq, void *d)
return IRQ_HANDLED;
}

/*
==============================================================================
*/
static int pci9118_ai_inttrig(struct comedi_device *dev,
struct comedi_subdevice *s, unsigned int trignum)
{
Expand All @@ -853,9 +813,6 @@ static int pci9118_ai_inttrig(struct comedi_device *dev,
return 1;
}

/*
==============================================================================
*/
static int pci9118_ai_cmdtest(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_cmd *cmd)
Expand Down Expand Up @@ -1118,9 +1075,6 @@ static int pci9118_ai_cmdtest(struct comedi_device *dev,
return 0;
}

/*
==============================================================================
*/
static int Compute_and_setup_dma(struct comedi_device *dev)
{
struct pci9118_private *devpriv = dev->private;
Expand Down Expand Up @@ -1273,9 +1227,6 @@ static int Compute_and_setup_dma(struct comedi_device *dev)
return 0;
}

/*
==============================================================================
*/
static int pci9118_ai_docmd_sampl(struct comedi_device *dev,
struct comedi_subdevice *s)
{
Expand Down Expand Up @@ -1330,9 +1281,6 @@ static int pci9118_ai_docmd_sampl(struct comedi_device *dev,
return 0;
}

/*
==============================================================================
*/
static int pci9118_ai_docmd_dma(struct comedi_device *dev,
struct comedi_subdevice *s)
{
Expand Down Expand Up @@ -1403,9 +1351,6 @@ static int pci9118_ai_docmd_dma(struct comedi_device *dev,
return 0;
}

/*
==============================================================================
*/
static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
{
const struct boardtype *this_board = comedi_board(dev);
Expand Down Expand Up @@ -1641,9 +1586,6 @@ static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
return ret;
}

/*
==============================================================================
*/
static int check_channel_list(struct comedi_device *dev,
struct comedi_subdevice *s, int n_chan,
unsigned int *chanlist, int frontadd, int backadd)
Expand Down Expand Up @@ -1697,9 +1639,6 @@ static int check_channel_list(struct comedi_device *dev,
return 1;
}

/*
==============================================================================
*/
static int setup_channel_list(struct comedi_device *dev,
struct comedi_subdevice *s, int n_chan,
unsigned int *chanlist, int rot, int frontadd,
Expand Down Expand Up @@ -1806,10 +1745,6 @@ static int setup_channel_list(struct comedi_device *dev,
return 1; /* we can serve this with scan logic */
}

/*
==============================================================================
calculate 8254 divisors if they are used for dual timing
*/
static void pci9118_calc_divisors(char mode, struct comedi_device *dev,
struct comedi_subdevice *s,
unsigned int *tim1, unsigned int *tim2,
Expand Down Expand Up @@ -1852,9 +1787,6 @@ static void pci9118_calc_divisors(char mode, struct comedi_device *dev,
}
}

/*
==============================================================================
*/
static void start_pacer(struct comedi_device *dev, int mode,
unsigned int divisor1, unsigned int divisor2)
{
Expand All @@ -1871,9 +1803,6 @@ static void start_pacer(struct comedi_device *dev, int mode,
}
}

/*
==============================================================================
*/
static int pci9118_exttrg_add(struct comedi_device *dev, unsigned char source)
{
struct pci9118_private *devpriv = dev->private;
Expand All @@ -1889,9 +1818,6 @@ static int pci9118_exttrg_add(struct comedi_device *dev, unsigned char source)
return 0;
}

/*
==============================================================================
*/
static int pci9118_exttrg_del(struct comedi_device *dev, unsigned char source)
{
struct pci9118_private *devpriv = dev->private;
Expand All @@ -1911,9 +1837,6 @@ static int pci9118_exttrg_del(struct comedi_device *dev, unsigned char source)
return 0;
}

/*
==============================================================================
*/
static int pci9118_ai_cancel(struct comedi_device *dev,
struct comedi_subdevice *s)
{
Expand Down Expand Up @@ -1963,9 +1886,6 @@ static int pci9118_ai_cancel(struct comedi_device *dev,
return 0;
}

/*
==============================================================================
*/
static int pci9118_reset(struct comedi_device *dev)
{
struct pci9118_private *devpriv = dev->private;
Expand Down

0 comments on commit 14c2477

Please sign in to comment.