evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Staging: comedi: Remove ULONG_PTR typedef in addi-data

Browse source 
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Bill Pemberton 2009-03-25 11:05:30 -04:00 • committed by Greg Kroah-Hartman
parent 756e9d7ca6
commit a3435c92d0
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/staging/comedi/drivers/addi-data/addi_common.c
View file

@ -2638,7 +2638,7 @@ static int i_ADDI_Attach(struct comedi_device * dev, struct comedi_devconfig * i
devpriv->i_IobaseReserved = (int) io_addr[3]; devpriv->i_IobaseReserved = (int) io_addr[3];
printk("\nioremap begin"); printk("\nioremap begin");
devpriv->dw_AiBase = devpriv->dw_AiBase =
(ULONG_PTR) ioremap(io_addr[3], (unsigned long ) ioremap(io_addr[3],
this_board->i_IorangeBase3); this_board->i_IorangeBase3);
printk("\nioremap end"); printk("\nioremap end");
} }

3
drivers/staging/comedi/drivers/addi-data/addi_common.h
View file

@ -37,7 +37,6 @@
#define SUCCESS 1 #define SUCCESS 1
/* variable type definition */ /* variable type definition */
typedef unsigned long ULONG_PTR;
typedef const struct comedi_lrange *PCRANGE; typedef const struct comedi_lrange *PCRANGE;
@ -356,7 +355,7 @@ typedef struct {
int i_IobaseAmcc; // base+size for AMCC chip int i_IobaseAmcc; // base+size for AMCC chip
int i_IobaseAddon; //addon base address int i_IobaseAddon; //addon base address
int i_IobaseReserved; int i_IobaseReserved;
ULONG_PTR dw_AiBase; unsigned long dw_AiBase;
struct pcilst_struct *amcc; // ptr too AMCC data struct pcilst_struct *amcc; // ptr too AMCC data
unsigned char allocated; // we have blocked card unsigned char allocated; // we have blocked card
unsigned char b_ValidDriver; // driver is ok unsigned char b_ValidDriver; // driver is ok