Commit 0a4eb4b6 authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman

Staging: comedi: Remove labpc_private typedef

Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 9ad00740
...@@ -427,7 +427,7 @@ static const struct labpc_board_struct labpc_boards[] = { ...@@ -427,7 +427,7 @@ static const struct labpc_board_struct labpc_boards[] = {
static const int dma_buffer_size = 0xff00; // size in bytes of dma buffer static const int dma_buffer_size = 0xff00; // size in bytes of dma buffer
static const int sample_size = 2; // 2 bytes per sample static const int sample_size = 2; // 2 bytes per sample
#define devpriv ((labpc_private *)dev->private) #define devpriv ((struct labpc_private *)dev->private)
static struct comedi_driver driver_labpc = { static struct comedi_driver driver_labpc = {
.driver_name = DRV_NAME, .driver_name = DRV_NAME,
...@@ -653,7 +653,7 @@ static int labpc_attach(struct comedi_device * dev, struct comedi_devconfig * it ...@@ -653,7 +653,7 @@ static int labpc_attach(struct comedi_device * dev, struct comedi_devconfig * it
#endif #endif
/* allocate and initialize dev->private */ /* allocate and initialize dev->private */
if (alloc_private(dev, sizeof(labpc_private)) < 0) if (alloc_private(dev, sizeof(struct labpc_private)) < 0)
return -ENOMEM; return -ENOMEM;
// get base address, irq etc. based on bustype // get base address, irq etc. based on bustype
......
...@@ -46,7 +46,7 @@ struct labpc_board_struct { ...@@ -46,7 +46,7 @@ struct labpc_board_struct {
unsigned memory_mapped_io:1; /* uses memory mapped io instead of ioports */ unsigned memory_mapped_io:1; /* uses memory mapped io instead of ioports */
}; };
typedef struct { struct labpc_private {
struct mite_struct *mite; // for mite chip on pci-1200 struct mite_struct *mite; // for mite chip on pci-1200
volatile unsigned long long count; /* number of data points left to be taken */ volatile unsigned long long count; /* number of data points left to be taken */
unsigned int ao_value[NUM_AO_CHAN]; // software copy of analog output values unsigned int ao_value[NUM_AO_CHAN]; // software copy of analog output values
...@@ -72,7 +72,7 @@ typedef struct { ...@@ -72,7 +72,7 @@ typedef struct {
// function pointers so we can use inb/outb or readb/writeb as appropriate // function pointers so we can use inb/outb or readb/writeb as appropriate
unsigned int (*read_byte) (unsigned long address); unsigned int (*read_byte) (unsigned long address);
void (*write_byte) (unsigned int byte, unsigned long address); void (*write_byte) (unsigned int byte, unsigned long address);
} labpc_private; };
int labpc_common_attach(struct comedi_device * dev, unsigned long iobase, int labpc_common_attach(struct comedi_device * dev, unsigned long iobase,
unsigned int irq, unsigned int dma); unsigned int irq, unsigned int dma);
......
...@@ -133,7 +133,7 @@ static int labpc_attach(struct comedi_device * dev, struct comedi_devconfig * it ...@@ -133,7 +133,7 @@ static int labpc_attach(struct comedi_device * dev, struct comedi_devconfig * it
struct pcmcia_device *link; struct pcmcia_device *link;
/* allocate and initialize dev->private */ /* allocate and initialize dev->private */
if (alloc_private(dev, sizeof(labpc_private)) < 0) if (alloc_private(dev, sizeof(struct labpc_private)) < 0)
return -ENOMEM; return -ENOMEM;
// get base address, irq etc. based on bustype // get base address, irq etc. based on bustype
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment