Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cef6ff22 authored by Julian Wiedmann's avatar Julian Wiedmann Committed by David S. Miller
Browse files

s390/net: reduce inlining 



Clean up the inline cruft in s390 net drivers. Many of the inlined
functions had only one caller anyway.

Suggested-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarJulian Wiedmann <jwi@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f8eb4930

drivers/s390/net/ctcm_main.c

+1 −1
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ static long ctcm_check_irb_error(struct ccw_device *cdev, struct irb *irb) 
 *  ch		The channel, the sense code belongs to.

 *  sense	The sense code to inspect.

 */

static inline void ccw_unit_check(struct channel *ch, __u8 sense)

static void ccw_unit_check(struct channel *ch, __u8 sense)

{

	CTCM_DBF_TEXT_(TRACE, CTC_DBF_DEBUG,

			"%s(%s): %02x",

drivers/s390/net/lcs.c

+12 −16
Original line number Diff line number Diff line
@@ -327,8 +327,7 @@ lcs_set_allowed_threads(struct lcs_card *card, unsigned long threads) 
	spin_unlock_irqrestore(&card->mask_lock, flags);

	wake_up(&card->wait_q);

}

static inline int

lcs_threads_running(struct lcs_card *card, unsigned long threads)

static int lcs_threads_running(struct lcs_card *card, unsigned long threads)

{

        unsigned long flags;

        int rc = 0;
@@ -346,8 +345,7 @@ lcs_wait_for_threads(struct lcs_card *card, unsigned long threads) 
                        lcs_threads_running(card, threads) == 0);

}



static inline int

lcs_set_thread_start_bit(struct lcs_card *card, unsigned long thread)

static int lcs_set_thread_start_bit(struct lcs_card *card, unsigned long thread)

{

        unsigned long flags;
@@ -373,8 +371,7 @@ lcs_clear_thread_running_bit(struct lcs_card *card, unsigned long thread) 
        wake_up(&card->wait_q);

}



static inline int

__lcs_do_run_thread(struct lcs_card *card, unsigned long thread)

static int __lcs_do_run_thread(struct lcs_card *card, unsigned long thread)

{

        unsigned long flags;

        int rc = 0;
@@ -444,8 +441,7 @@ lcs_setup_card(struct lcs_card *card) 
	INIT_LIST_HEAD(&card->lancmd_waiters);

}



static inline void

lcs_clear_multicast_list(struct lcs_card *card)

static void lcs_clear_multicast_list(struct lcs_card *card)

