Staging: comedi: Remove addi_private typedef in addi-data
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
b4ce4f165c
commit
e320671e63
@@ -72,7 +72,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
|
|||||||
//Update-0.7.57->0.7.68MODULE_DESCRIPTION("Comedi ADDI-DATA module");
|
//Update-0.7.57->0.7.68MODULE_DESCRIPTION("Comedi ADDI-DATA module");
|
||||||
//Update-0.7.57->0.7.68MODULE_LICENSE("GPL");
|
//Update-0.7.57->0.7.68MODULE_LICENSE("GPL");
|
||||||
|
|
||||||
#define devpriv ((addi_private *)dev->private)
|
#define devpriv ((struct addi_private *)dev->private)
|
||||||
#define this_board ((struct addi_board *)dev->board_ptr)
|
#define this_board ((struct addi_board *)dev->board_ptr)
|
||||||
|
|
||||||
#if defined(CONFIG_APCI_1710) || defined(CONFIG_APCI_3200) || defined(CONFIG_APCI_3300)
|
#if defined(CONFIG_APCI_1710) || defined(CONFIG_APCI_3200) || defined(CONFIG_APCI_3300)
|
||||||
@@ -2575,7 +2575,7 @@ static int i_ADDI_Attach(struct comedi_device * dev, struct comedi_devconfig * i
|
|||||||
sprintf(c_Identifier, "Addi-Data GmbH Comedi %s",
|
sprintf(c_Identifier, "Addi-Data GmbH Comedi %s",
|
||||||
this_board->pc_DriverName);
|
this_board->pc_DriverName);
|
||||||
|
|
||||||
if ((ret = alloc_private(dev, sizeof(addi_private))) < 0) {
|
if ((ret = alloc_private(dev, sizeof(struct addi_private))) < 0) {
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -345,7 +345,7 @@ union str_ModuleInfo {
|
|||||||
};
|
};
|
||||||
|
|
||||||
/* Private structure for the addi_apci3120 driver */
|
/* Private structure for the addi_apci3120 driver */
|
||||||
typedef struct {
|
struct addi_private {
|
||||||
|
|
||||||
int iobase;
|
int iobase;
|
||||||
int i_IobaseAmcc; // base+size for AMCC chip
|
int i_IobaseAmcc; // base+size for AMCC chip
|
||||||
@@ -434,7 +434,7 @@ typedef struct {
|
|||||||
union str_ModuleInfo s_ModuleInfo[4];
|
union str_ModuleInfo s_ModuleInfo[4];
|
||||||
unsigned int ul_TTLPortConfiguration[10];
|
unsigned int ul_TTLPortConfiguration[10];
|
||||||
|
|
||||||
} addi_private;
|
};
|
||||||
|
|
||||||
static unsigned short pci_list_builded; /* set to 1 when list of card is known */
|
static unsigned short pci_list_builded; /* set to 1 when list of card is known */
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user