Commit 3fa21e07 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

net: Remove unnecessary returns from void function()s 



This patch removes from net/ (but not any netfilter files)
all the unnecessary return; statements that precede the
last closing brace of void functions.

It does not remove the returns that are immediately
preceded by a label as gcc doesn't like that.

Done via:
$ grep -rP --include=*.[ch] -l "return;\n}" net/ | \
  xargs perl -i -e 'local $/ ; while (<>) { s/\n[ \t\n]+return;\n}/\n}/g; print; }'

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b60b6592

net/9p/trans_rdma.c

+0 −1
Original line number Diff line number Diff line
@@ -308,7 +308,6 @@ handle_recv(struct p9_client *client, struct p9_trans_rdma *rdma, 
		   req, err, status);

	rdma->state = P9_RDMA_FLUSHING;

	client->status = Disconnected;

	return;

}



static void

net/atm/br2684.c

+0 −1
Original line number Diff line number Diff line
@@ -446,7 +446,6 @@ error: 
	net_dev->stats.rx_errors++;

free_skb:

	dev_kfree_skb(skb);

	return;

}



/*

net/atm/lec.c

+0 −6
Original line number Diff line number Diff line
@@ -161,8 +161,6 @@ static void lec_handle_bridge(struct sk_buff *skb, struct net_device *dev) 
		skb_queue_tail(&sk->sk_receive_queue, skb2);

		sk->sk_data_ready(sk, skb2->len);

	}



	return;

}

#endif /* defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) */
@@ -640,7 +638,6 @@ static void lec_set_multicast_list(struct net_device *dev) 
	 * by default, all multicast frames arrive over the bus.

	 * eventually support selective multicast service

	 */

	return;

}



static const struct net_device_ops lec_netdev_ops = {
@@ -1199,8 +1196,6 @@ static void __exit lane_module_cleanup(void) 
			dev_lec[i] = NULL;

		}

	}



	return;

}



module_init(lane_module_init);
@@ -1334,7 +1329,6 @@ static void lane2_associate_ind(struct net_device *dev, const u8 *mac_addr, 
		priv->lane2_ops->associate_indicator(dev, mac_addr,

						     tlvs, sizeoftlvs);

	}

	return;

}



