diff options
Diffstat (limited to 'net')
48 files changed, 0 insertions, 131 deletions
diff --git a/net/9p/trans_rdma.c b/net/9p/trans_rdma.c index 041101ab4aa5..0ea20c30466c 100644 --- a/net/9p/trans_rdma.c +++ b/net/9p/trans_rdma.c | |||
@@ -308,7 +308,6 @@ handle_recv(struct p9_client *client, struct p9_trans_rdma *rdma, | |||
308 | req, err, status); | 308 | req, err, status); |
309 | rdma->state = P9_RDMA_FLUSHING; | 309 | rdma->state = P9_RDMA_FLUSHING; |
310 | client->status = Disconnected; | 310 | client->status = Disconnected; |
311 | return; | ||
312 | } | 311 | } |
313 | 312 | ||
314 | static void | 313 | static void |
diff --git a/net/atm/br2684.c b/net/atm/br2684.c index d6c7ceaf13e9..6719af6a59fa 100644 --- a/net/atm/br2684.c +++ b/net/atm/br2684.c | |||
@@ -446,7 +446,6 @@ error: | |||
446 | net_dev->stats.rx_errors++; | 446 | net_dev->stats.rx_errors++; |
447 | free_skb: | 447 | free_skb: |
448 | dev_kfree_skb(skb); | 448 | dev_kfree_skb(skb); |
449 | return; | ||
450 | } | 449 | } |
451 | 450 | ||
452 | /* | 451 | /* |
diff --git a/net/atm/lec.c b/net/atm/lec.c index feeaf5718472..d98bde1a0ac8 100644 --- a/net/atm/lec.c +++ b/net/atm/lec.c | |||
@@ -161,8 +161,6 @@ static void lec_handle_bridge(struct sk_buff *skb, struct net_device *dev) | |||
161 | skb_queue_tail(&sk->sk_receive_queue, skb2); | 161 | skb_queue_tail(&sk->sk_receive_queue, skb2); |
162 | sk->sk_data_ready(sk, skb2->len); | 162 | sk->sk_data_ready(sk, skb2->len); |
163 | } | 163 | } |
164 | |||
165 | return; | ||
166 | } | 164 | } |
167 | #endif /* defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) */ | 165 | #endif /* defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) */ |
168 | 166 | ||
@@ -640,7 +638,6 @@ static void lec_set_multicast_list(struct net_device *dev) | |||
640 | * by default, all multicast frames arrive over the bus. | 638 | * by default, all multicast frames arrive over the bus. |
641 | * eventually support selective multicast service | 639 | * eventually support selective multicast service |
642 | */ | 640 | */ |
643 | return; | ||
644 | } | 641 | } |
645 | 642 | ||
646 | static const struct net_device_ops lec_netdev_ops = { | 643 | static const struct net_device_ops lec_netdev_ops = { |
@@ -1199,8 +1196,6 @@ static void __exit lane_module_cleanup(void) | |||
1199 | dev_lec[i] = NULL; | 1196 | dev_lec[i] = NULL; |
1200 | } | 1197 | } |
1201 | } | 1198 | } |
1202 | |||
1203 | return; | ||
1204 | } | 1199 | } |
1205 | 1200 | ||
1206 | module_init(lane_module_init); | 1201 | module_init(lane_module_init); |
@@ -1334,7 +1329,6 @@ static void lane2_associate_ind(struct net_device *dev, const u8 *mac_addr, | |||
1334 | priv->lane2_ops->associate_indicator(dev, mac_addr, | 1329 | priv->lane2_ops->associate_indicator(dev, mac_addr, |
1335 | tlvs, sizeoftlvs); | 1330 | tlvs, sizeoftlvs); |
1336 | } | 1331 | } |
1337 | return; | ||
1338 | } | 1332 | } |
1339 | 1333 | ||
1340 | /* | 1334 | /* |
diff --git a/net/atm/mpc.c b/net/atm/mpc.c index 436f2e177657..622b471e14e0 100644 --- a/net/atm/mpc.c +++ b/net/atm/mpc.c | |||
@@ -455,7 +455,6 @@ static void lane2_assoc_ind(struct net_device *dev, const u8 *mac_addr, | |||
455 | if (end_of_tlvs - tlvs != 0) | 455 | if (end_of_tlvs - tlvs != 0) |
456 | pr_info("(%s) ignoring %Zd bytes of trailing TLV garbage\n", | 456 | pr_info("(%s) ignoring %Zd bytes of trailing TLV garbage\n", |
457 | dev->name, end_of_tlvs - tlvs); | 457 | dev->name, end_of_tlvs - tlvs); |
458 | return; | ||
459 | } | 458 | } |
460 | 459 | ||
461 | /* | 460 | /* |
@@ -684,8 +683,6 @@ static void mpc_vcc_close(struct atm_vcc *vcc, struct net_device *dev) | |||
684 | 683 | ||
685 | if (in_entry == NULL && eg_entry == NULL) | 684 | if (in_entry == NULL && eg_entry == NULL) |
686 | dprintk("(%s) unused vcc closed\n", dev->name); | 685 | dprintk("(%s) unused vcc closed\n", dev->name); |
687 | |||
688 | return; | ||
689 | } | 686 | } |
690 | 687 | ||
691 | static void mpc_push(struct atm_vcc *vcc, struct sk_buff *skb) | 688 | static void mpc_push(struct atm_vcc *vcc, struct sk_buff *skb) |
@@ -783,8 +780,6 @@ static void mpc_push(struct atm_vcc *vcc, struct sk_buff *skb) | |||
783 | 780 | ||
784 | memset(ATM_SKB(skb), 0, sizeof(struct atm_skb_data)); | 781 | memset(ATM_SKB(skb), 0, sizeof(struct atm_skb_data)); |
785 | netif_rx(new_skb); | 782 | netif_rx(new_skb); |
786 | |||
787 | return; | ||
788 | } | 783 | } |
789 | 784 | ||
790 | static struct atmdev_ops mpc_ops = { /* only send is required */ | 785 | static struct atmdev_ops mpc_ops = { /* only send is required */ |
@@ -873,8 +868,6 @@ static void send_set_mps_ctrl_addr(const char *addr, struct mpoa_client *mpc) | |||
873 | mesg.type = SET_MPS_CTRL_ADDR; | 868 | mesg.type = SET_MPS_CTRL_ADDR; |
874 | memcpy(mesg.MPS_ctrl, addr, ATM_ESA_LEN); | 869 | memcpy(mesg.MPS_ctrl, addr, ATM_ESA_LEN); |
875 | msg_to_mpoad(&mesg, mpc); | 870 | msg_to_mpoad(&mesg, mpc); |
876 | |||
877 | return; | ||
878 | } | 871 | } |
879 | 872 | ||
880 | static void mpoad_close(struct atm_vcc *vcc) | 873 | static void mpoad_close(struct atm_vcc *vcc) |
@@ -911,8 +904,6 @@ static void mpoad_close(struct atm_vcc *vcc) | |||
911 | pr_info("(%s) going down\n", | 904 | pr_info("(%s) going down\n", |
912 | (mpc->dev) ? mpc->dev->name : "<unknown>"); | 905 | (mpc->dev) ? mpc->dev->name : "<unknown>"); |
913 | module_put(THIS_MODULE); | 906 | module_put(THIS_MODULE); |
914 | |||
915 | return; | ||
916 | } | 907 | } |
917 | 908 | ||
918 | /* | 909 | /* |
@@ -1122,7 +1113,6 @@ static void MPOA_trigger_rcvd(struct k_message *msg, struct mpoa_client *mpc) | |||
1122 | pr_info("(%s) entry already in resolving state\n", | 1113 | pr_info("(%s) entry already in resolving state\n", |
1123 | (mpc->dev) ? mpc->dev->name : "<unknown>"); | 1114 | (mpc->dev) ? mpc->dev->name : "<unknown>"); |
1124 | mpc->in_ops->put(entry); | 1115 | mpc->in_ops->put(entry); |
1125 | return; | ||
1126 | } | 1116 | } |
1127 | 1117 | ||
1128 | /* | 1118 | /* |
@@ -1166,7 +1156,6 @@ static void check_qos_and_open_shortcut(struct k_message *msg, | |||
1166 | } else | 1156 | } else |
1167 | memset(&msg->qos, 0, sizeof(struct atm_qos)); | 1157 | memset(&msg->qos, 0, sizeof(struct atm_qos)); |
1168 | msg_to_mpoad(msg, client); | 1158 | msg_to_mpoad(msg, client); |
1169 | return; | ||
1170 | } | 1159 | } |
1171 | 1160 | ||
1172 | static void MPOA_res_reply_rcvd(struct k_message *msg, struct mpoa_client *mpc) | 1161 | static void MPOA_res_reply_rcvd(struct k_message *msg, struct mpoa_client *mpc) |
@@ -1240,8 +1229,6 @@ static void ingress_purge_rcvd(struct k_message *msg, struct mpoa_client *mpc) | |||
1240 | mpc->in_ops->put(entry); | 1229 | mpc->in_ops->put(entry); |
1241 | entry = mpc->in_ops->get_with_mask(dst_ip, mpc, mask); | 1230 | entry = mpc->in_ops->get_with_mask(dst_ip, mpc, mask); |
1242 | } while (entry != NULL); | 1231 | } while (entry != NULL); |
1243 | |||
1244 | return; | ||
1245 | } | 1232 | } |
1246 | 1233 | ||
1247 | static void egress_purge_rcvd(struct k_message *msg, struct mpoa_client *mpc) | 1234 | static void egress_purge_rcvd(struct k_message *msg, struct mpoa_client *mpc) |
@@ -1260,8 +1247,6 @@ static void egress_purge_rcvd(struct k_message *msg, struct mpoa_client *mpc) | |||
1260 | write_unlock_irq(&mpc->egress_lock); | 1247 | write_unlock_irq(&mpc->egress_lock); |
1261 | 1248 | ||
1262 | mpc->eg_ops->put(entry); | 1249 | mpc->eg_ops->put(entry); |
1263 | |||
1264 | return; | ||
1265 | } | 1250 | } |
1266 | 1251 | ||
1267 | static void purge_egress_shortcut(struct atm_vcc *vcc, eg_cache_entry *entry) | 1252 | static void purge_egress_shortcut(struct atm_vcc *vcc, eg_cache_entry *entry) |
@@ -1295,8 +1280,6 @@ static void purge_egress_shortcut(struct atm_vcc *vcc, eg_cache_entry *entry) | |||
1295 | skb_queue_tail(&sk->sk_receive_queue, skb); | 1280 | skb_queue_tail(&sk->sk_receive_queue, skb); |
1296 | sk->sk_data_ready(sk, skb->len); | 1281 | sk->sk_data_ready(sk, skb->len); |
1297 | dprintk("exiting\n"); | 1282 | dprintk("exiting\n"); |
1298 | |||
1299 | return; | ||
1300 | } | 1283 | } |
1301 | 1284 | ||
1302 | /* | 1285 | /* |
@@ -1325,8 +1308,6 @@ static void mps_death(struct k_message *msg, struct mpoa_client *mpc) | |||
1325 | 1308 | ||
1326 | mpc->in_ops->destroy_cache(mpc); | 1309 | mpc->in_ops->destroy_cache(mpc); |
1327 | mpc->eg_ops->destroy_cache(mpc); | 1310 | mpc->eg_ops->destroy_cache(mpc); |
1328 | |||
1329 | return; | ||
1330 | } | 1311 | } |
1331 | 1312 | ||
1332 | static void MPOA_cache_impos_rcvd(struct k_message *msg, | 1313 | static void MPOA_cache_impos_rcvd(struct k_message *msg, |
@@ -1353,8 +1334,6 @@ static void MPOA_cache_impos_rcvd(struct k_message *msg, | |||
1353 | write_unlock_irq(&mpc->egress_lock); | 1334 | write_unlock_irq(&mpc->egress_lock); |
1354 | 1335 | ||
1355 | mpc->eg_ops->put(entry); | 1336 | mpc->eg_ops->put(entry); |
1356 | |||
1357 | return; | ||
1358 | } | 1337 | } |
1359 | 1338 | ||
1360 | static void set_mpc_ctrl_addr_rcvd(struct k_message *mesg, | 1339 | static void set_mpc_ctrl_addr_rcvd(struct k_message *mesg, |
@@ -1392,8 +1371,6 @@ static void set_mpc_ctrl_addr_rcvd(struct k_message *mesg, | |||
1392 | pr_info("(%s) targetless LE_ARP request failed\n", | 1371 | pr_info("(%s) targetless LE_ARP request failed\n", |
1393 | mpc->dev->name); | 1372 | mpc->dev->name); |
1394 | } | 1373 | } |
1395 | |||
1396 | return; | ||
1397 | } | 1374 | } |
1398 | 1375 | ||
1399 | static void set_mps_mac_addr_rcvd(struct k_message *msg, | 1376 | static void set_mps_mac_addr_rcvd(struct k_message *msg, |
@@ -1409,8 +1386,6 @@ static void set_mps_mac_addr_rcvd(struct k_message *msg, | |||
1409 | return; | 1386 | return; |
1410 | } | 1387 | } |
1411 | client->number_of_mps_macs = 1; | 1388 | client->number_of_mps_macs = 1; |
1412 | |||
1413 | return; | ||
1414 | } | 1389 | } |
1415 | 1390 | ||
1416 | /* | 1391 | /* |
@@ -1436,7 +1411,6 @@ static void clean_up(struct k_message *msg, struct mpoa_client *mpc, int action) | |||
1436 | 1411 | ||
1437 | msg->type = action; | 1412 | msg->type = action; |
1438 | msg_to_mpoad(msg, mpc); | 1413 | msg_to_mpoad(msg, mpc); |
1439 | return; | ||
1440 | } | 1414 | } |
1441 | 1415 | ||
1442 | static void mpc_timer_refresh(void) | 1416 | static void mpc_timer_refresh(void) |
@@ -1445,8 +1419,6 @@ static void mpc_timer_refresh(void) | |||
1445 | mpc_timer.data = mpc_timer.expires; | 1419 | mpc_timer.data = mpc_timer.expires; |
1446 | mpc_timer.function = mpc_cache_check; | 1420 | mpc_timer.function = mpc_cache_check; |
1447 | add_timer(&mpc_timer); | 1421 | add_timer(&mpc_timer); |
1448 | |||
1449 | return; | ||
1450 | } | 1422 | } |
1451 | 1423 | ||
1452 | static void mpc_cache_check(unsigned long checking_time) | 1424 | static void mpc_cache_check(unsigned long checking_time) |
@@ -1471,8 +1443,6 @@ static void mpc_cache_check(unsigned long checking_time) | |||
1471 | mpc = mpc->next; | 1443 | mpc = mpc->next; |
1472 | } | 1444 | } |
1473 | mpc_timer_refresh(); | 1445 | mpc_timer_refresh(); |
1474 | |||
1475 | return; | ||
1476 | } | 1446 | } |
1477 | 1447 | ||
1478 | static int atm_mpoa_ioctl(struct socket *sock, unsigned int cmd, | 1448 | static int atm_mpoa_ioctl(struct socket *sock, unsigned int cmd, |
@@ -1561,8 +1531,6 @@ static void __exit atm_mpoa_cleanup(void) | |||
1561 | kfree(qos); | 1531 | kfree(qos); |
1562 | qos = nextqos; | 1532 | qos = nextqos; |
1563 | } | 1533 | } |
1564 | |||
1565 | return; | ||
1566 | } | 1534 | } |
1567 | 1535 | ||
1568 | module_init(atm_mpoa_init); | 1536 | module_init(atm_mpoa_init); |
diff --git a/net/atm/mpoa_caches.c b/net/atm/mpoa_caches.c index e773d8336918..d1b2d9a03144 100644 --- a/net/atm/mpoa_caches.c +++ b/net/atm/mpoa_caches.c | |||
@@ -182,8 +182,6 @@ static void in_cache_put(in_cache_entry *entry) | |||
182 | memset(entry, 0, sizeof(in_cache_entry)); | 182 | memset(entry, 0, sizeof(in_cache_entry)); |
183 | kfree(entry); | 183 | kfree(entry); |
184 | } | 184 | } |
185 | |||
186 | return; | ||
187 | } | 185 | } |
188 | 186 | ||
189 | /* | 187 | /* |
@@ -221,8 +219,6 @@ static void in_cache_remove_entry(in_cache_entry *entry, | |||
221 | } | 219 | } |
222 | vcc_release_async(vcc, -EPIPE); | 220 | vcc_release_async(vcc, -EPIPE); |
223 | } | 221 | } |
224 | |||
225 | return; | ||
226 | } | 222 | } |
227 | 223 | ||
228 | /* Call this every MPC-p2 seconds... Not exactly correct solution, | 224 | /* Call this every MPC-p2 seconds... Not exactly correct solution, |
@@ -248,8 +244,6 @@ static void clear_count_and_expired(struct mpoa_client *client) | |||
248 | entry = next_entry; | 244 | entry = next_entry; |
249 | } | 245 | } |
250 | write_unlock_bh(&client->ingress_lock); | 246 | write_unlock_bh(&client->ingress_lock); |
251 | |||
252 | return; | ||
253 | } | 247 | } |
254 | 248 | ||
255 | /* Call this every MPC-p4 seconds. */ | 249 | /* Call this every MPC-p4 seconds. */ |
@@ -334,8 +328,6 @@ static void in_destroy_cache(struct mpoa_client *mpc) | |||
334 | while (mpc->in_cache != NULL) | 328 | while (mpc->in_cache != NULL) |
335 | mpc->in_ops->remove_entry(mpc->in_cache, mpc); | 329 | mpc->in_ops->remove_entry(mpc->in_cache, mpc); |
336 | write_unlock_irq(&mpc->ingress_lock); | 330 | write_unlock_irq(&mpc->ingress_lock); |
337 | |||
338 | return; | ||
339 | } | 331 | } |
340 | 332 | ||
341 | static eg_cache_entry *eg_cache_get_by_cache_id(__be32 cache_id, | 333 | static eg_cache_entry *eg_cache_get_by_cache_id(__be32 cache_id, |
@@ -427,8 +419,6 @@ static void eg_cache_put(eg_cache_entry *entry) | |||
427 | memset(entry, 0, sizeof(eg_cache_entry)); | 419 | memset(entry, 0, sizeof(eg_cache_entry)); |
428 | kfree(entry); | 420 | kfree(entry); |
429 | } | 421 | } |
430 | |||
431 | return; | ||
432 | } | 422 | } |
433 | 423 | ||
434 | /* | 424 | /* |
@@ -463,8 +453,6 @@ static void eg_cache_remove_entry(eg_cache_entry *entry, | |||
463 | } | 453 | } |
464 | vcc_release_async(vcc, -EPIPE); | 454 | vcc_release_async(vcc, -EPIPE); |
465 | } | 455 | } |
466 | |||
467 | return; | ||
468 | } | 456 | } |
469 | 457 | ||
470 | static eg_cache_entry *eg_cache_add_entry(struct k_message *msg, | 458 | static eg_cache_entry *eg_cache_add_entry(struct k_message *msg, |
@@ -509,8 +497,6 @@ static void update_eg_cache_entry(eg_cache_entry *entry, uint16_t holding_time) | |||
509 | do_gettimeofday(&(entry->tv)); | 497 | do_gettimeofday(&(entry->tv)); |
510 | entry->entry_state = EGRESS_RESOLVED; | 498 | entry->entry_state = EGRESS_RESOLVED; |
511 | entry->ctrl_info.holding_time = holding_time; | 499 | entry->ctrl_info.holding_time = holding_time; |
512 | |||
513 | return; | ||
514 | } | 500 | } |
515 | 501 | ||
516 | static void clear_expired(struct mpoa_client *client) | 502 | static void clear_expired(struct mpoa_client *client) |
@@ -537,8 +523,6 @@ static void clear_expired(struct mpoa_client *client) | |||
537 | entry = next_entry; | 523 | entry = next_entry; |
538 | } | 524 | } |
539 | write_unlock_irq(&client->egress_lock); | 525 | write_unlock_irq(&client->egress_lock); |
540 | |||
541 | return; | ||
542 | } | 526 | } |
543 | 527 | ||
544 | static void eg_destroy_cache(struct mpoa_client *mpc) | 528 | static void eg_destroy_cache(struct mpoa_client *mpc) |
@@ -547,8 +531,6 @@ static void eg_destroy_cache(struct mpoa_client *mpc) | |||
547 | while (mpc->eg_cache != NULL) | 531 | while (mpc->eg_cache != NULL) |
548 | mpc->eg_ops->remove_entry(mpc->eg_cache, mpc); | 532 | mpc->eg_ops->remove_entry(mpc->eg_cache, mpc); |
549 | write_unlock_irq(&mpc->egress_lock); | 533 | write_unlock_irq(&mpc->egress_lock); |
550 | |||
551 | return; | ||
552 | } | 534 | } |
553 | 535 | ||
554 | 536 | ||
@@ -584,6 +566,4 @@ void atm_mpoa_init_cache(struct mpoa_client *mpc) | |||
584 | { | 566 | { |
585 | mpc->in_ops = &ingress_ops; | 567 | mpc->in_ops = &ingress_ops; |
586 | mpc->eg_ops = &egress_ops; | 568 | mpc->eg_ops = &egress_ops; |
587 | |||
588 | return; | ||
589 | } | 569 | } |
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 5e83f8e0877a..2f768de87011 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c | |||
@@ -1316,8 +1316,6 @@ void hci_send_acl(struct hci_conn *conn, struct sk_buff *skb, __u16 flags) | |||
1316 | } | 1316 | } |
1317 | 1317 | ||
1318 | tasklet_schedule(&hdev->tx_task); | 1318 | tasklet_schedule(&hdev->tx_task); |
1319 | |||
1320 | return; | ||
1321 | } | 1319 | } |
1322 | EXPORT_SYMBOL(hci_send_acl); | 1320 | EXPORT_SYMBOL(hci_send_acl); |
1323 | 1321 | ||
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c index 673a36886716..1b682a5aa061 100644 --- a/net/bluetooth/l2cap.c +++ b/net/bluetooth/l2cap.c | |||
@@ -1322,8 +1322,6 @@ static void l2cap_drop_acked_frames(struct sock *sk) | |||
1322 | 1322 | ||
1323 | if (!l2cap_pi(sk)->unacked_frames) | 1323 | if (!l2cap_pi(sk)->unacked_frames) |
1324 | del_timer(&l2cap_pi(sk)->retrans_timer); | 1324 | del_timer(&l2cap_pi(sk)->retrans_timer); |
1325 | |||
1326 | return; | ||
1327 | } | 1325 | } |
1328 | 1326 | ||
1329 | static inline void l2cap_do_send(struct sock *sk, struct sk_buff *skb) | 1327 | static inline void l2cap_do_send(struct sock *sk, struct sk_buff *skb) |
@@ -4667,7 +4665,6 @@ void l2cap_load(void) | |||
4667 | /* Dummy function to trigger automatic L2CAP module loading by | 4665 | /* Dummy function to trigger automatic L2CAP module loading by |
4668 | * other modules that use L2CAP sockets but don't use any other | 4666 | * other modules that use L2CAP sockets but don't use any other |
4669 | * symbols from it. */ | 4667 | * symbols from it. */ |
4670 | return; | ||
4671 | } | 4668 | } |
4672 | EXPORT_SYMBOL(l2cap_load); | 4669 | EXPORT_SYMBOL(l2cap_load); |
4673 | 4670 | ||
diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c index cab71ea2796d..309b6c261b25 100644 --- a/net/bluetooth/rfcomm/tty.c +++ b/net/bluetooth/rfcomm/tty.c | |||
@@ -1014,8 +1014,6 @@ static void rfcomm_tty_set_termios(struct tty_struct *tty, struct ktermios *old) | |||
1014 | rfcomm_send_rpn(dev->dlc->session, 1, dev->dlc->dlci, baud, | 1014 | rfcomm_send_rpn(dev->dlc->session, 1, dev->dlc->dlci, baud, |
1015 | data_bits, stop_bits, parity, | 1015 | data_bits, stop_bits, parity, |
1016 | RFCOMM_RPN_FLOW_NONE, x_on, x_off, changes); | 1016 | RFCOMM_RPN_FLOW_NONE, x_on, x_off, changes); |
1017 | |||
1018 | return; | ||
1019 | } | 1017 | } |
1020 | 1018 | ||
1021 | static void rfcomm_tty_throttle(struct tty_struct *tty) | 1019 | static void rfcomm_tty_throttle(struct tty_struct *tty) |
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c index 4767928a93d3..d0927d1fdada 100644 --- a/net/bluetooth/sco.c +++ b/net/bluetooth/sco.c | |||
@@ -273,7 +273,6 @@ static inline void sco_recv_frame(struct sco_conn *conn, struct sk_buff *skb) | |||
273 | 273 | ||
274 | drop: | 274 | drop: |
275 | kfree_skb(skb); | 275 | kfree_skb(skb); |
276 | return; | ||
277 | } | 276 | } |
278 | 277 | ||
279 | /* -------- Socket interface ---------- */ | 278 | /* -------- Socket interface ---------- */ |
diff --git a/net/caif/caif_dev.c b/net/caif/caif_dev.c index 024fd5bb2d39..e2b86f1f5a47 100644 --- a/net/caif/caif_dev.c +++ b/net/caif/caif_dev.c | |||
@@ -112,7 +112,6 @@ static void caif_device_destroy(struct net_device *dev) | |||
112 | spin_unlock_bh(&caifdevs->lock); | 112 | spin_unlock_bh(&caifdevs->lock); |
113 | 113 | ||
114 | kfree(caifd); | 114 | kfree(caifd); |
115 | return; | ||
116 | } | 115 | } |
117 | 116 | ||
118 | static int transmit(struct cflayer *layer, struct cfpkt *pkt) | 117 | static int transmit(struct cflayer *layer, struct cfpkt *pkt) |
diff --git a/net/can/bcm.c b/net/can/bcm.c index 907dc871fac8..9c65e9deb9c3 100644 --- a/net/can/bcm.c +++ b/net/can/bcm.c | |||
@@ -713,8 +713,6 @@ static void bcm_remove_op(struct bcm_op *op) | |||
713 | kfree(op->last_frames); | 713 | kfree(op->last_frames); |
714 | 714 | ||
715 | kfree(op); | 715 | kfree(op); |
716 | |||
717 | return; | ||
718 | } | 716 | } |
719 | 717 | ||
720 | static void bcm_rx_unreg(struct net_device *dev, struct bcm_op *op) | 718 | static void bcm_rx_unreg(struct net_device *dev, struct bcm_op *op) |
diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c index 615dbe3b43f9..4c409b46aa35 100644 --- a/net/decnet/dn_dev.c +++ b/net/decnet/dn_dev.c | |||
@@ -1220,17 +1220,14 @@ void dn_dev_down(struct net_device *dev) | |||
1220 | 1220 | ||
1221 | void dn_dev_init_pkt(struct sk_buff *skb) | 1221 | void dn_dev_init_pkt(struct sk_buff *skb) |
1222 | { | 1222 | { |
1223 | return; | ||
1224 | } | 1223 | } |
1225 | 1224 | ||
1226 | void dn_dev_veri_pkt(struct sk_buff *skb) | 1225 | void dn_dev_veri_pkt(struct sk_buff *skb) |
1227 | { | 1226 | { |
1228 | return; | ||
1229 | } | 1227 | } |
1230 | 1228 | ||
1231 | void dn_dev_hello(struct sk_buff *skb) | 1229 | void dn_dev_hello(struct sk_buff *skb) |
1232 | { | 1230 | { |
1233 | return; | ||
1234 | } | 1231 | } |
1235 | 1232 | ||
1236 | void dn_dev_devices_off(void) | 1233 | void dn_dev_devices_off(void) |
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c index a8432e399545..812e6dff6067 100644 --- a/net/decnet/dn_route.c +++ b/net/decnet/dn_route.c | |||
@@ -264,7 +264,6 @@ static struct dst_entry *dn_dst_negative_advice(struct dst_entry *dst) | |||
264 | 264 | ||
265 | static void dn_dst_link_failure(struct sk_buff *skb) | 265 | static void dn_dst_link_failure(struct sk_buff *skb) |
266 | { | 266 | { |
267 | return; | ||
268 | } | 267 | } |
269 | 268 | ||
270 | static inline int compare_keys(struct flowi *fl1, struct flowi *fl2) | 269 | static inline int compare_keys(struct flowi *fl1, struct flowi *fl2) |
diff --git a/net/ipv4/cipso_ipv4.c b/net/ipv4/cipso_ipv4.c index c97cd9ff697e..3a92a76ae41d 100644 --- a/net/ipv4/cipso_ipv4.c +++ b/net/ipv4/cipso_ipv4.c | |||
@@ -290,8 +290,6 @@ void cipso_v4_cache_invalidate(void) | |||
290 | cipso_v4_cache[iter].size = 0; | 290 | cipso_v4_cache[iter].size = 0; |
291 | spin_unlock_bh(&cipso_v4_cache[iter].lock); | 291 | spin_unlock_bh(&cipso_v4_cache[iter].lock); |
292 | } | 292 | } |
293 | |||
294 | return; | ||
295 | } | 293 | } |
296 | 294 | ||
297 | /** | 295 | /** |
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c index c98f115fb0fd..79d057a939ba 100644 --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c | |||
@@ -1022,8 +1022,6 @@ static void trie_rebalance(struct trie *t, struct tnode *tn) | |||
1022 | 1022 | ||
1023 | rcu_assign_pointer(t->trie, (struct node *)tn); | 1023 | rcu_assign_pointer(t->trie, (struct node *)tn); |
1024 | tnode_free_flush(); | 1024 | tnode_free_flush(); |
1025 | |||
1026 | return; | ||
1027 | } | 1025 | } |
1028 | 1026 | ||
1029 | /* only used from updater-side */ | 1027 | /* only used from updater-side */ |
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index 498cf69c7977..32618e11076d 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c | |||
@@ -502,7 +502,6 @@ static void ipgre_err(struct sk_buff *skb, u32 info) | |||
502 | t->err_time = jiffies; | 502 | t->err_time = jiffies; |
503 | out: | 503 | out: |
504 | rcu_read_unlock(); | 504 | rcu_read_unlock(); |
505 | return; | ||
506 | } | 505 | } |
507 | 506 | ||
508 | static inline void ipgre_ecn_decapsulate(struct iphdr *iph, struct sk_buff *skb) | 507 | static inline void ipgre_ecn_decapsulate(struct iphdr *iph, struct sk_buff *skb) |
diff --git a/net/ipv4/ip_options.c b/net/ipv4/ip_options.c index 3244133c24f6..ba9836c488ed 100644 --- a/net/ipv4/ip_options.c +++ b/net/ipv4/ip_options.c | |||
@@ -238,7 +238,6 @@ void ip_options_fragment(struct sk_buff * skb) | |||
238 | opt->rr_needaddr = 0; | 238 | opt->rr_needaddr = 0; |
239 | opt->ts_needaddr = 0; | 239 | opt->ts_needaddr = 0; |
240 | opt->ts_needtime = 0; | 240 | opt->ts_needtime = 0; |
241 | return; | ||
242 | } | 241 | } |
243 | 242 | ||
244 | /* | 243 | /* |
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index 217ebe035b34..7bcacf627b46 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c | |||
@@ -1606,7 +1606,6 @@ static void ipmr_queue_xmit(struct net *net, struct mr_table *mrt, | |||
1606 | 1606 | ||
1607 | out_free: | 1607 | out_free: |
1608 | kfree_skb(skb); | 1608 | kfree_skb(skb); |
1609 | return; | ||
1610 | } | 1609 | } |
1611 | 1610 | ||
1612 | static int ipmr_find_vif(struct mr_table *mrt, struct net_device *dev) | 1611 | static int ipmr_find_vif(struct mr_table *mrt, struct net_device *dev) |
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index 3f7c12b70a26..0abdc242ddb7 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c | |||
@@ -890,8 +890,6 @@ out: | |||
890 | in6_ifa_put(ifp); | 890 | in6_ifa_put(ifp); |
891 | else | 891 | else |
892 | in6_dev_put(idev); | 892 | in6_dev_put(idev); |
893 | |||
894 | return; | ||
895 | } | 893 | } |
896 | 894 | ||
897 | static void ndisc_recv_na(struct sk_buff *skb) | 895 | static void ndisc_recv_na(struct sk_buff *skb) |
diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c index 458eabfbe130..566798d69f37 100644 --- a/net/ipv6/proc.c +++ b/net/ipv6/proc.c | |||
@@ -168,7 +168,6 @@ static void snmp6_seq_show_icmpv6msg(struct seq_file *seq, void __percpu **mib) | |||
168 | i & 0x100 ? "Out" : "In", i & 0xff); | 168 | i & 0x100 ? "Out" : "In", i & 0xff); |
169 | seq_printf(seq, "%-32s\t%lu\n", name, val); | 169 | seq_printf(seq, "%-32s\t%lu\n", name, val); |
170 | } | 170 | } |
171 | return; | ||
172 | } | 171 | } |
173 | 172 | ||
174 | static void snmp6_seq_show_item(struct seq_file *seq, void __percpu **mib, | 173 | static void snmp6_seq_show_item(struct seq_file *seq, void __percpu **mib, |
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 05ebd7833043..294cbe8b0725 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c | |||
@@ -316,7 +316,6 @@ static void rt6_probe(struct rt6_info *rt) | |||
316 | #else | 316 | #else |
317 | static inline void rt6_probe(struct rt6_info *rt) | 317 | static inline void rt6_probe(struct rt6_info *rt) |
318 | { | 318 | { |
319 | return; | ||
320 | } | 319 | } |
321 | #endif | 320 | #endif |
322 | 321 | ||
@@ -1553,7 +1552,6 @@ void rt6_redirect(struct in6_addr *dest, struct in6_addr *src, | |||
1553 | 1552 | ||
1554 | out: | 1553 | out: |
1555 | dst_release(&rt->u.dst); | 1554 | dst_release(&rt->u.dst); |
1556 | return; | ||
1557 | } | 1555 | } |
1558 | 1556 | ||
1559 | /* | 1557 | /* |
diff --git a/net/irda/iriap.c b/net/irda/iriap.c index 79a1e5a23e10..fce364c6c71a 100644 --- a/net/irda/iriap.c +++ b/net/irda/iriap.c | |||
@@ -685,8 +685,6 @@ static void iriap_getvaluebyclass_indication(struct iriap_cb *self, | |||
685 | /* We have a match; send the value. */ | 685 | /* We have a match; send the value. */ |
686 | iriap_getvaluebyclass_response(self, obj->id, IAS_SUCCESS, | 686 | iriap_getvaluebyclass_response(self, obj->id, IAS_SUCCESS, |
687 | attrib->value); | 687 | attrib->value); |
688 | |||
689 | return; | ||
690 | } | 688 | } |
691 | 689 | ||
692 | /* | 690 | /* |
diff --git a/net/irda/irnet/irnet_irda.c b/net/irda/irnet/irnet_irda.c index df18ab4b6c5e..e98e40d76f4f 100644 --- a/net/irda/irnet/irnet_irda.c +++ b/net/irda/irnet/irnet_irda.c | |||
@@ -678,7 +678,6 @@ irda_irnet_destroy(irnet_socket * self) | |||
678 | self->stsap_sel = 0; | 678 | self->stsap_sel = 0; |
679 | 679 | ||
680 | DEXIT(IRDA_SOCK_TRACE, "\n"); | 680 | DEXIT(IRDA_SOCK_TRACE, "\n"); |
681 | return; | ||
682 | } | 681 | } |
683 | 682 | ||
684 | 683 | ||
@@ -928,7 +927,6 @@ irnet_disconnect_server(irnet_socket * self, | |||
928 | irttp_listen(self->tsap); | 927 | irttp_listen(self->tsap); |
929 | 928 | ||
930 | DEXIT(IRDA_SERV_TRACE, "\n"); | 929 | DEXIT(IRDA_SERV_TRACE, "\n"); |
931 | return; | ||
932 | } | 930 | } |
933 | 931 | ||
934 | /*------------------------------------------------------------------*/ | 932 | /*------------------------------------------------------------------*/ |
@@ -1013,7 +1011,6 @@ irnet_destroy_server(void) | |||
1013 | irda_irnet_destroy(&irnet_server.s); | 1011 | irda_irnet_destroy(&irnet_server.s); |
1014 | 1012 | ||
1015 | DEXIT(IRDA_SERV_TRACE, "\n"); | 1013 | DEXIT(IRDA_SERV_TRACE, "\n"); |
1016 | return; | ||
1017 | } | 1014 | } |
1018 | 1015 | ||
1019 | 1016 | ||
diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c index 8be324fe08b9..c8b4599a752e 100644 --- a/net/iucv/af_iucv.c +++ b/net/iucv/af_iucv.c | |||
@@ -136,7 +136,6 @@ static void afiucv_pm_complete(struct device *dev) | |||
136 | #ifdef CONFIG_PM_DEBUG | 136 | #ifdef CONFIG_PM_DEBUG |
137 | printk(KERN_WARNING "afiucv_pm_complete\n"); | 137 | printk(KERN_WARNING "afiucv_pm_complete\n"); |
138 | #endif | 138 | #endif |
139 | return; | ||
140 | } | 139 | } |
141 | 140 | ||
142 | /** | 141 | /** |
diff --git a/net/mac80211/debugfs.h b/net/mac80211/debugfs.h index 68e6a2050f9a..09cc9be34796 100644 --- a/net/mac80211/debugfs.h +++ b/net/mac80211/debugfs.h | |||
@@ -7,7 +7,6 @@ extern int mac80211_open_file_generic(struct inode *inode, struct file *file); | |||
7 | #else | 7 | #else |
8 | static inline void debugfs_hw_add(struct ieee80211_local *local) | 8 | static inline void debugfs_hw_add(struct ieee80211_local *local) |
9 | { | 9 | { |
10 | return; | ||
11 | } | 10 | } |
12 | #endif | 11 | #endif |
13 | 12 | ||
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index 7e93524459fc..bde81031727a 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c | |||
@@ -287,8 +287,6 @@ void mesh_mgmt_ies_add(struct sk_buff *skb, struct ieee80211_sub_if_data *sdata) | |||
287 | *pos++ |= sdata->u.mesh.accepting_plinks ? | 287 | *pos++ |= sdata->u.mesh.accepting_plinks ? |
288 | MESHCONF_CAPAB_ACCEPT_PLINKS : 0x00; | 288 | MESHCONF_CAPAB_ACCEPT_PLINKS : 0x00; |
289 | *pos++ = 0x00; | 289 | *pos++ = 0x00; |
290 | |||
291 | return; | ||
292 | } | 290 | } |
293 | 291 | ||
294 | u32 mesh_table_hash(u8 *addr, struct ieee80211_sub_if_data *sdata, struct mesh_table *tbl) | 292 | u32 mesh_table_hash(u8 *addr, struct ieee80211_sub_if_data *sdata, struct mesh_table *tbl) |
diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c index d89ed7f2592b..0705018d8d1e 100644 --- a/net/mac80211/mesh_hwmp.c +++ b/net/mac80211/mesh_hwmp.c | |||
@@ -624,7 +624,6 @@ static void hwmp_prep_frame_process(struct ieee80211_sub_if_data *sdata, | |||
624 | fail: | 624 | fail: |
625 | rcu_read_unlock(); | 625 | rcu_read_unlock(); |
626 | sdata->u.mesh.mshstats.dropped_frames_no_route++; | 626 | sdata->u.mesh.mshstats.dropped_frames_no_route++; |
627 | return; | ||
628 | } | 627 | } |
629 | 628 | ||
630 | static void hwmp_perr_frame_process(struct ieee80211_sub_if_data *sdata, | 629 | static void hwmp_perr_frame_process(struct ieee80211_sub_if_data *sdata, |
diff --git a/net/netlabel/netlabel_addrlist.h b/net/netlabel/netlabel_addrlist.h index 07ae7fd82be1..1c1c093cf279 100644 --- a/net/netlabel/netlabel_addrlist.h +++ b/net/netlabel/netlabel_addrlist.h | |||
@@ -130,7 +130,6 @@ static inline void netlbl_af4list_audit_addr(struct audit_buffer *audit_buf, | |||
130 | int src, const char *dev, | 130 | int src, const char *dev, |
131 | __be32 addr, __be32 mask) | 131 | __be32 addr, __be32 mask) |
132 | { | 132 | { |
133 | return; | ||
134 | } | 133 | } |
135 | #endif | 134 | #endif |
136 | 135 | ||
@@ -203,7 +202,6 @@ static inline void netlbl_af6list_audit_addr(struct audit_buffer *audit_buf, | |||
203 | const struct in6_addr *addr, | 202 | const struct in6_addr *addr, |
204 | const struct in6_addr *mask) | 203 | const struct in6_addr *mask) |
205 | { | 204 | { |
206 | return; | ||
207 | } | 205 | } |
208 | #endif | 206 | #endif |
209 | #endif /* IPV6 */ | 207 | #endif /* IPV6 */ |
diff --git a/net/netlabel/netlabel_unlabeled.c b/net/netlabel/netlabel_unlabeled.c index a3d64aabe2f7..e2b0a680dd56 100644 --- a/net/netlabel/netlabel_unlabeled.c +++ b/net/netlabel/netlabel_unlabeled.c | |||
@@ -670,7 +670,6 @@ static void netlbl_unlhsh_condremove_iface(struct netlbl_unlhsh_iface *iface) | |||
670 | 670 | ||
671 | unlhsh_condremove_failure: | 671 | unlhsh_condremove_failure: |
672 | spin_unlock(&netlbl_unlhsh_lock); | 672 | spin_unlock(&netlbl_unlhsh_lock); |
673 | return; | ||
674 | } | 673 | } |
675 | 674 | ||
676 | /** | 675 | /** |
diff --git a/net/sched/cls_flow.c b/net/sched/cls_flow.c index 6ed61b10e002..f73542d2cdd0 100644 --- a/net/sched/cls_flow.c +++ b/net/sched/cls_flow.c | |||
@@ -602,7 +602,6 @@ static unsigned long flow_get(struct tcf_proto *tp, u32 handle) | |||
602 | 602 | ||
603 | static void flow_put(struct tcf_proto *tp, unsigned long f) | 603 | static void flow_put(struct tcf_proto *tp, unsigned long f) |
604 | { | 604 | { |
605 | return; | ||
606 | } | 605 | } |
607 | 606 | ||
608 | static int flow_dump(struct tcf_proto *tp, unsigned long fh, | 607 | static int flow_dump(struct tcf_proto *tp, unsigned long fh, |
diff --git a/net/sched/sch_hfsc.c b/net/sched/sch_hfsc.c index a435cf13cc27..abd904be4287 100644 --- a/net/sched/sch_hfsc.c +++ b/net/sched/sch_hfsc.c | |||
@@ -617,7 +617,6 @@ rtsc_min(struct runtime_sc *rtsc, struct internal_sc *isc, u64 x, u64 y) | |||
617 | rtsc->y = y; | 617 | rtsc->y = y; |
618 | rtsc->dx = dx; | 618 | rtsc->dx = dx; |
619 | rtsc->dy = dy; | 619 | rtsc->dy = dy; |
620 | return; | ||
621 | } | 620 | } |
622 | 621 | ||
623 | static void | 622 | static void |
diff --git a/net/sched/sch_ingress.c b/net/sched/sch_ingress.c index a9e646bdb605..f10e34a68445 100644 --- a/net/sched/sch_ingress.c +++ b/net/sched/sch_ingress.c | |||
@@ -44,7 +44,6 @@ static void ingress_put(struct Qdisc *sch, unsigned long cl) | |||
44 | 44 | ||
45 | static void ingress_walk(struct Qdisc *sch, struct qdisc_walker *walker) | 45 | static void ingress_walk(struct Qdisc *sch, struct qdisc_walker *walker) |
46 | { | 46 | { |
47 | return; | ||
48 | } | 47 | } |
49 | 48 | ||
50 | static struct tcf_proto **ingress_find_tcf(struct Qdisc *sch, unsigned long cl) | 49 | static struct tcf_proto **ingress_find_tcf(struct Qdisc *sch, unsigned long cl) |
diff --git a/net/sched/sch_mq.c b/net/sched/sch_mq.c index b2aba3f5e6fa..fe91e50f9d98 100644 --- a/net/sched/sch_mq.c +++ b/net/sched/sch_mq.c | |||
@@ -174,7 +174,6 @@ static unsigned long mq_get(struct Qdisc *sch, u32 classid) | |||
174 | 174 | ||
175 | static void mq_put(struct Qdisc *sch, unsigned long cl) | 175 | static void mq_put(struct Qdisc *sch, unsigned long cl) |
176 | { | 176 | { |
177 | return; | ||
178 | } | 177 | } |
179 | 178 | ||
180 | static int mq_dump_class(struct Qdisc *sch, unsigned long cl, | 179 | static int mq_dump_class(struct Qdisc *sch, unsigned long cl, |
diff --git a/net/sched/sch_multiq.c b/net/sched/sch_multiq.c index c50876cd8704..6ae251279fc2 100644 --- a/net/sched/sch_multiq.c +++ b/net/sched/sch_multiq.c | |||
@@ -340,7 +340,6 @@ static unsigned long multiq_bind(struct Qdisc *sch, unsigned long parent, | |||
340 | 340 | ||
341 | static void multiq_put(struct Qdisc *q, unsigned long cl) | 341 | static void multiq_put(struct Qdisc *q, unsigned long cl) |
342 | { | 342 | { |
343 | return; | ||
344 | } | 343 | } |
345 | 344 | ||
346 | static int multiq_dump_class(struct Qdisc *sch, unsigned long cl, | 345 | static int multiq_dump_class(struct Qdisc *sch, unsigned long cl, |
diff --git a/net/sched/sch_prio.c b/net/sched/sch_prio.c index 81672e0c1b25..0748fb1e3a49 100644 --- a/net/sched/sch_prio.c +++ b/net/sched/sch_prio.c | |||
@@ -303,7 +303,6 @@ static unsigned long prio_bind(struct Qdisc *sch, unsigned long parent, u32 clas | |||
303 | 303 | ||
304 | static void prio_put(struct Qdisc *q, unsigned long cl) | 304 | static void prio_put(struct Qdisc *q, unsigned long cl) |
305 | { | 305 | { |
306 | return; | ||
307 | } | 306 | } |
308 | 307 | ||
309 | static int prio_dump_class(struct Qdisc *sch, unsigned long cl, struct sk_buff *skb, | 308 | static int prio_dump_class(struct Qdisc *sch, unsigned long cl, struct sk_buff *skb, |
diff --git a/net/sched/sch_red.c b/net/sched/sch_red.c index 072cdf442f8e..8d42bb3ba540 100644 --- a/net/sched/sch_red.c +++ b/net/sched/sch_red.c | |||
@@ -303,7 +303,6 @@ static unsigned long red_get(struct Qdisc *sch, u32 classid) | |||
303 | 303 | ||
304 | static void red_put(struct Qdisc *sch, unsigned long arg) | 304 | static void red_put(struct Qdisc *sch, unsigned long arg) |
305 | { | 305 | { |
306 | return; | ||
307 | } | 306 | } |
308 | 307 | ||
309 | static void red_walk(struct Qdisc *sch, struct qdisc_walker *walker) | 308 | static void red_walk(struct Qdisc *sch, struct qdisc_walker *walker) |
diff --git a/net/sctp/associola.c b/net/sctp/associola.c index 3912420cedcc..e41feff19e43 100644 --- a/net/sctp/associola.c +++ b/net/sctp/associola.c | |||
@@ -816,8 +816,6 @@ void sctp_assoc_del_nonprimary_peers(struct sctp_association *asoc, | |||
816 | if (t != primary) | 816 | if (t != primary) |
817 | sctp_assoc_rm_peer(asoc, t); | 817 | sctp_assoc_rm_peer(asoc, t); |
818 | } | 818 | } |
819 | |||
820 | return; | ||
821 | } | 819 | } |
822 | 820 | ||
823 | /* Engage in transport control operations. | 821 | /* Engage in transport control operations. |
diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c index 5d057178ce0c..c04b2eb59186 100644 --- a/net/sctp/outqueue.c +++ b/net/sctp/outqueue.c | |||
@@ -80,7 +80,6 @@ static inline void sctp_outq_head_data(struct sctp_outq *q, | |||
80 | { | 80 | { |
81 | list_add(&ch->list, &q->out_chunk_list); | 81 | list_add(&ch->list, &q->out_chunk_list); |
82 | q->out_qlen += ch->skb->len; | 82 | q->out_qlen += ch->skb->len; |
83 | return; | ||
84 | } | 83 | } |
85 | 84 | ||
86 | /* Take data from the front of the queue. */ | 85 | /* Take data from the front of the queue. */ |
@@ -103,7 +102,6 @@ static inline void sctp_outq_tail_data(struct sctp_outq *q, | |||
103 | { | 102 | { |
104 | list_add_tail(&ch->list, &q->out_chunk_list); | 103 | list_add_tail(&ch->list, &q->out_chunk_list); |
105 | q->out_qlen += ch->skb->len; | 104 | q->out_qlen += ch->skb->len; |
106 | return; | ||
107 | } | 105 | } |
108 | 106 | ||
109 | /* | 107 | /* |
diff --git a/net/sctp/proc.c b/net/sctp/proc.c index 784bcc9a979d..61aacfbbaa92 100644 --- a/net/sctp/proc.c +++ b/net/sctp/proc.c | |||
@@ -181,7 +181,6 @@ static void * sctp_eps_seq_start(struct seq_file *seq, loff_t *pos) | |||
181 | 181 | ||
182 | static void sctp_eps_seq_stop(struct seq_file *seq, void *v) | 182 | static void sctp_eps_seq_stop(struct seq_file *seq, void *v) |
183 | { | 183 | { |
184 | return; | ||
185 | } | 184 | } |
186 | 185 | ||
187 | 186 | ||
@@ -286,7 +285,6 @@ static void * sctp_assocs_seq_start(struct seq_file *seq, loff_t *pos) | |||
286 | 285 | ||
287 | static void sctp_assocs_seq_stop(struct seq_file *seq, void *v) | 286 | static void sctp_assocs_seq_stop(struct seq_file *seq, void *v) |
288 | { | 287 | { |
289 | return; | ||
290 | } | 288 | } |
291 | 289 | ||
292 | 290 | ||
@@ -409,7 +407,6 @@ static void *sctp_remaddr_seq_next(struct seq_file *seq, void *v, loff_t *pos) | |||
409 | 407 | ||
410 | static void sctp_remaddr_seq_stop(struct seq_file *seq, void *v) | 408 | static void sctp_remaddr_seq_stop(struct seq_file *seq, void *v) |
411 | { | 409 | { |
412 | return; | ||
413 | } | 410 | } |
414 | 411 | ||
415 | static int sctp_remaddr_seq_show(struct seq_file *seq, void *v) | 412 | static int sctp_remaddr_seq_show(struct seq_file *seq, void *v) |
diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c index 22e670200449..f5e5e27cac5e 100644 --- a/net/sctp/sm_sideeffect.c +++ b/net/sctp/sm_sideeffect.c | |||
@@ -892,8 +892,6 @@ static void sctp_cmd_process_fwdtsn(struct sctp_ulpq *ulpq, | |||
892 | sctp_walk_fwdtsn(skip, chunk) { | 892 | sctp_walk_fwdtsn(skip, chunk) { |
893 | sctp_ulpq_skip(ulpq, ntohs(skip->stream), ntohs(skip->ssn)); | 893 | sctp_ulpq_skip(ulpq, ntohs(skip->stream), ntohs(skip->ssn)); |
894 | } | 894 | } |
895 | |||
896 | return; | ||
897 | } | 895 | } |
898 | 896 | ||
899 | /* Helper function to remove the association non-primary peer | 897 | /* Helper function to remove the association non-primary peer |
@@ -912,8 +910,6 @@ static void sctp_cmd_del_non_primary(struct sctp_association *asoc) | |||
912 | sctp_assoc_del_peer(asoc, &t->ipaddr); | 910 | sctp_assoc_del_peer(asoc, &t->ipaddr); |
913 | } | 911 | } |
914 | } | 912 | } |
915 | |||
916 | return; | ||
917 | } | 913 | } |
918 | 914 | ||
919 | /* Helper function to set sk_err on a 1-1 style socket. */ | 915 | /* Helper function to set sk_err on a 1-1 style socket. */ |
diff --git a/net/sctp/ulpqueue.c b/net/sctp/ulpqueue.c index 3a448536f0b6..c7f7e49609cb 100644 --- a/net/sctp/ulpqueue.c +++ b/net/sctp/ulpqueue.c | |||
@@ -955,7 +955,6 @@ void sctp_ulpq_skip(struct sctp_ulpq *ulpq, __u16 sid, __u16 ssn) | |||
955 | * ordering and deliver them if needed. | 955 | * ordering and deliver them if needed. |
956 | */ | 956 | */ |
957 | sctp_ulpq_reap_ordered(ulpq, sid); | 957 | sctp_ulpq_reap_ordered(ulpq, sid); |
958 | return; | ||
959 | } | 958 | } |
960 | 959 | ||
961 | static __u16 sctp_ulpq_renege_list(struct sctp_ulpq *ulpq, | 960 | static __u16 sctp_ulpq_renege_list(struct sctp_ulpq *ulpq, |
@@ -1064,7 +1063,6 @@ void sctp_ulpq_renege(struct sctp_ulpq *ulpq, struct sctp_chunk *chunk, | |||
1064 | } | 1063 | } |
1065 | 1064 | ||
1066 | sk_mem_reclaim(asoc->base.sk); | 1065 | sk_mem_reclaim(asoc->base.sk); |
1067 | return; | ||
1068 | } | 1066 | } |
1069 | 1067 | ||
1070 | 1068 | ||
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index 19c9983d5360..462462eaf296 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c | |||
@@ -1518,7 +1518,6 @@ call_refreshresult(struct rpc_task *task) | |||
1518 | task->tk_action = call_refresh; | 1518 | task->tk_action = call_refresh; |
1519 | if (status != -ETIMEDOUT) | 1519 | if (status != -ETIMEDOUT) |
1520 | rpc_delay(task, 3*HZ); | 1520 | rpc_delay(task, 3*HZ); |
1521 | return; | ||
1522 | } | 1521 | } |
1523 | 1522 | ||
1524 | static __be32 * | 1523 | static __be32 * |
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c index ce0d5b35c2ac..76e504bf74d0 100644 --- a/net/sunrpc/svcsock.c +++ b/net/sunrpc/svcsock.c | |||
@@ -150,7 +150,6 @@ static void svc_set_cmsg_data(struct svc_rqst *rqstp, struct cmsghdr *cmh) | |||
150 | } | 150 | } |
151 | break; | 151 | break; |
152 | } | 152 | } |
153 | return; | ||
154 | } | 153 | } |
155 | 154 | ||
156 | /* | 155 | /* |
diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c index 699ade68aac1..2e3d502ffe87 100644 --- a/net/sunrpc/xprt.c +++ b/net/sunrpc/xprt.c | |||
@@ -716,7 +716,6 @@ void xprt_connect(struct rpc_task *task) | |||
716 | xprt->stat.connect_start = jiffies; | 716 | xprt->stat.connect_start = jiffies; |
717 | xprt->ops->connect(task); | 717 | xprt->ops->connect(task); |
718 | } | 718 | } |
719 | return; | ||
720 | } | 719 | } |
721 | 720 | ||
722 | static void xprt_connect_status(struct rpc_task *task) | 721 | static void xprt_connect_status(struct rpc_task *task) |
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index 9847c30b5001..6e0df664b255 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c | |||
@@ -1050,8 +1050,6 @@ static inline void xs_tcp_read_common(struct rpc_xprt *xprt, | |||
1050 | if (transport->tcp_flags & TCP_RCV_LAST_FRAG) | 1050 | if (transport->tcp_flags & TCP_RCV_LAST_FRAG) |
1051 | transport->tcp_flags &= ~TCP_RCV_COPY_DATA; | 1051 | transport->tcp_flags &= ~TCP_RCV_COPY_DATA; |
1052 | } | 1052 | } |
1053 | |||
1054 | return; | ||
1055 | } | 1053 | } |
1056 | 1054 | ||
1057 | /* | 1055 | /* |
@@ -2210,7 +2208,6 @@ static int bc_send_request(struct rpc_task *task) | |||
2210 | 2208 | ||
2211 | static void bc_close(struct rpc_xprt *xprt) | 2209 | static void bc_close(struct rpc_xprt *xprt) |
2212 | { | 2210 | { |
2213 | return; | ||
2214 | } | 2211 | } |
2215 | 2212 | ||
2216 | /* | 2213 | /* |
@@ -2220,7 +2217,6 @@ static void bc_close(struct rpc_xprt *xprt) | |||
2220 | 2217 | ||
2221 | static void bc_destroy(struct rpc_xprt *xprt) | 2218 | static void bc_destroy(struct rpc_xprt *xprt) |
2222 | { | 2219 | { |
2223 | return; | ||
2224 | } | 2220 | } |
2225 | 2221 | ||
2226 | static struct rpc_xprt_ops xs_udp_ops = { | 2222 | static struct rpc_xprt_ops xs_udp_ops = { |
diff --git a/net/sysctl_net.c b/net/sysctl_net.c index 53196009160a..ca84212cfbfe 100644 --- a/net/sysctl_net.c +++ b/net/sysctl_net.c | |||
@@ -82,7 +82,6 @@ static int __net_init sysctl_net_init(struct net *net) | |||
82 | static void __net_exit sysctl_net_exit(struct net *net) | 82 | static void __net_exit sysctl_net_exit(struct net *net) |
83 | { | 83 | { |
84 | WARN_ON(!list_empty(&net->sysctls.list)); | 84 | WARN_ON(!list_empty(&net->sysctls.list)); |
85 | return; | ||
86 | } | 85 | } |
87 | 86 | ||
88 | static struct pernet_operations sysctl_pernet_ops = { | 87 | static struct pernet_operations sysctl_pernet_ops = { |
diff --git a/net/wimax/stack.c b/net/wimax/stack.c index 62b1a6662209..ee99e7dfcdba 100644 --- a/net/wimax/stack.c +++ b/net/wimax/stack.c | |||
@@ -320,7 +320,6 @@ void __wimax_state_change(struct wimax_dev *wimax_dev, enum wimax_st new_state) | |||
320 | out: | 320 | out: |
321 | d_fnend(3, dev, "(wimax_dev %p new_state %u [old %u]) = void\n", | 321 | d_fnend(3, dev, "(wimax_dev %p new_state %u [old %u]) = void\n", |
322 | wimax_dev, new_state, old_state); | 322 | wimax_dev, new_state, old_state); |
323 | return; | ||
324 | } | 323 | } |
325 | 324 | ||
326 | 325 | ||
@@ -362,7 +361,6 @@ void wimax_state_change(struct wimax_dev *wimax_dev, enum wimax_st new_state) | |||
362 | if (wimax_dev->state > __WIMAX_ST_NULL) | 361 | if (wimax_dev->state > __WIMAX_ST_NULL) |
363 | __wimax_state_change(wimax_dev, new_state); | 362 | __wimax_state_change(wimax_dev, new_state); |
364 | mutex_unlock(&wimax_dev->mutex); | 363 | mutex_unlock(&wimax_dev->mutex); |
365 | return; | ||
366 | } | 364 | } |
367 | EXPORT_SYMBOL_GPL(wimax_state_change); | 365 | EXPORT_SYMBOL_GPL(wimax_state_change); |
368 | 366 | ||
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index f4ea3a08e5a1..d965a2bad8d3 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c | |||
@@ -2209,7 +2209,6 @@ EXPORT_SYMBOL(xfrm_dst_ifdown); | |||
2209 | static void xfrm_link_failure(struct sk_buff *skb) | 2209 | static void xfrm_link_failure(struct sk_buff *skb) |
2210 | { | 2210 | { |
2211 | /* Impossible. Such dst must be popped before reaches point of failure. */ | 2211 | /* Impossible. Such dst must be popped before reaches point of failure. */ |
2212 | return; | ||
2213 | } | 2212 | } |
2214 | 2213 | ||
2215 | static struct dst_entry *xfrm_negative_advice(struct dst_entry *dst) | 2214 | static struct dst_entry *xfrm_negative_advice(struct dst_entry *dst) |