Merge tag 'vfio-for-v3.10' of git://github.com/awilliam/linux-vfio

[firefly-linux-kernel-4.4.55.git] / net / caif / cfsrvl.c

diff --git a/net/caif/cfsrvl.c b/net/caif/cfsrvl.c
index ba217e90765e11024251feae5bbcb46450101ea7..353f793d1b3bb7285d466f0f67f3bc6023e10e49 100644 (file)
--- a/net/caif/cfsrvl.c
+++ b/net/caif/cfsrvl.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) ST-Ericsson AB 2010
- * Author:     Sjur Brendeland/sjur.brandeland@stericsson.com
+ * Author:     Sjur Brendeland
  * License terms: GNU General Public License (GPL) version 2
  */
 
@@ -25,7 +25,7 @@
 #define container_obj(layr) container_of(layr, struct cfsrvl, layer)
 
 static void cfservl_ctrlcmd(struct cflayer *layr, enum caif_ctrlcmd ctrl,
-                               int phyid)
+                           int phyid)
 {
        struct cfsrvl *service = container_obj(layr);
 
@@ -158,10 +158,9 @@ static void cfsrvl_release(struct cflayer *layer)
 }
 
 void cfsrvl_init(struct cfsrvl *service,
-                       u8 channel_id,
-                       struct dev_info *dev_info,
-                       bool supports_flowctrl
-                       )
+                u8 channel_id,
+                struct dev_info *dev_info,
+                bool supports_flowctrl)
 {
        caif_assert(offsetof(struct cfsrvl, layer) == 0);
        service->open = false;
@@ -207,8 +206,8 @@ void caif_free_client(struct cflayer *adap_layer)
 EXPORT_SYMBOL(caif_free_client);
 
 void caif_client_register_refcnt(struct cflayer *adapt_layer,
-                                       void (*hold)(struct cflayer *lyr),
-                                       void (*put)(struct cflayer *lyr))
+                                void (*hold)(struct cflayer *lyr),
+                                void (*put)(struct cflayer *lyr))
 {
        struct cfsrvl *service;