Merge branch 'x86/mce' into x86/ras

[~andy/linux] / net / tipc / subscr.c

diff --git a/net/tipc/subscr.c b/net/tipc/subscr.c
index f6be92a6973a92906c1a1777dc7a5005cb2961da..d38bb45d82e99e36e8f5955911942413e26ddead 100644 (file)
--- a/net/tipc/subscr.c
+++ b/net/tipc/subscr.c
@@ -117,10 +117,8 @@ static void subscr_send_event(struct tipc_subscription *sub, u32 found_lower,
  *
  * Returns 1 if there is overlap, otherwise 0.
  */
-int tipc_subscr_overlap(struct tipc_subscription *sub,
-                       u32 found_lower,
+int tipc_subscr_overlap(struct tipc_subscription *sub, u32 found_lower,
                        u32 found_upper)
-
 {
        if (found_lower < sub->seq.lower)
                found_lower = sub->seq.lower;
@@ -136,13 +134,9 @@ int tipc_subscr_overlap(struct tipc_subscription *sub,
  *
  * Protected by nameseq.lock in name_table.c
  */
-void tipc_subscr_report_overlap(struct tipc_subscription *sub,
-                               u32 found_lower,
-                               u32 found_upper,
-                               u32 event,
-                               u32 port_ref,
-                               u32 node,
-                               int must)
+void tipc_subscr_report_overlap(struct tipc_subscription *sub, u32 found_lower,
+                               u32 found_upper, u32 event, u32 port_ref,
+                               u32 node, int must)
 {
        if (!tipc_subscr_overlap(sub, found_lower, found_upper))
                return;