From wfp5p@virginia.edu Mon Mar 16 17:26:48 2009 From: Bill Pemberton Date: Mon, 16 Mar 2009 22:12:00 -0400 Subject: Staging: comedi: Remove daqboard2000_hw typedef To: greg@kroah.com Message-ID: <20090317021159.14467.24604.stgit@viridian.itc.Virginia.EDU> Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/daqboard2000.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) --- a/drivers/staging/comedi/drivers/daqboard2000.c +++ b/drivers/staging/comedi/drivers/daqboard2000.c @@ -167,7 +167,7 @@ static const struct comedi_lrange range_ } }; -typedef struct daqboard2000_hw { +struct daqboard2000_hw { volatile u16 acqControl; // 0x00 volatile u16 acqScanListFIFO; // 0x02 volatile u32 acqPacerClockDivLow; // 0x04 @@ -215,7 +215,7 @@ typedef struct daqboard2000_hw { volatile u16 trigDacs; // 0xbc volatile u16 fill14; // 0xbe volatile s16 dioP2ExpansionIO16Bit[32]; // 0xc0 -} daqboard2000_hw; +}; /* Scan Sequencer programming */ #define DAQBOARD2000_SeqStartScanList 0x0011 @@ -340,7 +340,7 @@ typedef struct { static void writeAcqScanListEntry(struct comedi_device * dev, u16 entry) { - daqboard2000_hw *fpga = devpriv->daq; + struct daqboard2000_hw *fpga = devpriv->daq; // comedi_udelay(4); fpga->acqScanListFIFO = entry & 0x00ff; @@ -397,7 +397,7 @@ static int daqboard2000_ai_insn_read(str struct comedi_insn * insn, unsigned int * data) { int i; - daqboard2000_hw *fpga = devpriv->daq; + struct daqboard2000_hw *fpga = devpriv->daq; int gain, chan, timeout; fpga->acqControl = @@ -468,7 +468,7 @@ static int daqboard2000_ao_insn_write(st { int i; int chan = CR_CHAN(insn->chanspec); - daqboard2000_hw *fpga = devpriv->daq; + struct daqboard2000_hw *fpga = devpriv->daq; int timeout; for (i = 0; i < insn->n; i++) { @@ -620,7 +620,7 @@ static void daqboard2000_adcStopDmaTrans static void daqboard2000_adcDisarm(struct comedi_device * dev) { - daqboard2000_hw *fpga = devpriv->daq; + struct daqboard2000_hw *fpga = devpriv->daq; /* Disable hardware triggers */ comedi_udelay(2); @@ -642,7 +642,7 @@ static void daqboard2000_adcDisarm(struc static void daqboard2000_activateReferenceDacs(struct comedi_device * dev) { - daqboard2000_hw *fpga = devpriv->daq; + struct daqboard2000_hw *fpga = devpriv->daq; int timeout; // Set the + reference dac value in the FPGA