From e320671e6356ad589b7433c3fd5eff4c742a500e Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Wed, 25 Mar 2009 11:05:52 -0400 Subject: [PATCH] Staging: comedi: Remove addi_private typedef in addi-data Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/addi-data/addi_common.c | 4 ++-- drivers/staging/comedi/drivers/addi-data/addi_common.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.c b/drivers/staging/comedi/drivers/addi-data/addi_common.c index cc21587657c..50f59fa97d2 100644 --- a/drivers/staging/comedi/drivers/addi-data/addi_common.c +++ b/drivers/staging/comedi/drivers/addi-data/addi_common.c @@ -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_LICENSE("GPL"); -#define devpriv ((addi_private *)dev->private) +#define devpriv ((struct addi_private *)dev->private) #define this_board ((struct addi_board *)dev->board_ptr) #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", 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; } diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.h b/drivers/staging/comedi/drivers/addi-data/addi_common.h index 60e7291e496..aeb3df00a75 100644 --- a/drivers/staging/comedi/drivers/addi-data/addi_common.h +++ b/drivers/staging/comedi/drivers/addi-data/addi_common.h @@ -345,7 +345,7 @@ union str_ModuleInfo { }; /* Private structure for the addi_apci3120 driver */ -typedef struct { +struct addi_private { int iobase; int i_IobaseAmcc; // base+size for AMCC chip @@ -434,7 +434,7 @@ typedef struct { union str_ModuleInfo s_ModuleInfo[4]; unsigned int ul_TTLPortConfiguration[10]; -} addi_private; +}; static unsigned short pci_list_builded; /* set to 1 when list of card is known */ -- 2.46.0