Commit a3435c92 authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files

Staging: comedi: Remove ULONG_PTR typedef in addi-data 



Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 756e9d7c

drivers/staging/comedi/drivers/addi-data/addi_common.c

+1 −1
Original line number Diff line number Diff line
@@ -2638,7 +2638,7 @@ static int i_ADDI_Attach(struct comedi_device * dev, struct comedi_devconfig * i 
		devpriv->i_IobaseReserved = (int) io_addr[3];

		printk("\nioremap begin");

		devpriv->dw_AiBase =

			(ULONG_PTR) ioremap(io_addr[3],

			(unsigned long ) ioremap(io_addr[3],

			this_board->i_IorangeBase3);

		printk("\nioremap end");

	}

drivers/staging/comedi/drivers/addi-data/addi_common.h

+1 −2
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
#define SUCCESS	1



/* variable type definition */

typedef unsigned long ULONG_PTR;



typedef const struct comedi_lrange *PCRANGE;
@@ -356,7 +355,7 @@ typedef struct { 
	int i_IobaseAmcc;	// base+size for AMCC chip

	int i_IobaseAddon;	//addon base address

	int i_IobaseReserved;

	ULONG_PTR dw_AiBase;

	unsigned long dw_AiBase;

	struct pcilst_struct *amcc;	// ptr too AMCC data

	unsigned char allocated;		// we have blocked card

	unsigned char b_ValidDriver;	// driver is ok