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

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

s390/qeth: clean up exported symbols 



Remove some redundant EXPORTs. While at it, also move some L2-only
prototypes into the proper header file.

Signed-off-by: default avatarJulian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6d8769ab

drivers/s390/net/qeth_core.h

+0 −6
Original line number Diff line number Diff line
@@ -983,7 +983,6 @@ int qeth_send_ipa_cmd(struct qeth_card *, struct qeth_cmd_buffer *, 
		  void *);

struct qeth_cmd_buffer *qeth_get_ipacmd_buffer(struct qeth_card *,

			enum qeth_ipa_cmds, enum qeth_prot_versions);

int qeth_query_setadapterparms(struct qeth_card *);

struct sk_buff *qeth_core_get_next_skb(struct qeth_card *,

		struct qeth_qdio_buffer *, struct qdio_buffer_element **, int *,

		struct qeth_hdr **);
@@ -1009,10 +1008,6 @@ int qeth_query_switch_attributes(struct qeth_card *card, 
int qeth_send_control_data(struct qeth_card *, int, struct qeth_cmd_buffer *,

	int (*reply_cb)(struct qeth_card *, struct qeth_reply*, unsigned long),

	void *reply_param);

int qeth_bridgeport_query_ports(struct qeth_card *card,

	enum qeth_sbp_roles *role, enum qeth_sbp_states *state);

int qeth_bridgeport_setrole(struct qeth_card *card, enum qeth_sbp_roles role);

int qeth_bridgeport_an_set(struct qeth_card *card, int enable);

int qeth_get_elements_no(struct qeth_card *card, struct sk_buff *skb,

			 int extra_elems, int data_offset);

int qeth_get_elements_for_frags(struct sk_buff *);
@@ -1036,7 +1031,6 @@ int qeth_set_access_ctrl_online(struct qeth_card *card, int fallback); 
int qeth_hdr_chk_and_bounce(struct sk_buff *, struct qeth_hdr **, int);

int qeth_configure_cq(struct qeth_card *, enum qeth_cq);

int qeth_hw_trap(struct qeth_card *, enum qeth_diags_trap_action);

int qeth_query_ipassists(struct qeth_card *, enum qeth_prot_versions prot);

void qeth_trace_features(struct qeth_card *);

void qeth_close_dev(struct qeth_card *);

int qeth_send_setassparms(struct qeth_card *, struct qeth_cmd_buffer *, __u16,

drivers/s390/net/qeth_core_main.c

+3 −5
Original line number Diff line number Diff line
@@ -3054,7 +3054,7 @@ static struct qeth_cmd_buffer *qeth_get_adapter_cmd(struct qeth_card *card, 
	return iob;

}



int qeth_query_setadapterparms(struct qeth_card *card)

static int qeth_query_setadapterparms(struct qeth_card *card)

{

	int rc;

	struct qeth_cmd_buffer *iob;
@@ -3067,7 +3067,6 @@ int qeth_query_setadapterparms(struct qeth_card *card) 
	rc = qeth_send_ipa_cmd(card, iob, qeth_query_setadapterparms_cb, NULL);

	return rc;

}

EXPORT_SYMBOL_GPL(qeth_query_setadapterparms);



static int qeth_query_ipassists_cb(struct qeth_card *card,

		struct qeth_reply *reply, unsigned long data)
@@ -3107,7 +3106,8 @@ static int qeth_query_ipassists_cb(struct qeth_card *card, 
	return 0;

}



int qeth_query_ipassists(struct qeth_card *card, enum qeth_prot_versions prot)

static int qeth_query_ipassists(struct qeth_card *card,

				enum qeth_prot_versions prot)

{

	int rc;

	struct qeth_cmd_buffer *iob;
@@ -3119,7 +3119,6 @@ int qeth_query_ipassists(struct qeth_card *card, enum qeth_prot_versions prot) 
	rc = qeth_send_ipa_cmd(card, iob, qeth_query_ipassists_cb, NULL);

	return rc;

}

EXPORT_SYMBOL_GPL(qeth_query_ipassists);



static int qeth_query_switch_attributes_cb(struct qeth_card *card,

				struct qeth_reply *reply, unsigned long data)
@@ -3158,7 +3157,6 @@ int qeth_query_switch_attributes(struct qeth_card *card, 
	return qeth_send_ipa_cmd(card, iob,

				qeth_query_switch_attributes_cb, sw_info);

}

EXPORT_SYMBOL_GPL(qeth_query_switch_attributes);



static int qeth_query_setdiagass_cb(struct qeth_card *card,

		struct qeth_reply *reply, unsigned long data)

drivers/s390/net/qeth_l2.h

+5 −0
Original line number Diff line number Diff line
@@ -14,6 +14,11 @@ extern const struct attribute_group *qeth_l2_attr_groups[]; 
int qeth_l2_create_device_attributes(struct device *);

void qeth_l2_remove_device_attributes(struct device *);

void qeth_l2_setup_bridgeport_attrs(struct qeth_card *card);

int qeth_bridgeport_query_ports(struct qeth_card *card,

				enum qeth_sbp_roles *role,

				enum qeth_sbp_states *state);

int qeth_bridgeport_setrole(struct qeth_card *card, enum qeth_sbp_roles role);

int qeth_bridgeport_an_set(struct qeth_card *card, int enable);



int qeth_l2_vnicc_set_state(struct qeth_card *card, u32 vnicc, bool state);

int qeth_l2_vnicc_get_state(struct qeth_card *card, u32 vnicc, bool *state);

drivers/s390/net/qeth_l2_main.c

+0 −2
Original line number Diff line number Diff line
@@ -1869,7 +1869,6 @@ int qeth_bridgeport_query_ports(struct qeth_card *card, 
		return rc;

	return qeth_bridgeport_makerc(card, &cbctl, IPA_SBP_QUERY_BRIDGE_PORTS);

}

EXPORT_SYMBOL_GPL(qeth_bridgeport_query_ports);



static int qeth_bridgeport_set_cb(struct qeth_card *card,

	struct qeth_reply *reply, unsigned long data)
@@ -2017,7 +2016,6 @@ int qeth_bridgeport_an_set(struct qeth_card *card, int enable) 
		rc = qdio_pnso_brinfo(schid, 0, &response, NULL, NULL);

	return qeth_anset_makerc(card, rc, response);

}

EXPORT_SYMBOL_GPL(qeth_bridgeport_an_set);



static bool qeth_bridgeport_is_in_use(struct qeth_card *card)

{