{

#ifdef	CONFIG_IP_MULTICAST

	struct lcs_ipm_list *ipm;
@@ -656,8 +652,7 @@ __lcs_resume_channel(struct lcs_channel *channel) 
/**

 * Make a buffer ready for processing.

 */

static inline void

__lcs_ready_buffer_bits(struct lcs_channel *channel, int index)

static void __lcs_ready_buffer_bits(struct lcs_channel *channel, int index)

{

	int prev, next;
@@ -1169,8 +1164,8 @@ lcs_get_mac_for_ipm(__be32 ipm, char *mac, struct net_device *dev) 
/**

 * function called by net device to handle multicast address relevant things

 */

static inline void

lcs_remove_mc_addresses(struct lcs_card *card, struct in_device *in4_dev)

static void lcs_remove_mc_addresses(struct lcs_card *card,

				    struct in_device *in4_dev)

{

	struct ip_mc_list *im4;

	struct list_head *l;
@@ -1196,8 +1191,9 @@ lcs_remove_mc_addresses(struct lcs_card *card, struct in_device *in4_dev) 
	spin_unlock_irqrestore(&card->ipm_lock, flags);

}



static inline struct lcs_ipm_list *

lcs_check_addr_entry(struct lcs_card *card, struct ip_mc_list *im4, char *buf)

static struct lcs_ipm_list *lcs_check_addr_entry(struct lcs_card *card,

						 struct ip_mc_list *im4,

						 char *buf)

{

	struct lcs_ipm_list *tmp, *ipm = NULL;

	struct list_head *l;
@@ -1218,8 +1214,8 @@ lcs_check_addr_entry(struct lcs_card *card, struct ip_mc_list *im4, char *buf) 
	return ipm;

}



static inline void

lcs_set_mc_addresses(struct lcs_card *card, struct in_device *in4_dev)

static void lcs_set_mc_addresses(struct lcs_card *card,

				 struct in_device *in4_dev)

{



	struct ip_mc_list *im4;

drivers/s390/net/netiucv.c

+2 −2
Original line number Diff line number Diff line
@@ -249,14 +249,14 @@ struct ll_header { 
 * Compatibility macros for busy handling

 * of network devices.

 */

static inline void netiucv_clear_busy(struct net_device *dev)

static void netiucv_clear_busy(struct net_device *dev)

{

	struct netiucv_priv *priv = netdev_priv(dev);

	clear_bit(0, &priv->tbusy);

	netif_wake_queue(dev);

}



static inline int netiucv_test_and_set_busy(struct net_device *dev)

static int netiucv_test_and_set_busy(struct net_device *dev)

{

	struct netiucv_priv *priv = netdev_priv(dev);

	netif_stop_queue(dev);

drivers/s390/net/qeth_core_main.c

+36 −30
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ void qeth_close_dev(struct qeth_card *card) 
}

EXPORT_SYMBOL_GPL(qeth_close_dev);



static inline const char *qeth_get_cardname(struct qeth_card *card)

static const char *qeth_get_cardname(struct qeth_card *card)

{

	if (card->info.guestlan) {

		switch (card->info.type) {
@@ -330,7 +330,7 @@ static struct qeth_qdio_q *qeth_alloc_qdio_queue(void) 
	return q;

}



static inline int qeth_cq_init(struct qeth_card *card)

static int qeth_cq_init(struct qeth_card *card)

{

	int rc;
@@ -352,7 +352,7 @@ static inline int qeth_cq_init(struct qeth_card *card) 
	return rc;

}



static inline int qeth_alloc_cq(struct qeth_card *card)

static int qeth_alloc_cq(struct qeth_card *card)

{

	int rc;
@@ -397,7 +397,7 @@ static inline int qeth_alloc_cq(struct qeth_card *card) 
	goto out;

}



static inline void qeth_free_cq(struct qeth_card *card)

static void qeth_free_cq(struct qeth_card *card)

{

	if (card->qdio.c_q) {

		--card->qdio.no_in_queues;
@@ -408,8 +408,9 @@ static inline void qeth_free_cq(struct qeth_card *card) 
	card->qdio.out_bufstates = NULL;

}



static inline enum iucv_tx_notify qeth_compute_cq_notification(int sbalf15,

	int delayed) {

static enum iucv_tx_notify qeth_compute_cq_notification(int sbalf15,

							int delayed)

{

	enum iucv_tx_notify n;



	switch (sbalf15) {
@@ -432,8 +433,8 @@ static inline enum iucv_tx_notify qeth_compute_cq_notification(int sbalf15, 
	return n;

}



static inline void qeth_cleanup_handled_pending(struct qeth_qdio_out_q *q,

	int bidx, int forced_cleanup)

static void qeth_cleanup_handled_pending(struct qeth_qdio_out_q *q, int bidx,

					 int forced_cleanup)

{

	if (q->card->options.cq != QETH_CQ_ENABLED)

		return;
@@ -475,8 +476,9 @@ static inline void qeth_cleanup_handled_pending(struct qeth_qdio_out_q *q, 
}





static inline void qeth_qdio_handle_aob(struct qeth_card *card,

		unsigned long phys_aob_addr) {

static void qeth_qdio_handle_aob(struct qeth_card *card,

				 unsigned long phys_aob_addr)

{

	struct qaob *aob;

	struct qeth_qdio_out_buffer *buffer;

	enum iucv_tx_notify notification;
@@ -2228,7 +2230,7 @@ static int qeth_cm_setup(struct qeth_card *card) 


}



static inline int qeth_get_initial_mtu_for_card(struct qeth_card *card)

static int qeth_get_initial_mtu_for_card(struct qeth_card *card)

{

	switch (card->info.type) {

	case QETH_CARD_TYPE_UNKNOWN:
@@ -2251,7 +2253,7 @@ static inline int qeth_get_initial_mtu_for_card(struct qeth_card *card) 
	}

}



static inline int qeth_get_mtu_outof_framesize(int framesize)

static int qeth_get_mtu_outof_framesize(int framesize)

{

	switch (framesize) {

	case 0x4000:
@@ -2267,7 +2269,7 @@ static inline int qeth_get_mtu_outof_framesize(int framesize) 
	}

}



static inline int qeth_mtu_is_valid(struct qeth_card *card, int mtu)

static int qeth_mtu_is_valid(struct qeth_card *card, int mtu)

{

	switch (card->info.type) {

	case QETH_CARD_TYPE_OSD:
@@ -2738,7 +2740,7 @@ static void qeth_initialize_working_pool_list(struct qeth_card *card) 
	}

}



static inline struct qeth_buffer_pool_entry *qeth_find_free_buffer_pool_entry(

static struct qeth_buffer_pool_entry *qeth_find_free_buffer_pool_entry(

					struct qeth_card *card)

{

	struct list_head *plh;
@@ -2870,7 +2872,7 @@ int qeth_init_qdio_queues(struct qeth_card *card) 
}

EXPORT_SYMBOL_GPL(qeth_init_qdio_queues);



static inline __u8 qeth_get_ipa_adp_type(enum qeth_link_types link_type)

static __u8 qeth_get_ipa_adp_type(enum qeth_link_types link_type)

{

	switch (link_type) {

	case QETH_LINK_TYPE_HSTR:
@@ -3888,7 +3890,7 @@ int qeth_hdr_chk_and_bounce(struct sk_buff *skb, struct qeth_hdr **hdr, int len) 
}

EXPORT_SYMBOL_GPL(qeth_hdr_chk_and_bounce);



static inline void __qeth_fill_buffer(struct sk_buff *skb,

static void __qeth_fill_buffer(struct sk_buff *skb,

			       struct qeth_qdio_out_buffer *buf,

			       bool is_first_elem, unsigned int offset)

{
@@ -3951,7 +3953,7 @@ static inline void __qeth_fill_buffer(struct sk_buff *skb, 
	buf->next_element_to_fill = element;

}



static inline int qeth_fill_buffer(struct qeth_qdio_out_q *queue,

static int qeth_fill_buffer(struct qeth_qdio_out_q *queue,

			    struct qeth_qdio_out_buffer *buf,

			    struct sk_buff *skb, struct qeth_hdr *hdr,

			    unsigned int offset, int hd_len)
@@ -4821,7 +4823,7 @@ int qeth_vm_request_mac(struct qeth_card *card) 
}

EXPORT_SYMBOL_GPL(qeth_vm_request_mac);



static inline int qeth_get_qdio_q_format(struct qeth_card *card)

static int qeth_get_qdio_q_format(struct qeth_card *card)

{

	if (card->info.type == QETH_CARD_TYPE_IQD)

		return QDIO_IQDIO_QFMT;
@@ -4886,9 +4888,12 @@ static void qeth_determine_capabilities(struct qeth_card *card) 
	return;

}



static inline void qeth_qdio_establish_cq(struct qeth_card *card,

static void qeth_qdio_establish_cq(struct qeth_card *card,

				   struct qdio_buffer **in_sbal_ptrs,

	void (**queue_start_poll) (struct ccw_device *, int, unsigned long)) {

				   void (**queue_start_poll)

					(struct ccw_device *, int,

					 unsigned long))

{

	int i;



	if (card->options.cq == QETH_CQ_ENABLED) {
@@ -5180,9 +5185,10 @@ int qeth_core_hardsetup_card(struct qeth_card *card) 
}

EXPORT_SYMBOL_GPL(qeth_core_hardsetup_card);



static inline int qeth_create_skb_frag(struct qeth_qdio_buffer *qethbuffer,

static int qeth_create_skb_frag(struct qeth_qdio_buffer *qethbuffer,

				struct qdio_buffer_element *element,

		struct sk_buff **pskb, int offset, int *pfrag, int data_len)

				struct sk_buff **pskb, int offset, int *pfrag,

				int data_len)

{

	struct page *page = virt_to_page(element->addr);

	if (*pskb == NULL) {

drivers/s390/net/qeth_core_sys.c

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ static ssize_t qeth_dev_card_type_show(struct device *dev, 


static DEVICE_ATTR(card_type, 0444, qeth_dev_card_type_show, NULL);



static inline const char *qeth_get_bufsize_str(struct qeth_card *card)

static const char *qeth_get_bufsize_str(struct qeth_card *card)

{

	if (card->qdio.in_buf_size == 16384)

		return "16k";