sgi-xp: move xpc_allocate() into xpc_send()/xpc_send_notify()

[pandora-kernel.git] / drivers / misc / sgi-xp / xp_main.c

diff --git a/drivers/misc/sgi-xp/xp_main.c b/drivers/misc/sgi-xp/xp_main.c
index 6f25613..9c0ce2f 100644 (file)
--- a/drivers/misc/sgi-xp/xp_main.c
+++ b/drivers/misc/sgi-xp/xp_main.c
@@ -58,10 +58,9 @@ xpc_notloaded(void)
 struct xpc_interface xpc_interface = {
        (void (*)(int))xpc_notloaded,
        (void (*)(int))xpc_notloaded,
-       (enum xp_retval(*)(short, int, u32, void **))xpc_notloaded,
-       (enum xp_retval(*)(short, int, void *))xpc_notloaded,
-       (enum xp_retval(*)(short, int, void *, xpc_notify_func, void *))
-           xpc_notloaded,
+       (enum xp_retval(*)(short, int, u32, void *, u16))xpc_notloaded,
+       (enum xp_retval(*)(short, int, u32, void *, u16, xpc_notify_func,
+                          void *))xpc_notloaded,
        (void (*)(short, int, void *))xpc_notloaded,
        (enum xp_retval(*)(short, void *))xpc_notloaded
 };
@@ -73,16 +72,14 @@ EXPORT_SYMBOL_GPL(xpc_interface);
 void
 xpc_set_interface(void (*connect) (int),
                  void (*disconnect) (int),
-                 enum xp_retval (*allocate) (short, int, u32, void **),
-                 enum xp_retval (*send) (short, int, void *),
-                 enum xp_retval (*send_notify) (short, int, void *,
+                 enum xp_retval (*send) (short, int, u32, void *, u16),
+                 enum xp_retval (*send_notify) (short, int, u32, void *, u16,
                                                  xpc_notify_func, void *),
                  void (*received) (short, int, void *),
                  enum xp_retval (*partid_to_nasids) (short, void *))
 {
        xpc_interface.connect = connect;
        xpc_interface.disconnect = disconnect;
-       xpc_interface.allocate = allocate;
        xpc_interface.send = send;
        xpc_interface.send_notify = send_notify;
        xpc_interface.received = received;
@@ -98,13 +95,11 @@ xpc_clear_interface(void)
 {
        xpc_interface.connect = (void (*)(int))xpc_notloaded;
        xpc_interface.disconnect = (void (*)(int))xpc_notloaded;
-       xpc_interface.allocate = (enum xp_retval(*)(short, int, u32,
-                                                    void **))xpc_notloaded;
-       xpc_interface.send = (enum xp_retval(*)(short, int, void *))
+       xpc_interface.send = (enum xp_retval(*)(short, int, u32, void *, u16))
            xpc_notloaded;
-       xpc_interface.send_notify = (enum xp_retval(*)(short, int, void *,
-                                                       xpc_notify_func,
-                                                       void *))xpc_notloaded;
+       xpc_interface.send_notify = (enum xp_retval(*)(short, int, u32, void *,
+                                                      u16, xpc_notify_func,
+                                                      void *))xpc_notloaded;
        xpc_interface.received = (void (*)(short, int, void *))
            xpc_notloaded;
        xpc_interface.partid_to_nasids = (enum xp_retval(*)(short, void *))