From 607e425314d72184b3fbcec6775067204f9746db Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 29 Oct 2012 16:53:53 -0700 Subject: [PATCH] --- yaml --- r: 337420 b: refs/heads/master c: 8581342bc74fef2403c693125a1b8139b4258195 h: refs/heads/master v: v3 --- [refs] | 2 +- .../comedi/drivers/addi-data/hwdrv_apci1032.c | 20 +++++++++++------- .../comedi/drivers/addi-data/hwdrv_apci1032.h | 21 ------------------- 3 files changed, 14 insertions(+), 29 deletions(-) diff --git a/[refs] b/[refs] index 4a6e00ff00ba..4742803054dd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dcd7ef332acb5e7b84aadb5d0049f605a8dbb5bf +refs/heads/master: 8581342bc74fef2403c693125a1b8139b4258195 diff --git a/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c b/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c index b209cfa0374e..e4e85f472f0f 100644 --- a/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c +++ b/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c @@ -84,8 +84,10 @@ static unsigned int ui_InterruptStatus; +----------------------------------------------------------------------------+ */ -int i_APCI1032_ConfigDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s, - struct comedi_insn *insn, unsigned int *data) +static int i_APCI1032_ConfigDigitalInput(struct comedi_device *dev, + struct comedi_subdevice *s, + struct comedi_insn *insn, + unsigned int *data) { struct addi_private *devpriv = dev->private; unsigned int ui_TmpValue; @@ -145,8 +147,10 @@ int i_APCI1032_ConfigDigitalInput(struct comedi_device *dev, struct comedi_subde | | +----------------------------------------------------------------------------+ */ -int i_APCI1032_Read1DigitalInput(struct comedi_device *dev, struct comedi_subdevice *s, - struct comedi_insn *insn, unsigned int *data) +static int i_APCI1032_Read1DigitalInput(struct comedi_device *dev, + struct comedi_subdevice *s, + struct comedi_insn *insn, + unsigned int *data) { struct addi_private *devpriv = dev->private; unsigned int ui_TmpValue = 0; @@ -188,8 +192,10 @@ int i_APCI1032_Read1DigitalInput(struct comedi_device *dev, struct comedi_subdev +----------------------------------------------------------------------------+ */ -int i_APCI1032_ReadMoreDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s, - struct comedi_insn *insn, unsigned int *data) +static int i_APCI1032_ReadMoreDigitalInput(struct comedi_device *dev, + struct comedi_subdevice *s, + struct comedi_insn *insn, + unsigned int *data) { struct addi_private *devpriv = dev->private; unsigned int ui_PortValue = data[0]; @@ -282,7 +288,7 @@ static void v_APCI1032_Interrupt(int irq, void *d) +----------------------------------------------------------------------------+ */ -int i_APCI1032_Reset(struct comedi_device *dev) +static int i_APCI1032_Reset(struct comedi_device *dev) { struct addi_private *devpriv = dev->private; diff --git a/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h b/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h index 58d2de4720d5..f0b32e8a81b7 100644 --- a/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h +++ b/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h @@ -40,24 +40,3 @@ #define ADDIDATA_ENABLE 1 #define ADDIDATA_DISABLE 0 - -/* Hardware Layer functions for Apci1032 */ - -/* -* DI for di read -*/ - -int i_APCI1032_ConfigDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s, - struct comedi_insn *insn, unsigned int *data); - -int i_APCI1032_Read1DigitalInput(struct comedi_device *dev, struct comedi_subdevice *s, - struct comedi_insn *insn, unsigned int *data); - -int i_APCI1032_ReadMoreDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s, - struct comedi_insn *insn, unsigned int *data); - -/* Interrupt functions..... */ - -static void v_APCI1032_Interrupt(int irq, void *d); -/* Reset */ -int i_APCI1032_Reset(struct comedi_device *dev);