Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

qeth: qeth_core_main make local functions static

This patch makes some global functions static and removes
the prototypes from the header file.
Also function qeth_query_card_info is not exported anymore,
there is no external user for it, this function should never
have been exported in the first place.

Signed-off-by: Thomas Richter <tmricht@linux.vnet.ibm.com>
Signed-off-by: Frank Blaschka <blaschka@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Thomas Richter and committed by
David S. Miller
bca51650 1f3c2eba

+15 -19
-16
drivers/s390/net/qeth_core.h
··· 380 380 #define QETH_HDR_EXT_CSUM_TRANSP_REQ 0x20 381 381 #define QETH_HDR_EXT_UDP 0x40 /*bit off for TCP*/ 382 382 383 - static inline int qeth_is_last_sbale(struct qdio_buffer_element *sbale) 384 - { 385 - return (sbale->eflags & SBAL_EFLAGS_LAST_ENTRY); 386 - } 387 - 388 383 enum qeth_qdio_buffer_states { 389 384 /* 390 385 * inbound: read out by driver; owned by hardware in order to be filled ··· 838 843 /*some helper functions*/ 839 844 #define QETH_CARD_IFNAME(card) (((card)->dev)? (card)->dev->name : "") 840 845 841 - static inline struct qeth_card *CARD_FROM_CDEV(struct ccw_device *cdev) 842 - { 843 - struct qeth_card *card = dev_get_drvdata(&((struct ccwgroup_device *) 844 - dev_get_drvdata(&cdev->dev))->dev); 845 - return card; 846 - } 847 - 848 846 static inline int qeth_get_micros(void) 849 847 { 850 848 return (int) (get_tod_clock() >> 12); ··· 882 894 int qeth_realloc_buffer_pool(struct qeth_card *, int); 883 895 int qeth_core_load_discipline(struct qeth_card *, enum qeth_discipline_id); 884 896 void qeth_core_free_discipline(struct qeth_card *); 885 - void qeth_buffer_reclaim_work(struct work_struct *); 886 897 887 898 /* exports for qeth discipline device drivers */ 888 899 extern struct qeth_card_list_struct qeth_core_card_list; ··· 900 913 void qeth_print_status_message(struct qeth_card *); 901 914 int qeth_init_qdio_queues(struct qeth_card *); 902 915 int qeth_send_startlan(struct qeth_card *); 903 - int qeth_send_stoplan(struct qeth_card *); 904 916 int qeth_send_ipa_cmd(struct qeth_card *, struct qeth_cmd_buffer *, 905 917 int (*reply_cb) 906 918 (struct qeth_card *, struct qeth_reply *, unsigned long), ··· 940 954 int qeth_query_oat_command(struct qeth_card *, char __user *); 941 955 int qeth_query_switch_attributes(struct qeth_card *card, 942 956 struct qeth_switch_info *sw_info); 943 - int qeth_query_card_info(struct qeth_card *card, 944 - struct carrier_info *carrier_info); 945 957 int qeth_send_control_data(struct qeth_card *, int, struct qeth_cmd_buffer *, 946 958 int (*reply_cb)(struct qeth_card *, struct qeth_reply*, unsigned long), 947 959 void *reply_param);
+15 -3
drivers/s390/net/qeth_core_main.c
··· 718 718 return 0; 719 719 } 720 720 721 + static struct qeth_card *CARD_FROM_CDEV(struct ccw_device *cdev) 722 + { 723 + struct qeth_card *card = dev_get_drvdata(&((struct ccwgroup_device *) 724 + dev_get_drvdata(&cdev->dev))->dev); 725 + return card; 726 + } 727 + 721 728 static void qeth_setup_ccw(struct qeth_channel *channel, unsigned char *iob, 722 729 __u32 len) 723 730 { ··· 1438 1431 } 1439 1432 } 1440 1433 1434 + static void qeth_buffer_reclaim_work(struct work_struct *); 1441 1435 static int qeth_setup_card(struct qeth_card *card) 1442 1436 { 1443 1437 ··· 3240 3232 } 3241 3233 EXPORT_SYMBOL_GPL(qeth_check_qdio_errors); 3242 3234 3243 - void qeth_buffer_reclaim_work(struct work_struct *work) 3235 + static void qeth_buffer_reclaim_work(struct work_struct *work) 3244 3236 { 3245 3237 struct qeth_card *card = container_of(work, struct qeth_card, 3246 3238 buffer_reclaim_work.work); ··· 4725 4717 return 0; 4726 4718 } 4727 4719 4728 - int qeth_query_card_info(struct qeth_card *card, 4720 + static int qeth_query_card_info(struct qeth_card *card, 4729 4721 struct carrier_info *carrier_info) 4730 4722 { 4731 4723 struct qeth_cmd_buffer *iob; ··· 4738 4730 return qeth_send_ipa_cmd(card, iob, qeth_query_card_info_cb, 4739 4731 (void *)carrier_info); 4740 4732 } 4741 - EXPORT_SYMBOL_GPL(qeth_query_card_info); 4742 4733 4743 4734 static inline int qeth_get_qdio_q_format(struct qeth_card *card) 4744 4735 { ··· 5118 5111 5119 5112 5120 5113 return 0; 5114 + } 5115 + 5116 + static inline int qeth_is_last_sbale(struct qdio_buffer_element *sbale) 5117 + { 5118 + return (sbale->eflags & SBAL_EFLAGS_LAST_ENTRY); 5121 5119 } 5122 5120 5123 5121 struct sk_buff *qeth_core_get_next_skb(struct qeth_card *card,