From 7de26ac919daaa8e125a85efbe42d80d90ee012e Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Thu, 19 Mar 2009 17:57:11 -0400
Subject: [PATCH] --- yaml --- r: 141679 b: refs/heads/master c:
 222ab1bc78dd8a48576e904da37fd6f71cb41a7e h: refs/heads/master i:   141677:
 b57557c065dd79a7435d3b4dadeffcd8a7665a4e   141675:
 c33b950060d1a542329ab2b51916de83ea797a76   141671:
 c90b2070786e8b71d23c73984372f04f52f974bd   141663:
 34b72d83d24c5779e603fa121bad6252309e39d0 v: v3

---
 [refs]                                           |  2 +-
 .../drivers/staging/comedi/drivers/cb_pcidas64.c | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 840086295720..8be43763be5e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 675935dd95cf24e81982e57021d03d5bf8bdac60
+refs/heads/master: 222ab1bc78dd8a48576e904da37fd6f71cb41a7e
diff --git a/trunk/drivers/staging/comedi/drivers/cb_pcidas64.c b/trunk/drivers/staging/comedi/drivers/cb_pcidas64.c
index 0e9eeefc93bd..4c2e97302a35 100644
--- a/trunk/drivers/staging/comedi/drivers/cb_pcidas64.c
+++ b/trunk/drivers/staging/comedi/drivers/cb_pcidas64.c
@@ -541,7 +541,7 @@ struct hw_fifo_info {
 	uint16_t fifo_size_reg_mask;
 };
 
-typedef struct pcidas64_board_struct {
+struct pcidas64_board {
 	const char *name;
 	int device_id;		// pci device id
 	int ai_se_chans;	// number of ai inputs in single-ended mode
@@ -556,7 +556,7 @@ typedef struct pcidas64_board_struct {
 	const struct hw_fifo_info *const ai_fifo;
 	enum register_layout layout;	// different board families have slightly different registers
 	unsigned has_8255:1;
-} pcidas64_board;
+};
 
 static const struct hw_fifo_info ai_fifo_4020 = {
       num_segments:2,
@@ -584,7 +584,7 @@ static const struct hw_fifo_info ai_fifo_60xx = {
 #define MAX_AI_DMA_RING_COUNT (0x80000 / DMA_BUFFER_SIZE)
 #define MIN_AI_DMA_RING_COUNT (0x10000 / DMA_BUFFER_SIZE)
 #define AO_DMA_RING_COUNT (0x10000 / DMA_BUFFER_SIZE)
-static inline unsigned int ai_dma_ring_count(pcidas64_board * board)
+static inline unsigned int ai_dma_ring_count(struct pcidas64_board * board)
 {
 	if (board->layout == LAYOUT_4020)
 		return MAX_AI_DMA_RING_COUNT;
@@ -594,7 +594,7 @@ static inline unsigned int ai_dma_ring_count(pcidas64_board * board)
 
 static const int bytes_in_sample = 2;
 
-static const pcidas64_board pcidas64_boards[] = {
+static const struct pcidas64_board pcidas64_boards[] = {
 	{
 	      name:	"pci-das6402/16",
 	      device_id:0x1d,
@@ -1016,7 +1016,7 @@ static const pcidas64_board pcidas64_boards[] = {
 // Number of boards in cb_pcidas_boards
 static inline unsigned int num_boards(void)
 {
-	return sizeof(pcidas64_boards) / sizeof(pcidas64_board);
+	return sizeof(pcidas64_boards) / sizeof(struct pcidas64_board);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(pcidas64_pci_table) = {
@@ -1044,9 +1044,9 @@ static DEFINE_PCI_DEVICE_TABLE(pcidas64_pci_table) = {
 
 MODULE_DEVICE_TABLE(pci, pcidas64_pci_table);
 
-static inline pcidas64_board *board(const struct comedi_device * dev)
+static inline struct pcidas64_board *board(const struct comedi_device * dev)
 {
-	return (pcidas64_board *) dev->board_ptr;
+	return (struct pcidas64_board *) dev->board_ptr;
 }
 
 static inline unsigned short se_diff_bit_6xxx(struct comedi_device * dev,
@@ -1267,7 +1267,7 @@ static void set_dac_range_bits(struct comedi_device * dev, volatile uint16_t * b
 	*bits |= code << (2 * channel);
 };
 
-static inline int ao_cmd_is_supported(const pcidas64_board * board)
+static inline int ao_cmd_is_supported(const struct pcidas64_board * board)
 {
 	return board->ao_nchan && board->layout != LAYOUT_4020;
 }