From: Bill Pemberton <wfp5p@virginia.edu>
Date: Tue, 17 Mar 2009 02:12:00 +0000 (-0400)
Subject: Staging: comedi: Remove daqboard2000_hw typedef
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=79c7b392b32fc3154911fe3d8c65274cda5d5728;p=linux-beck.git

Staging: comedi: Remove daqboard2000_hw typedef

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/comedi/drivers/daqboard2000.c b/drivers/staging/comedi/drivers/daqboard2000.c
index a2408ebf9c8a..b02bf5c8d079 100644
--- a/drivers/staging/comedi/drivers/daqboard2000.c
+++ b/drivers/staging/comedi/drivers/daqboard2000.c
@@ -167,7 +167,7 @@ static const struct comedi_lrange range_daqboard2000_ao = { 1, {
 	}
 };
 
-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(struct comedi_device * dev, struct comedi_s
 	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(struct comedi_device * dev, struct comedi_
 {
 	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_adcStopDmaTransfer(struct comedi_device * dev)
 
 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(struct comedi_device * dev)
 
 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