/*

net/atm/mpc.c

+0 −32
Original line number Diff line number Diff line
@@ -455,7 +455,6 @@ static void lane2_assoc_ind(struct net_device *dev, const u8 *mac_addr, 
	if (end_of_tlvs - tlvs != 0)

		pr_info("(%s) ignoring %Zd bytes of trailing TLV garbage\n",

			dev->name, end_of_tlvs - tlvs);

	return;

}



/*
@@ -684,8 +683,6 @@ static void mpc_vcc_close(struct atm_vcc *vcc, struct net_device *dev) 


	if (in_entry == NULL && eg_entry == NULL)

		dprintk("(%s) unused vcc closed\n", dev->name);



	return;

}



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) 


	memset(ATM_SKB(skb), 0, sizeof(struct atm_skb_data));

	netif_rx(new_skb);



	return;

}



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) 
	mesg.type = SET_MPS_CTRL_ADDR;

	memcpy(mesg.MPS_ctrl, addr, ATM_ESA_LEN);

	msg_to_mpoad(&mesg, mpc);



	return;

}



static void mpoad_close(struct atm_vcc *vcc)
@@ -911,8 +904,6 @@ static void mpoad_close(struct atm_vcc *vcc) 
	pr_info("(%s) going down\n",

		(mpc->dev) ? mpc->dev->name : "<unknown>");

	module_put(THIS_MODULE);



	return;

}



/*
@@ -1122,7 +1113,6 @@ static void MPOA_trigger_rcvd(struct k_message *msg, struct mpoa_client *mpc) 
	pr_info("(%s) entry already in resolving state\n",

		(mpc->dev) ? mpc->dev->name : "<unknown>");

	mpc->in_ops->put(entry);

	return;

}



/*
@@ -1166,7 +1156,6 @@ static void check_qos_and_open_shortcut(struct k_message *msg, 
	} else

		memset(&msg->qos, 0, sizeof(struct atm_qos));

	msg_to_mpoad(msg, client);

	return;

}



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) 
		mpc->in_ops->put(entry);

		entry = mpc->in_ops->get_with_mask(dst_ip, mpc, mask);

	} while (entry != NULL);



	return;

}



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) 
	write_unlock_irq(&mpc->egress_lock);



	mpc->eg_ops->put(entry);



	return;

}



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) 
	skb_queue_tail(&sk->sk_receive_queue, skb);

	sk->sk_data_ready(sk, skb->len);

	dprintk("exiting\n");



	return;

}



/*
@@ -1325,8 +1308,6 @@ static void mps_death(struct k_message *msg, struct mpoa_client *mpc) 


	mpc->in_ops->destroy_cache(mpc);

	mpc->eg_ops->destroy_cache(mpc);



	return;

}



static void MPOA_cache_impos_rcvd(struct k_message *msg,
@@ -1353,8 +1334,6 @@ static void MPOA_cache_impos_rcvd(struct k_message *msg, 
	write_unlock_irq(&mpc->egress_lock);



	mpc->eg_ops->put(entry);



	return;

}



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, 
			pr_info("(%s) targetless LE_ARP request failed\n",

				mpc->dev->name);

	}



	return;

}



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, 
		return;

	}

	client->number_of_mps_macs = 1;



	return;

}



/*
@@ -1436,7 +1411,6 @@ static void clean_up(struct k_message *msg, struct mpoa_client *mpc, int action) 


	msg->type = action;

	msg_to_mpoad(msg, mpc);

	return;

}



static void mpc_timer_refresh(void)
@@ -1445,8 +1419,6 @@ static void mpc_timer_refresh(void) 
	mpc_timer.data = mpc_timer.expires;

	mpc_timer.function = mpc_cache_check;

	add_timer(&mpc_timer);



	return;

}



static void mpc_cache_check(unsigned long checking_time)
@@ -1471,8 +1443,6 @@ static void mpc_cache_check(unsigned long checking_time) 
		mpc = mpc->next;

	}

	mpc_timer_refresh();



	return;

}



static int atm_mpoa_ioctl(struct socket *sock, unsigned int cmd,
@@ -1561,8 +1531,6 @@ static void __exit atm_mpoa_cleanup(void) 
		kfree(qos);

		qos = nextqos;

	}



	return;

}



module_init(atm_mpoa_init);

net/atm/mpoa_caches.c

+0 −20
Original line number Diff line number Diff line
@@ -182,8 +182,6 @@ static void in_cache_put(in_cache_entry *entry) 
		memset(entry, 0, sizeof(in_cache_entry));

		kfree(entry);

	}



	return;

}



/*
@@ -221,8 +219,6 @@ static void in_cache_remove_entry(in_cache_entry *entry, 
		}

		vcc_release_async(vcc, -EPIPE);

	}



	return;

}



/* Call this every MPC-p2 seconds... Not exactly correct solution,
@@ -248,8 +244,6 @@ static void clear_count_and_expired(struct mpoa_client *client) 
		entry = next_entry;

	}

	write_unlock_bh(&client->ingress_lock);



	return;

}



/* Call this every MPC-p4 seconds. */
@@ -334,8 +328,6 @@ static void in_destroy_cache(struct mpoa_client *mpc) 
	while (mpc->in_cache != NULL)

		mpc->in_ops->remove_entry(mpc->in_cache, mpc);

	write_unlock_irq(&mpc->ingress_lock);



	return;

}



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) 
		memset(entry, 0, sizeof(eg_cache_entry));

		kfree(entry);

	}



	return;

}



/*
@@ -463,8 +453,6 @@ static void eg_cache_remove_entry(eg_cache_entry *entry, 
		}

		vcc_release_async(vcc, -EPIPE);

	}



	return;

}



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) 
	do_gettimeofday(&(entry->tv));

	entry->entry_state = EGRESS_RESOLVED;

	entry->ctrl_info.holding_time = holding_time;



	return;

}



static void clear_expired(struct mpoa_client *client)
@@ -537,8 +523,6 @@ static void clear_expired(struct mpoa_client *client) 
		entry = next_entry;

	}

	write_unlock_irq(&client->egress_lock);



	return;

}



static void eg_destroy_cache(struct mpoa_client *mpc)
@@ -547,8 +531,6 @@ static void eg_destroy_cache(struct mpoa_client *mpc) 
	while (mpc->eg_cache != NULL)

		mpc->eg_ops->remove_entry(mpc->eg_cache, mpc);

	write_unlock_irq(&mpc->egress_lock);



	return;

}
@@ -584,6 +566,4 @@ void atm_mpoa_init_cache(struct mpoa_client *mpc) 
{

	mpc->in_ops = &ingress_ops;

	mpc->eg_ops = &egress_ops;



	return;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE