git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
BUG_ON conversion for fs/xfs/
[safe/jmp/linux-2.6]
/
include
/
linux
/
rio_drv.h
diff --git
a/include/linux/rio_drv.h
b/include/linux/rio_drv.h
index
7483dfc
..
7adb2a1
100644
(file)
--- a/
include/linux/rio_drv.h
+++ b/
include/linux/rio_drv.h
@@
-16,11
+16,11
@@
#ifdef __KERNEL__
#include <linux/types.h>
#ifdef __KERNEL__
#include <linux/types.h>
-#include <linux/config.h>
#include <linux/ioport.h>
#include <linux/list.h>
#include <linux/errno.h>
#include <linux/device.h>
#include <linux/ioport.h>
#include <linux/list.h>
#include <linux/errno.h>
#include <linux/device.h>
+#include <linux/string.h>
#include <linux/rio.h>
extern int __rio_local_read_config_32(struct rio_mport *port, u32 offset,
#include <linux/rio.h>
extern int __rio_local_read_config_32(struct rio_mport *port, u32 offset,
@@
-336,8
+336,8
@@
static inline void rio_init_dbell_res(struct resource *res, u16 start, u16 end)
/**
* RIO_DEVICE - macro used to describe a specific RIO device
/**
* RIO_DEVICE - macro used to describe a specific RIO device
- * @
vid: the 16 bit RIO vendor
ID
- * @
did: the 16 bit RIO device
ID
+ * @
dev: the 16 bit RIO device
ID
+ * @
ven: the 16 bit RIO vendor
ID
*
* This macro is used to create a struct rio_device_id that matches a
* specific device. The assembly vendor and assembly device fields
*
* This macro is used to create a struct rio_device_id that matches a
* specific device. The assembly vendor and assembly device fields
@@
-348,8
+348,8
@@
static inline void rio_init_dbell_res(struct resource *res, u16 start, u16 end)
.asm_did = RIO_ANY_ID, .asm_vid = RIO_ANY_ID
/* Mailbox management */
.asm_did = RIO_ANY_ID, .asm_vid = RIO_ANY_ID
/* Mailbox management */
-extern int rio_request_outb_mbox(struct rio_mport *, int, int,
- void (*)(struct rio_mport *, int, int));
+extern int rio_request_outb_mbox(struct rio_mport *,
void *,
int, int,
+ void (*)(struct rio_mport *,
void *,
int, int));
extern int rio_release_outb_mbox(struct rio_mport *, int);
/**
extern int rio_release_outb_mbox(struct rio_mport *, int);
/**
@@
-370,8
+370,8
@@
static inline int rio_add_outb_message(struct rio_mport *mport,
return rio_hw_add_outb_message(mport, rdev, mbox, buffer, len);
}
return rio_hw_add_outb_message(mport, rdev, mbox, buffer, len);
}
-extern int rio_request_inb_mbox(struct rio_mport *, int, int,
- void (*)(struct rio_mport *, int, int));
+extern int rio_request_inb_mbox(struct rio_mport *,
void *,
int, int,
+ void (*)(struct rio_mport *,
void *,
int, int));
extern int rio_release_inb_mbox(struct rio_mport *, int);
/**
extern int rio_release_inb_mbox(struct rio_mport *, int);
/**
@@
-403,8
+403,8
@@
static inline void *rio_get_inb_message(struct rio_mport *mport, int mbox)
}
/* Doorbell management */
}
/* Doorbell management */
-extern int rio_request_inb_dbell(struct rio_mport *, u16, u16,
- void (*)(struct rio_mport *, u16, u16, u16));
+extern int rio_request_inb_dbell(struct rio_mport *,
void *,
u16, u16,
+ void (*)(struct rio_mport *,
void *,
u16, u16, u16));
extern int rio_release_inb_dbell(struct rio_mport *, u16, u16);
extern struct resource *rio_request_outb_dbell(struct rio_dev *, u16, u16);
extern int rio_release_outb_dbell(struct rio_dev *, struct resource *);
extern int rio_release_inb_dbell(struct rio_mport *, u16, u16);
extern struct resource *rio_request_outb_dbell(struct rio_dev *, u16, u16);
extern int rio_release_outb_dbell(struct rio_dev *, struct resource *);