Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 317405
b: refs/heads/master
c: 5207066
h: refs/heads/master
i:
  317403: 73002a0
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jun 19, 2012
1 parent f197239 commit 824daa9
Show file tree
Hide file tree
Showing 44 changed files with 4 additions and 200 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: 60ff46106744220506841c45f82576b9b56cf22e
refs/heads/master: 520706607befd1f5c20ec14db35d6be45791bc41
3 changes: 0 additions & 3 deletions trunk/drivers/staging/comedi/drivers/8255.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,6 @@ static int subdev_8255_insn(struct comedi_device *dev,
unsigned int bits;
unsigned int v;

if (insn->n != 2)
return -EINVAL;

mask = data[0];
bits = data[1];

Expand Down
6 changes: 0 additions & 6 deletions trunk/drivers/staging/comedi/drivers/acl7225b.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ static int acl7225b_do_insn(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
{
if (insn->n != 2)
return -EINVAL;

if (data[0]) {
s->state &= ~data[0];
s->state |= (data[0] & data[1]);
Expand All @@ -53,9 +50,6 @@ static int acl7225b_di_insn(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
{
if (insn->n != 2)
return -EINVAL;

data[1] = inb(dev->iobase + (unsigned long)s->private) |
(inb(dev->iobase + (unsigned long)s->private + 1) << 8);

Expand Down
2 changes: 0 additions & 2 deletions trunk/drivers/staging/comedi/drivers/adl_pci6208.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,6 @@ static int pci6208_ao_rinsn(struct comedi_device *dev,
* struct comedi_subdevice *s, */
/* struct comedi_insn *insn,unsigned int *data) */
/* { */
/* if(insn->n!=2)return -EINVAL; */

/* The insn data is a mask in data[0] and the new data
* in data[1], each channel cooresponding to a bit. */
/* if(data[0]){ */
Expand Down
6 changes: 0 additions & 6 deletions trunk/drivers/staging/comedi/drivers/adl_pci7230.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,6 @@ static int adl_pci7230_do_insn_bits(struct comedi_device *dev,
struct comedi_insn *insn,
unsigned int *data)
{
if (insn->n != 2)
return -EINVAL;

if (data[0]) {
s->state &= ~data[0];
s->state |= (data[0] & data[1]);
Expand All @@ -72,9 +69,6 @@ static int adl_pci7230_di_insn_bits(struct comedi_device *dev,
struct comedi_insn *insn,
unsigned int *data)
{
if (insn->n != 2)
return -EINVAL;

data[1] = inl(dev->iobase + PCI7230_DI) & 0xffffffff;

return 2;
Expand Down
6 changes: 0 additions & 6 deletions trunk/drivers/staging/comedi/drivers/adl_pci7432.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,6 @@ static int adl_pci7432_do_insn_bits(struct comedi_device *dev,
printk(KERN_DEBUG "comedi: pci7432_do_insn_bits called\n");
printk(KERN_DEBUG "comedi: data0: %8x data1: %8x\n", data[0], data[1]);

if (insn->n != 2)
return -EINVAL;

if (data[0]) {
s->state &= ~data[0];
s->state |= (data[0] & data[1]);
Expand All @@ -79,9 +76,6 @@ static int adl_pci7432_di_insn_bits(struct comedi_device *dev,
printk(KERN_DEBUG "comedi: pci7432_di_insn_bits called\n");
printk(KERN_DEBUG "comedi: data0: %8x data1: %8x\n", data[0], data[1]);

if (insn->n != 2)
return -EINVAL;

data[1] = inl(dev->iobase + PCI7432_DI) & 0xffffffff;
printk(KERN_DEBUG "comedi: data1 %8x\n", data[1]);

Expand Down
6 changes: 0 additions & 6 deletions trunk/drivers/staging/comedi/drivers/aio_iiro_16.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,6 @@ static int aio_iiro_16_dio_insn_bits_write(struct comedi_device *dev,
struct comedi_insn *insn,
unsigned int *data)
{
if (insn->n != 2)
return -EINVAL;

if (data[0]) {
s->state &= ~data[0];
s->state |= data[0] & data[1];
Expand All @@ -91,9 +88,6 @@ static int aio_iiro_16_dio_insn_bits_read(struct comedi_device *dev,
struct comedi_insn *insn,
unsigned int *data)
{
if (insn->n != 2)
return -EINVAL;

data[1] = 0;
data[1] |= inb(dev->iobase + AIO_IIRO_16_INPUT_0_7);
data[1] |= inb(dev->iobase + AIO_IIRO_16_INPUT_8_15) << 8;
Expand Down
3 changes: 0 additions & 3 deletions trunk/drivers/staging/comedi/drivers/amplc_pc263.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,6 @@ static int pc263_do_insn_bits(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
{
if (insn->n != 2)
return -EINVAL;

/* The insn data is a mask in data[0] and the new data
* in data[1], each channel cooresponding to a bit. */
if (data[0]) {
Expand Down
3 changes: 0 additions & 3 deletions trunk/drivers/staging/comedi/drivers/cb_das16_cs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -549,9 +549,6 @@ static int das16cs_dio_insn_bits(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
{
if (insn->n != 2)
return -EINVAL;

if (data[0]) {
s->state &= ~data[0];
s->state |= data[0] & data[1];
Expand Down
2 changes: 0 additions & 2 deletions trunk/drivers/staging/comedi/drivers/comedi_bond.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,6 @@ static int bonding_dio_insn_bits(struct comedi_device *dev,
{
#define LSAMPL_BITS (sizeof(unsigned int)*8)
unsigned nchans = LSAMPL_BITS, num_done = 0, i;
if (insn->n != 2)
return -EINVAL;

if (devpriv->nchans < nchans)
nchans = devpriv->nchans;
Expand Down
3 changes: 0 additions & 3 deletions trunk/drivers/staging/comedi/drivers/comedi_parport.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,6 @@ static int parport_intr_insn(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
{
if (insn->n < 1)
return -EINVAL;

data[1] = 0;
return 2;
}
Expand Down
6 changes: 0 additions & 6 deletions trunk/drivers/staging/comedi/drivers/contec_pci_dio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,6 @@ static int contec_do_insn_bits(struct comedi_device *dev,
dev_dbg(dev->class_dev, "contec_do_insn_bits called\n");
dev_dbg(dev->class_dev, "data: %d %d\n", data[0], data[1]);

if (insn->n != 2)
return -EINVAL;

if (data[0]) {
s->state &= ~data[0];
s->state |= data[0] & data[1];
Expand All @@ -95,9 +92,6 @@ static int contec_di_insn_bits(struct comedi_device *dev,
dev_dbg(dev->class_dev, "contec_di_insn_bits called\n");
dev_dbg(dev->class_dev, "data: %d %d\n", data[0], data[1]);

if (insn->n != 2)
return -EINVAL;

data[1] = inw(dev->iobase + thisboard->in_offs);

return 2;
Expand Down
3 changes: 0 additions & 3 deletions trunk/drivers/staging/comedi/drivers/dmm32at.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -914,9 +914,6 @@ static int dmm32at_dio_insn_bits(struct comedi_device *dev,
{
unsigned char diobits;

if (insn->n != 2)
return -EINVAL;

/* The insn data is a mask in data[0] and the new data
* in data[1], each channel cooresponding to a bit. */
if (data[0]) {
Expand Down
2 changes: 0 additions & 2 deletions trunk/drivers/staging/comedi/drivers/dt2801.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -535,8 +535,6 @@ static int dt2801_dio_insn_bits(struct comedi_device *dev,
if (s == dev->subdevices + 4)
which = 1;

if (insn->n != 2)
return -EINVAL;
if (data[0]) {
s->state &= ~data[0];
s->state |= (data[0] & data[1]);
Expand Down
6 changes: 0 additions & 6 deletions trunk/drivers/staging/comedi/drivers/dt2811.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -352,9 +352,6 @@ static int dt2811_di_insn_bits(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
{
if (insn->n != 2)
return -EINVAL;

data[1] = inb(dev->iobase + DT2811_DIO);

return 2;
Expand All @@ -364,9 +361,6 @@ static int dt2811_do_insn_bits(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
{
if (insn->n != 2)
return -EINVAL;

s->state &= ~data[0];
s->state |= data[0] & data[1];
outb(s->state, dev->iobase + DT2811_DIO);
Expand Down
3 changes: 0 additions & 3 deletions trunk/drivers/staging/comedi/drivers/dt3000.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -745,9 +745,6 @@ static int dt3k_dio_insn_bits(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
{
if (insn->n != 2)
return -EINVAL;

if (data[0]) {
s->state &= ~data[0];
s->state |= data[1] & data[0];
Expand Down
6 changes: 0 additions & 6 deletions trunk/drivers/staging/comedi/drivers/dyna_pci10xx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,9 +189,6 @@ static int dyna_pci10xx_di_insn_bits(struct comedi_device *dev,
{
u16 d = 0;

if (insn->n != 2)
return -EINVAL;

mutex_lock(&devpriv->mutex);
smp_mb();
d = inw_p(devpriv->BADR3);
Expand All @@ -209,9 +206,6 @@ static int dyna_pci10xx_do_insn_bits(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
{
if (insn->n != 2)
return -EINVAL;

/* The insn data is a mask in data[0] and the new data
* in data[1], each channel cooresponding to a bit.
* s->state contains the previous write data
Expand Down
11 changes: 0 additions & 11 deletions trunk/drivers/staging/comedi/drivers/me4000.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1643,17 +1643,6 @@ static int me4000_dio_insn_bits(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
{
/* Length of data must be 2 (mask and new data, see below) */
if (insn->n == 0)
return 0;

if (insn->n != 2) {
printk
("comedi%d: me4000: me4000_dio_insn_bits(): "
"Invalid instruction length\n", dev->minor);
return -EINVAL;
}

/*
* The insn data consists of a mask in data[0] and the new data
* in data[1]. The mask defines which bits we are concerning about.
Expand Down
6 changes: 0 additions & 6 deletions trunk/drivers/staging/comedi/drivers/multiq3.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,6 @@ static int multiq3_di_insn_bits(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
{
if (insn->n != 2)
return -EINVAL;

data[1] = inw(dev->iobase + MULTIQ3_DIGIN_PORT);

return 2;
Expand All @@ -173,9 +170,6 @@ static int multiq3_do_insn_bits(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
{
if (insn->n != 2)
return -EINVAL;

s->state &= ~data[0];
s->state |= (data[0] & data[1]);
outw(s->state, dev->iobase + MULTIQ3_DIGOUT_PORT);
Expand Down
8 changes: 0 additions & 8 deletions trunk/drivers/staging/comedi/drivers/ni_6527.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,9 +174,6 @@ static int ni6527_di_insn_bits(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
{
if (insn->n != 2)
return -EINVAL;

data[1] = readb(devpriv->mite->daq_io_addr + Port_Register(0));
data[1] |= readb(devpriv->mite->daq_io_addr + Port_Register(1)) << 8;
data[1] |= readb(devpriv->mite->daq_io_addr + Port_Register(2)) << 16;
Expand All @@ -188,8 +185,6 @@ static int ni6527_do_insn_bits(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
{
if (insn->n != 2)
return -EINVAL;
if (data[0]) {
s->state &= ~data[0];
s->state |= (data[0] & data[1]);
Expand Down Expand Up @@ -339,9 +334,6 @@ static int ni6527_intr_insn_bits(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
{
if (insn->n < 1)
return -EINVAL;

data[1] = 0;
return 2;
}
Expand Down
6 changes: 1 addition & 5 deletions trunk/drivers/staging/comedi/drivers/ni_65xx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -415,8 +415,7 @@ static int ni_65xx_dio_insn_bits(struct comedi_device *dev,
const unsigned max_ports_per_bitfield = 5;
unsigned read_bits = 0;
unsigned j;
if (insn->n != 2)
return -EINVAL;

base_bitfield_channel = CR_CHAN(insn->chanspec);
for (j = 0; j < max_ports_per_bitfield; ++j) {
const unsigned port_offset =
Expand Down Expand Up @@ -602,9 +601,6 @@ static int ni_65xx_intr_insn_bits(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
{
if (insn->n < 1)
return -EINVAL;

data[1] = 0;
return 2;
}
Expand Down
3 changes: 0 additions & 3 deletions trunk/drivers/staging/comedi/drivers/ni_670x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -306,9 +306,6 @@ static int ni_670x_dio_insn_bits(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
{
if (insn->n != 2)
return -EINVAL;

/* The insn data is a mask in data[0] and the new data
* in data[1], each channel cooresponding to a bit. */
if (data[0]) {
Expand Down
3 changes: 0 additions & 3 deletions trunk/drivers/staging/comedi/drivers/ni_at_ao.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -239,9 +239,6 @@ static int atao_dio_insn_bits(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
{
if (insn->n != 2)
return -EINVAL;

if (data[0]) {
s->state &= ~data[0];
s->state |= data[0] & data[1];
Expand Down
3 changes: 0 additions & 3 deletions trunk/drivers/staging/comedi/drivers/ni_atmio16d.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -599,9 +599,6 @@ static int atmio16d_dio_insn_bits(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
{
if (insn->n != 2)
return -EINVAL;

if (data[0]) {
s->state &= ~data[0];
s->state |= (data[0] | data[1]);
Expand Down
9 changes: 2 additions & 7 deletions trunk/drivers/staging/comedi/drivers/ni_mio_common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3567,8 +3567,7 @@ static int ni_dio_insn_bits(struct comedi_device *dev,
#ifdef DEBUG_DIO
printk("ni_dio_insn_bits() mask=0x%x bits=0x%x\n", data[0], data[1]);
#endif
if (insn->n != 2)
return -EINVAL;

if (data[0]) {
/* Perform check to make sure we're not using the
serial part of the dio */
Expand Down Expand Up @@ -3629,8 +3628,7 @@ static int ni_m_series_dio_insn_bits(struct comedi_device *dev,
printk("ni_m_series_dio_insn_bits() mask=0x%x bits=0x%x\n", data[0],
data[1]);
#endif
if (insn->n != 2)
return -EINVAL;

if (data[0]) {
s->state &= ~data[0];
s->state |= (data[0] & data[1]);
Expand Down Expand Up @@ -5485,9 +5483,6 @@ static int ni_rtsi_insn_bits(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
{
if (insn->n != 2)
return -EINVAL;

data[1] = 0;

return 2;
Expand Down
2 changes: 0 additions & 2 deletions trunk/drivers/staging/comedi/drivers/ni_pcidio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -745,8 +745,6 @@ static int ni_pcidio_insn_bits(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
{
if (insn->n != 2)
return -EINVAL;
if (data[0]) {
s->state &= ~data[0];
s->state |= (data[0] & data[1]);
Expand Down
Loading

0 comments on commit 824daa9

Please sign in to comment.