shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 02:21:52 +09:00
Code Issues Packages Projects Releases Wiki Activity

staging: comedi: addi_apci_3120: move apci3120_di_insn_bits() to driver source

Browse Source 
Move this function from the included hwdrv_apci31210.c source file to the main
driver source file.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten
2014-11-04 10:54:41 -07:00
committed by Greg Kroah-Hartman
parent ae12280db7
commit c737b2ce4f
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
View File

@@ -1018,19 +1018,6 @@ static int apci3120_read_insn_timer(struct comedi_device *dev,
return insn->n;
}
static int apci3120_di_insn_bits(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn,
unsigned int *data)
{
unsigned int status;
status = inw(dev->iobase + APCI3120_STATUS_REG);
data[1] = APCI3120_STATUS_TO_DI_BITS(status);
return insn->n;
}
static int apci3120_ao_ready(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn,

13
drivers/staging/comedi/drivers/addi_apci_3120.c
View File

@@ -281,6 +281,19 @@ static void apci3120_ai_reset_fifo(struct comedi_device *dev)
#include "addi-data/hwdrv_apci3120.c"
static int apci3120_di_insn_bits(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn,
unsigned int *data)
{
unsigned int status;
status = inw(dev->iobase + APCI3120_STATUS_REG);
data[1] = APCI3120_STATUS_TO_DI_BITS(status);
return insn->n;
}
static int apci3120_do_insn_bits(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn,