Merge branch 'next' into for-linus

[mv-sheeva.git] / include / linux / rio_drv.h

diff --git a/include/linux/rio_drv.h b/include/linux/rio_drv.h
index e09e565c4bce1470209fcb07d429a98a3edc9bbf..229b3ca23134634999a93d32bf6eb4a9c01d5448 100644 (file)
--- a/include/linux/rio_drv.h
+++ b/include/linux/rio_drv.h
@@ -317,7 +317,8 @@ static inline int rio_add_outb_message(struct rio_mport *mport,
                                       struct rio_dev *rdev, int mbox,
                                       void *buffer, size_t len)
 {
-       return rio_hw_add_outb_message(mport, rdev, mbox, buffer, len);
+       return mport->ops->add_outb_message(mport, rdev, mbox,
+                                                  buffer, len);
 }
 
 extern int rio_request_inb_mbox(struct rio_mport *, void *, int, int,
@@ -336,7 +337,7 @@ extern int rio_release_inb_mbox(struct rio_mport *, int);
 static inline int rio_add_inb_buffer(struct rio_mport *mport, int mbox,
                                     void *buffer)
 {
-       return rio_hw_add_inb_buffer(mport, mbox, buffer);
+       return mport->ops->add_inb_buffer(mport, mbox, buffer);
 }
 
 /**
@@ -348,7 +349,7 @@ static inline int rio_add_inb_buffer(struct rio_mport *mport, int mbox,
  */
 static inline void *rio_get_inb_message(struct rio_mport *mport, int mbox)
 {
-       return rio_hw_get_inb_message(mport, mbox);
+       return mport->ops->get_inb_message(mport, mbox);
 }
 
 /* Doorbell management */