Skip to content

Commit 99ac7cc

Browse files
committed
Revert "staging: comedi: core: introduce comedi_dio_insn_config()"
This reverts commit 4f76463. I applied an incorrect version here as well :( Cc: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 5dacadc commit 99ac7cc

File tree

2 files changed

+0
-44
lines changed

2 files changed

+0
-44
lines changed

drivers/staging/comedi/comedidev.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -342,10 +342,6 @@ void comedi_buf_memcpy_from(struct comedi_async *async, unsigned int offset,
342342

343343
/* drivers.c - general comedi driver functions */
344344

345-
int comedi_dio_insn_config(struct comedi_device *, struct comedi_subdevice *,
346-
struct comedi_insn *, unsigned int *data,
347-
unsigned int mask);
348-
349345
void *comedi_alloc_devpriv(struct comedi_device *, size_t);
350346
int comedi_alloc_subdevices(struct comedi_device *, int);
351347

drivers/staging/comedi/drivers.c

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -150,46 +150,6 @@ int insn_inval(struct comedi_device *dev, struct comedi_subdevice *s,
150150
return -EINVAL;
151151
}
152152

153-
/**
154-
* comedi_dio_insn_config() - boilerplate (*insn_config) for DIO subdevices.
155-
* @dev: comedi_device struct
156-
* @s: comedi_subdevice struct
157-
* @insn: comedi_insn struct
158-
* @data: parameters for the @insn
159-
* @mask: io_bits mask for grouped channels
160-
*/
161-
int comedi_dio_insn_config(struct comedi_device *dev,
162-
struct comedi_subdevice *s,
163-
struct comedi_insn *insn,
164-
unsigned int *data,
165-
unsigned int mask)
166-
{
167-
unsigned int chan_mask = 1 << CR_CHAN(insn->chanspec);
168-
169-
if (!mask)
170-
mask = chan_mask;
171-
172-
switch (data[0]) {
173-
case INSN_CONFIG_DIO_INPUT:
174-
s->io_bits &= ~mask;
175-
break;
176-
177-
case INSN_CONFIG_DIO_OUTPUT:
178-
s->io_bits |= mask;
179-
break;
180-
181-
case INSN_CONFIG_DIO_QUERY:
182-
data[1] = (s->io_bits & mask) ? COMEDI_OUTPUT : COMEDI_INPUT;
183-
return insn->n;
184-
185-
default:
186-
return -EINVAL;
187-
}
188-
189-
return 0;
190-
}
191-
EXPORT_SYMBOL_GPL(comedi_dio_insn_config);
192-
193153
static int insn_rw_emulate_bits(struct comedi_device *dev,
194154
struct comedi_subdevice *s,
195155
struct comedi_insn *insn, unsigned int *data)

0 commit comments

Comments
 (0)