aboutsummaryrefslogtreecommitdiffstats
path: root/net/caif
diff options
context:
space:
mode:
authorSilviu-Mihai Popescu <silviupopescu1990@gmail.com>2013-03-06 14:39:57 -0500
committerDavid S. Miller <davem@davemloft.net>2013-03-07 16:24:45 -0500
commit3bffc475f9995843fa23a4978a4c112d8c8f4a6e (patch)
treed739422428b0906cd3cf405198af0bf7cab76741 /net/caif
parentb2fb4f54ecd47c42413d54b4666b06cf93c05abf (diff)
CAIF: fix indentation for function arguments
This lines up function arguments on second and subsequent lines at the first column after the openning parenthesis of the first line. Signed-off-by: Silviu-Mihai Popescu <silviupopescu1990@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/caif')
-rw-r--r--net/caif/caif_dev.c9
-rw-r--r--net/caif/caif_socket.c22
-rw-r--r--net/caif/caif_usb.c4
-rw-r--r--net/caif/cfcnfg.c19
-rw-r--r--net/caif/cfctrl.c14
-rw-r--r--net/caif/cffrml.c4
-rw-r--r--net/caif/cfmuxl.c4
-rw-r--r--net/caif/cfpkt_skbuff.c8
-rw-r--r--net/caif/cfrfml.c4
-rw-r--r--net/caif/cfserl.c4
-rw-r--r--net/caif/cfsrvl.c13
-rw-r--r--net/caif/chnl_net.c6
12 files changed, 55 insertions, 56 deletions
diff --git a/net/caif/caif_dev.c b/net/caif/caif_dev.c
index 21760f008974..df6d56d8689a 100644
--- a/net/caif/caif_dev.c
+++ b/net/caif/caif_dev.c
@@ -301,10 +301,11 @@ static void dev_flowctrl(struct net_device *dev, int on)
301} 301}
302 302
303void caif_enroll_dev(struct net_device *dev, struct caif_dev_common *caifdev, 303void caif_enroll_dev(struct net_device *dev, struct caif_dev_common *caifdev,
304 struct cflayer *link_support, int head_room, 304 struct cflayer *link_support, int head_room,
305 struct cflayer **layer, int (**rcv_func)( 305 struct cflayer **layer,
306 struct sk_buff *, struct net_device *, 306 int (**rcv_func)(struct sk_buff *, struct net_device *,
307 struct packet_type *, struct net_device *)) 307 struct packet_type *,
308 struct net_device *))
308{ 309{
309 struct caif_device_entry *caifd; 310 struct caif_device_entry *caifd;
310 enum cfcnfg_phy_preference pref; 311 enum cfcnfg_phy_preference pref;
diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c
index 095259f83902..1d337e02bc63 100644
--- a/net/caif/caif_socket.c
+++ b/net/caif/caif_socket.c
@@ -197,8 +197,8 @@ static void cfsk_put(struct cflayer *layr)
197 197
198/* Packet Control Callback function called from CAIF */ 198/* Packet Control Callback function called from CAIF */
199static void caif_ctrl_cb(struct cflayer *layr, 199static void caif_ctrl_cb(struct cflayer *layr,
200 enum caif_ctrlcmd flow, 200 enum caif_ctrlcmd flow,
201 int phyid) 201 int phyid)
202{ 202{
203 struct caifsock *cf_sk = container_of(layr, struct caifsock, layer); 203 struct caifsock *cf_sk = container_of(layr, struct caifsock, layer);
204 switch (flow) { 204 switch (flow) {
@@ -274,7 +274,7 @@ static void caif_check_flow_release(struct sock *sk)
274 * changed locking, address handling and added MSG_TRUNC. 274 * changed locking, address handling and added MSG_TRUNC.
275 */ 275 */
276static int caif_seqpkt_recvmsg(struct kiocb *iocb, struct socket *sock, 276static int caif_seqpkt_recvmsg(struct kiocb *iocb, struct socket *sock,
277 struct msghdr *m, size_t len, int flags) 277 struct msghdr *m, size_t len, int flags)
278 278
279{ 279{
280 struct sock *sk = sock->sk; 280 struct sock *sk = sock->sk;
@@ -346,8 +346,8 @@ static long caif_stream_data_wait(struct sock *sk, long timeo)
346 * changed locking calls, changed address handling. 346 * changed locking calls, changed address handling.
347 */ 347 */
348static int caif_stream_recvmsg(struct kiocb *iocb, struct socket *sock, 348static int caif_stream_recvmsg(struct kiocb *iocb, struct socket *sock,
349 struct msghdr *msg, size_t size, 349 struct msghdr *msg, size_t size,
350 int flags) 350 int flags)
351{ 351{
352 struct sock *sk = sock->sk; 352 struct sock *sk = sock->sk;
353 int copied = 0; 353 int copied = 0;
@@ -462,7 +462,7 @@ out:
462 * CAIF flow-on and sock_writable. 462 * CAIF flow-on and sock_writable.
463 */ 463 */
464static long caif_wait_for_flow_on(struct caifsock *cf_sk, 464static long caif_wait_for_flow_on(struct caifsock *cf_sk,
465 int wait_writeable, long timeo, int *err) 465 int wait_writeable, long timeo, int *err)
466{ 466{
467 struct sock *sk = &cf_sk->sk; 467 struct sock *sk = &cf_sk->sk;
468 DEFINE_WAIT(wait); 468 DEFINE_WAIT(wait);
@@ -516,7 +516,7 @@ static int transmit_skb(struct sk_buff *skb, struct caifsock *cf_sk,
516 516
517/* Copied from af_unix:unix_dgram_sendmsg, and adapted to CAIF */ 517/* Copied from af_unix:unix_dgram_sendmsg, and adapted to CAIF */
518static int caif_seqpkt_sendmsg(struct kiocb *kiocb, struct socket *sock, 518static int caif_seqpkt_sendmsg(struct kiocb *kiocb, struct socket *sock,
519 struct msghdr *msg, size_t len) 519 struct msghdr *msg, size_t len)
520{ 520{
521 struct sock *sk = sock->sk; 521 struct sock *sk = sock->sk;
522 struct caifsock *cf_sk = container_of(sk, struct caifsock, sk); 522 struct caifsock *cf_sk = container_of(sk, struct caifsock, sk);
@@ -591,7 +591,7 @@ err:
591 * and other minor adaptations. 591 * and other minor adaptations.
592 */ 592 */
593static int caif_stream_sendmsg(struct kiocb *kiocb, struct socket *sock, 593static int caif_stream_sendmsg(struct kiocb *kiocb, struct socket *sock,
594 struct msghdr *msg, size_t len) 594 struct msghdr *msg, size_t len)
595{ 595{
596 struct sock *sk = sock->sk; 596 struct sock *sk = sock->sk;
597 struct caifsock *cf_sk = container_of(sk, struct caifsock, sk); 597 struct caifsock *cf_sk = container_of(sk, struct caifsock, sk);
@@ -670,7 +670,7 @@ out_err:
670} 670}
671 671
672static int setsockopt(struct socket *sock, 672static int setsockopt(struct socket *sock,
673 int lvl, int opt, char __user *ov, unsigned int ol) 673 int lvl, int opt, char __user *ov, unsigned int ol)
674{ 674{
675 struct sock *sk = sock->sk; 675 struct sock *sk = sock->sk;
676 struct caifsock *cf_sk = container_of(sk, struct caifsock, sk); 676 struct caifsock *cf_sk = container_of(sk, struct caifsock, sk);
@@ -932,7 +932,7 @@ static int caif_release(struct socket *sock)
932 932
933/* Copied from af_unix.c:unix_poll(), added CAIF tx_flow handling */ 933/* Copied from af_unix.c:unix_poll(), added CAIF tx_flow handling */
934static unsigned int caif_poll(struct file *file, 934static unsigned int caif_poll(struct file *file,
935 struct socket *sock, poll_table *wait) 935 struct socket *sock, poll_table *wait)
936{ 936{
937 struct sock *sk = sock->sk; 937 struct sock *sk = sock->sk;
938 unsigned int mask; 938 unsigned int mask;
@@ -1022,7 +1022,7 @@ static void caif_sock_destructor(struct sock *sk)
1022} 1022}
1023 1023
1024static int caif_create(struct net *net, struct socket *sock, int protocol, 1024static int caif_create(struct net *net, struct socket *sock, int protocol,
1025 int kern) 1025 int kern)
1026{ 1026{
1027 struct sock *sk = NULL; 1027 struct sock *sk = NULL;
1028 struct caifsock *cf_sk = NULL; 1028 struct caifsock *cf_sk = NULL;
diff --git a/net/caif/caif_usb.c b/net/caif/caif_usb.c
index ef8ebaa993cf..d76278d644b8 100644
--- a/net/caif/caif_usb.c
+++ b/net/caif/caif_usb.c
@@ -75,7 +75,7 @@ static int cfusbl_transmit(struct cflayer *layr, struct cfpkt *pkt)
75} 75}
76 76
77static void cfusbl_ctrlcmd(struct cflayer *layr, enum caif_ctrlcmd ctrl, 77static void cfusbl_ctrlcmd(struct cflayer *layr, enum caif_ctrlcmd ctrl,
78 int phyid) 78 int phyid)
79{ 79{
80 if (layr->up && layr->up->ctrlcmd) 80 if (layr->up && layr->up->ctrlcmd)
81 layr->up->ctrlcmd(layr->up, ctrl, layr->id); 81 layr->up->ctrlcmd(layr->up, ctrl, layr->id);
@@ -121,7 +121,7 @@ static struct packet_type caif_usb_type __read_mostly = {
121}; 121};
122 122
123static int cfusbl_device_notify(struct notifier_block *me, unsigned long what, 123static int cfusbl_device_notify(struct notifier_block *me, unsigned long what,
124 void *arg) 124 void *arg)
125{ 125{
126 struct net_device *dev = arg; 126 struct net_device *dev = arg;
127 struct caif_dev_common common; 127 struct caif_dev_common common;
diff --git a/net/caif/cfcnfg.c b/net/caif/cfcnfg.c
index f1dbddb95a6c..246ac3aa8de5 100644
--- a/net/caif/cfcnfg.c
+++ b/net/caif/cfcnfg.c
@@ -61,11 +61,11 @@ struct cfcnfg {
61}; 61};
62 62
63static void cfcnfg_linkup_rsp(struct cflayer *layer, u8 channel_id, 63static void cfcnfg_linkup_rsp(struct cflayer *layer, u8 channel_id,
64 enum cfctrl_srv serv, u8 phyid, 64 enum cfctrl_srv serv, u8 phyid,
65 struct cflayer *adapt_layer); 65 struct cflayer *adapt_layer);
66static void cfcnfg_linkdestroy_rsp(struct cflayer *layer, u8 channel_id); 66static void cfcnfg_linkdestroy_rsp(struct cflayer *layer, u8 channel_id);
67static void cfcnfg_reject_rsp(struct cflayer *layer, u8 channel_id, 67static void cfcnfg_reject_rsp(struct cflayer *layer, u8 channel_id,
68 struct cflayer *adapt_layer); 68 struct cflayer *adapt_layer);
69static void cfctrl_resp_func(void); 69static void cfctrl_resp_func(void);
70static void cfctrl_enum_resp(void); 70static void cfctrl_enum_resp(void);
71 71
@@ -131,7 +131,7 @@ static void cfctrl_resp_func(void)
131} 131}
132 132
133static struct cfcnfg_phyinfo *cfcnfg_get_phyinfo_rcu(struct cfcnfg *cnfg, 133static struct cfcnfg_phyinfo *cfcnfg_get_phyinfo_rcu(struct cfcnfg *cnfg,
134 u8 phyid) 134 u8 phyid)
135{ 135{
136 struct cfcnfg_phyinfo *phy; 136 struct cfcnfg_phyinfo *phy;
137 137
@@ -216,8 +216,8 @@ static const int protohead[CFCTRL_SRV_MASK] = {
216 216
217 217
218static int caif_connect_req_to_link_param(struct cfcnfg *cnfg, 218static int caif_connect_req_to_link_param(struct cfcnfg *cnfg,
219 struct caif_connect_request *s, 219 struct caif_connect_request *s,
220 struct cfctrl_link_param *l) 220 struct cfctrl_link_param *l)
221{ 221{
222 struct dev_info *dev_info; 222 struct dev_info *dev_info;
223 enum cfcnfg_phy_preference pref; 223 enum cfcnfg_phy_preference pref;
@@ -301,8 +301,7 @@ static int caif_connect_req_to_link_param(struct cfcnfg *cnfg,
301 301
302int caif_connect_client(struct net *net, struct caif_connect_request *conn_req, 302int caif_connect_client(struct net *net, struct caif_connect_request *conn_req,
303 struct cflayer *adap_layer, int *ifindex, 303 struct cflayer *adap_layer, int *ifindex,
304 int *proto_head, 304 int *proto_head, int *proto_tail)
305 int *proto_tail)
306{ 305{
307 struct cflayer *frml; 306 struct cflayer *frml;
308 struct cfcnfg_phyinfo *phy; 307 struct cfcnfg_phyinfo *phy;
@@ -364,7 +363,7 @@ unlock:
364EXPORT_SYMBOL(caif_connect_client); 363EXPORT_SYMBOL(caif_connect_client);
365 364
366static void cfcnfg_reject_rsp(struct cflayer *layer, u8 channel_id, 365static void cfcnfg_reject_rsp(struct cflayer *layer, u8 channel_id,
367 struct cflayer *adapt_layer) 366 struct cflayer *adapt_layer)
368{ 367{
369 if (adapt_layer != NULL && adapt_layer->ctrlcmd != NULL) 368 if (adapt_layer != NULL && adapt_layer->ctrlcmd != NULL)
370 adapt_layer->ctrlcmd(adapt_layer, 369 adapt_layer->ctrlcmd(adapt_layer,
@@ -526,7 +525,7 @@ out_err:
526EXPORT_SYMBOL(cfcnfg_add_phy_layer); 525EXPORT_SYMBOL(cfcnfg_add_phy_layer);
527 526
528int cfcnfg_set_phy_state(struct cfcnfg *cnfg, struct cflayer *phy_layer, 527int cfcnfg_set_phy_state(struct cfcnfg *cnfg, struct cflayer *phy_layer,
529 bool up) 528 bool up)
530{ 529{
531 struct cfcnfg_phyinfo *phyinfo; 530 struct cfcnfg_phyinfo *phyinfo;
532 531
diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c
index a376ec1ac0a7..9cd057c59c59 100644
--- a/net/caif/cfctrl.c
+++ b/net/caif/cfctrl.c
@@ -20,12 +20,12 @@
20 20
21#ifdef CAIF_NO_LOOP 21#ifdef CAIF_NO_LOOP
22static int handle_loop(struct cfctrl *ctrl, 22static int handle_loop(struct cfctrl *ctrl,
23 int cmd, struct cfpkt *pkt){ 23 int cmd, struct cfpkt *pkt){
24 return -1; 24 return -1;
25} 25}
26#else 26#else
27static int handle_loop(struct cfctrl *ctrl, 27static int handle_loop(struct cfctrl *ctrl,
28 int cmd, struct cfpkt *pkt); 28 int cmd, struct cfpkt *pkt);
29#endif 29#endif
30static int cfctrl_recv(struct cflayer *layr, struct cfpkt *pkt); 30static int cfctrl_recv(struct cflayer *layr, struct cfpkt *pkt);
31static void cfctrl_ctrlcmd(struct cflayer *layr, enum caif_ctrlcmd ctrl, 31static void cfctrl_ctrlcmd(struct cflayer *layr, enum caif_ctrlcmd ctrl,
@@ -72,7 +72,7 @@ void cfctrl_remove(struct cflayer *layer)
72} 72}
73 73
74static bool param_eq(const struct cfctrl_link_param *p1, 74static bool param_eq(const struct cfctrl_link_param *p1,
75 const struct cfctrl_link_param *p2) 75 const struct cfctrl_link_param *p2)
76{ 76{
77 bool eq = 77 bool eq =
78 p1->linktype == p2->linktype && 78 p1->linktype == p2->linktype &&
@@ -197,8 +197,8 @@ void cfctrl_enum_req(struct cflayer *layer, u8 physlinkid)
197} 197}
198 198
199int cfctrl_linkup_request(struct cflayer *layer, 199int cfctrl_linkup_request(struct cflayer *layer,
200 struct cfctrl_link_param *param, 200 struct cfctrl_link_param *param,
201 struct cflayer *user_layer) 201 struct cflayer *user_layer)
202{ 202{
203 struct cfctrl *cfctrl = container_obj(layer); 203 struct cfctrl *cfctrl = container_obj(layer);
204 u32 tmp32; 204 u32 tmp32;
@@ -301,7 +301,7 @@ int cfctrl_linkup_request(struct cflayer *layer,
301} 301}
302 302
303int cfctrl_linkdown_req(struct cflayer *layer, u8 channelid, 303int cfctrl_linkdown_req(struct cflayer *layer, u8 channelid,
304 struct cflayer *client) 304 struct cflayer *client)
305{ 305{
306 int ret; 306 int ret;
307 struct cfpkt *pkt; 307 struct cfpkt *pkt;
@@ -555,7 +555,7 @@ error:
555} 555}
556 556
557static void cfctrl_ctrlcmd(struct cflayer *layr, enum caif_ctrlcmd ctrl, 557static void cfctrl_ctrlcmd(struct cflayer *layr, enum caif_ctrlcmd ctrl,
558 int phyid) 558 int phyid)
559{ 559{
560 struct cfctrl *this = container_obj(layr); 560 struct cfctrl *this = container_obj(layr);
561 switch (ctrl) { 561 switch (ctrl) {
diff --git a/net/caif/cffrml.c b/net/caif/cffrml.c
index 0a7df7ef062d..204c5e226a61 100644
--- a/net/caif/cffrml.c
+++ b/net/caif/cffrml.c
@@ -28,7 +28,7 @@ struct cffrml {
28static int cffrml_receive(struct cflayer *layr, struct cfpkt *pkt); 28static int cffrml_receive(struct cflayer *layr, struct cfpkt *pkt);
29static int cffrml_transmit(struct cflayer *layr, struct cfpkt *pkt); 29static int cffrml_transmit(struct cflayer *layr, struct cfpkt *pkt);
30static void cffrml_ctrlcmd(struct cflayer *layr, enum caif_ctrlcmd ctrl, 30static void cffrml_ctrlcmd(struct cflayer *layr, enum caif_ctrlcmd ctrl,
31 int phyid); 31 int phyid);
32 32
33static u32 cffrml_rcv_error; 33static u32 cffrml_rcv_error;
34static u32 cffrml_rcv_checsum_error; 34static u32 cffrml_rcv_checsum_error;
@@ -167,7 +167,7 @@ static int cffrml_transmit(struct cflayer *layr, struct cfpkt *pkt)
167} 167}
168 168
169static void cffrml_ctrlcmd(struct cflayer *layr, enum caif_ctrlcmd ctrl, 169static void cffrml_ctrlcmd(struct cflayer *layr, enum caif_ctrlcmd ctrl,
170 int phyid) 170 int phyid)
171{ 171{
172 if (layr->up && layr->up->ctrlcmd) 172 if (layr->up && layr->up->ctrlcmd)
173 layr->up->ctrlcmd(layr->up, ctrl, layr->id); 173 layr->up->ctrlcmd(layr->up, ctrl, layr->id);
diff --git a/net/caif/cfmuxl.c b/net/caif/cfmuxl.c
index 94b08612a4d8..154d9f8f964c 100644
--- a/net/caif/cfmuxl.c
+++ b/net/caif/cfmuxl.c
@@ -42,7 +42,7 @@ struct cfmuxl {
42static int cfmuxl_receive(struct cflayer *layr, struct cfpkt *pkt); 42static int cfmuxl_receive(struct cflayer *layr, struct cfpkt *pkt);
43static int cfmuxl_transmit(struct cflayer *layr, struct cfpkt *pkt); 43static int cfmuxl_transmit(struct cflayer *layr, struct cfpkt *pkt);
44static void cfmuxl_ctrlcmd(struct cflayer *layr, enum caif_ctrlcmd ctrl, 44static void cfmuxl_ctrlcmd(struct cflayer *layr, enum caif_ctrlcmd ctrl,
45 int phyid); 45 int phyid);
46static struct cflayer *get_up(struct cfmuxl *muxl, u16 id); 46static struct cflayer *get_up(struct cfmuxl *muxl, u16 id);
47 47
48struct cflayer *cfmuxl_create(void) 48struct cflayer *cfmuxl_create(void)
@@ -244,7 +244,7 @@ static int cfmuxl_transmit(struct cflayer *layr, struct cfpkt *pkt)
244} 244}
245 245
246static void cfmuxl_ctrlcmd(struct cflayer *layr, enum caif_ctrlcmd ctrl, 246static void cfmuxl_ctrlcmd(struct cflayer *layr, enum caif_ctrlcmd ctrl,
247 int phyid) 247 int phyid)
248{ 248{
249 struct cfmuxl *muxl = container_obj(layr); 249 struct cfmuxl *muxl = container_obj(layr);
250 struct cflayer *layer; 250 struct cflayer *layer;
diff --git a/net/caif/cfpkt_skbuff.c b/net/caif/cfpkt_skbuff.c
index 863dedd91bb6..e8f9c149504d 100644
--- a/net/caif/cfpkt_skbuff.c
+++ b/net/caif/cfpkt_skbuff.c
@@ -266,8 +266,8 @@ inline u16 cfpkt_getlen(struct cfpkt *pkt)
266} 266}
267 267
268inline u16 cfpkt_iterate(struct cfpkt *pkt, 268inline u16 cfpkt_iterate(struct cfpkt *pkt,
269 u16 (*iter_func)(u16, void *, u16), 269 u16 (*iter_func)(u16, void *, u16),
270 u16 data) 270 u16 data)
271{ 271{
272 /* 272 /*
273 * Don't care about the performance hit of linearizing, 273 * Don't care about the performance hit of linearizing,
@@ -307,8 +307,8 @@ int cfpkt_setlen(struct cfpkt *pkt, u16 len)
307} 307}
308 308
309struct cfpkt *cfpkt_append(struct cfpkt *dstpkt, 309struct cfpkt *cfpkt_append(struct cfpkt *dstpkt,
310 struct cfpkt *addpkt, 310 struct cfpkt *addpkt,
311 u16 expectlen) 311 u16 expectlen)
312{ 312{
313 struct sk_buff *dst = pkt_to_skb(dstpkt); 313 struct sk_buff *dst = pkt_to_skb(dstpkt);
314 struct sk_buff *add = pkt_to_skb(addpkt); 314 struct sk_buff *add = pkt_to_skb(addpkt);
diff --git a/net/caif/cfrfml.c b/net/caif/cfrfml.c
index 2b563ad04597..db51830c8587 100644
--- a/net/caif/cfrfml.c
+++ b/net/caif/cfrfml.c
@@ -43,7 +43,7 @@ static void cfrfml_release(struct cflayer *layer)
43} 43}
44 44
45struct cflayer *cfrfml_create(u8 channel_id, struct dev_info *dev_info, 45struct cflayer *cfrfml_create(u8 channel_id, struct dev_info *dev_info,
46 int mtu_size) 46 int mtu_size)
47{ 47{
48 int tmp; 48 int tmp;
49 struct cfrfml *this = kzalloc(sizeof(struct cfrfml), GFP_ATOMIC); 49 struct cfrfml *this = kzalloc(sizeof(struct cfrfml), GFP_ATOMIC);
@@ -69,7 +69,7 @@ struct cflayer *cfrfml_create(u8 channel_id, struct dev_info *dev_info,
69} 69}
70 70
71static struct cfpkt *rfm_append(struct cfrfml *rfml, char *seghead, 71static struct cfpkt *rfm_append(struct cfrfml *rfml, char *seghead,
72 struct cfpkt *pkt, int *err) 72 struct cfpkt *pkt, int *err)
73{ 73{
74 struct cfpkt *tmppkt; 74 struct cfpkt *tmppkt;
75 *err = -EPROTO; 75 *err = -EPROTO;
diff --git a/net/caif/cfserl.c b/net/caif/cfserl.c
index 8e68b97f13ee..147c232b1285 100644
--- a/net/caif/cfserl.c
+++ b/net/caif/cfserl.c
@@ -29,7 +29,7 @@ struct cfserl {
29static int cfserl_receive(struct cflayer *layr, struct cfpkt *pkt); 29static int cfserl_receive(struct cflayer *layr, struct cfpkt *pkt);
30static int cfserl_transmit(struct cflayer *layr, struct cfpkt *pkt); 30static int cfserl_transmit(struct cflayer *layr, struct cfpkt *pkt);
31static void cfserl_ctrlcmd(struct cflayer *layr, enum caif_ctrlcmd ctrl, 31static void cfserl_ctrlcmd(struct cflayer *layr, enum caif_ctrlcmd ctrl,
32 int phyid); 32 int phyid);
33 33
34struct cflayer *cfserl_create(int instance, bool use_stx) 34struct cflayer *cfserl_create(int instance, bool use_stx)
35{ 35{
@@ -182,7 +182,7 @@ static int cfserl_transmit(struct cflayer *layer, struct cfpkt *newpkt)
182} 182}
183 183
184static void cfserl_ctrlcmd(struct cflayer *layr, enum caif_ctrlcmd ctrl, 184static void cfserl_ctrlcmd(struct cflayer *layr, enum caif_ctrlcmd ctrl,
185 int phyid) 185 int phyid)
186{ 186{
187 layr->up->ctrlcmd(layr->up, ctrl, phyid); 187 layr->up->ctrlcmd(layr->up, ctrl, phyid);
188} 188}
diff --git a/net/caif/cfsrvl.c b/net/caif/cfsrvl.c
index ba217e90765e..95f7f5ea30ef 100644
--- a/net/caif/cfsrvl.c
+++ b/net/caif/cfsrvl.c
@@ -25,7 +25,7 @@
25#define container_obj(layr) container_of(layr, struct cfsrvl, layer) 25#define container_obj(layr) container_of(layr, struct cfsrvl, layer)
26 26
27static void cfservl_ctrlcmd(struct cflayer *layr, enum caif_ctrlcmd ctrl, 27static void cfservl_ctrlcmd(struct cflayer *layr, enum caif_ctrlcmd ctrl,
28 int phyid) 28 int phyid)
29{ 29{
30 struct cfsrvl *service = container_obj(layr); 30 struct cfsrvl *service = container_obj(layr);
31 31
@@ -158,10 +158,9 @@ static void cfsrvl_release(struct cflayer *layer)
158} 158}
159 159
160void cfsrvl_init(struct cfsrvl *service, 160void cfsrvl_init(struct cfsrvl *service,
161 u8 channel_id, 161 u8 channel_id,
162 struct dev_info *dev_info, 162 struct dev_info *dev_info,
163 bool supports_flowctrl 163 bool supports_flowctrl)
164 )
165{ 164{
166 caif_assert(offsetof(struct cfsrvl, layer) == 0); 165 caif_assert(offsetof(struct cfsrvl, layer) == 0);
167 service->open = false; 166 service->open = false;
@@ -207,8 +206,8 @@ void caif_free_client(struct cflayer *adap_layer)
207EXPORT_SYMBOL(caif_free_client); 206EXPORT_SYMBOL(caif_free_client);
208 207
209void caif_client_register_refcnt(struct cflayer *adapt_layer, 208void caif_client_register_refcnt(struct cflayer *adapt_layer,
210 void (*hold)(struct cflayer *lyr), 209 void (*hold)(struct cflayer *lyr),
211 void (*put)(struct cflayer *lyr)) 210 void (*put)(struct cflayer *lyr))
212{ 211{
213 struct cfsrvl *service; 212 struct cfsrvl *service;
214 213
diff --git a/net/caif/chnl_net.c b/net/caif/chnl_net.c
index e597733affb8..26a4e4e3a767 100644
--- a/net/caif/chnl_net.c
+++ b/net/caif/chnl_net.c
@@ -167,7 +167,7 @@ static void chnl_put(struct cflayer *lyr)
167} 167}
168 168
169static void chnl_flowctrl_cb(struct cflayer *layr, enum caif_ctrlcmd flow, 169static void chnl_flowctrl_cb(struct cflayer *layr, enum caif_ctrlcmd flow,
170 int phyid) 170 int phyid)
171{ 171{
172 struct chnl_net *priv = container_of(layr, struct chnl_net, chnl); 172 struct chnl_net *priv = container_of(layr, struct chnl_net, chnl);
173 pr_debug("NET flowctrl func called flow: %s\n", 173 pr_debug("NET flowctrl func called flow: %s\n",
@@ -443,7 +443,7 @@ nla_put_failure:
443} 443}
444 444
445static void caif_netlink_parms(struct nlattr *data[], 445static void caif_netlink_parms(struct nlattr *data[],
446 struct caif_connect_request *conn_req) 446 struct caif_connect_request *conn_req)
447{ 447{
448 if (!data) { 448 if (!data) {
449 pr_warn("no params data found\n"); 449 pr_warn("no params data found\n");
@@ -488,7 +488,7 @@ static int ipcaif_newlink(struct net *src_net, struct net_device *dev,
488} 488}
489 489
490static int ipcaif_changelink(struct net_device *dev, struct nlattr *tb[], 490static int ipcaif_changelink(struct net_device *dev, struct nlattr *tb[],
491 struct nlattr *data[]) 491 struct nlattr *data[])
492{ 492{
493 struct chnl_net *caifdev; 493 struct chnl_net *caifdev;
494 ASSERT_RTNL(); 494 ASSERT_RTNL();