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

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

s390/qeth: Remove unused code 



1. options.add_hhlen is set but never used, drop it
2. clean up no longer required forward declarations
3. delete all sorts of unused defines

Signed-off-by: default avatarJulian Wiedmann <jwi@linux.vnet.ibm.com>
Reviewed-by: default avatarThomas Richter <tmricht@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d7a39937

drivers/s390/net/qeth_core.h

+0 −5
Original line number Diff line number Diff line
@@ -509,9 +509,6 @@ struct qeth_qdio_info { 
#define QETH_TR_MAC_NC       0xc000 /* non-canonical */

#define QETH_TR_MAC_C        0x0300 /* canonical */



#define DEFAULT_ADD_HHLEN 0

#define MAX_ADD_HHLEN 1024



/**

 * buffer stuff for read channel

 */
@@ -637,7 +634,6 @@ struct qeth_reply { 
	atomic_t refcnt;

};





struct qeth_card_blkt {

	int time_total;

	int inter_packet;
@@ -678,7 +674,6 @@ struct qeth_card_options { 
	struct qeth_ipa_info ipa6;

	struct qeth_sbp_info sbp; /* SETBRIDGEPORT options */

	int fake_broadcast;

	int add_hhlen;

	int layer2;

	int performance_stats;

	int rx_sg_cb;

drivers/s390/net/qeth_core_main.c

+0 −2
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ static struct mutex qeth_mod_mutex; 


static void qeth_send_control_data_cb(struct qeth_channel *,

			struct qeth_cmd_buffer *);

static int qeth_issue_next_read(struct qeth_card *);

static struct qeth_cmd_buffer *qeth_get_buffer(struct qeth_channel *);

static void qeth_setup_ccw(struct qeth_channel *, unsigned char *, __u32);

static void qeth_free_buffer_pool(struct qeth_card *);
@@ -1396,7 +1395,6 @@ static void qeth_set_intial_options(struct qeth_card *card) 
	card->options.route4.type = NO_ROUTER;

	card->options.route6.type = NO_ROUTER;

	card->options.fake_broadcast = 0;

	card->options.add_hhlen = DEFAULT_ADD_HHLEN;

	card->options.performance_stats = 0;

	card->options.rx_sg_cb = QETH_RX_SG_CB;

	card->options.isolation = ISOLATION_MODE_NONE;

drivers/s390/net/qeth_core_mpc.h

+0 −17
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ extern unsigned char IPA_PDU_HEADER[]; 
#define QETH_TIMEOUT		(10 * HZ)

#define QETH_IPA_TIMEOUT	(45 * HZ)

#define QETH_IDX_COMMAND_SEQNO	0xffff0000

#define SR_INFO_LEN		16



#define QETH_CLEAR_CHANNEL_PARM	-10

#define QETH_HALT_CHANNEL_PARM	-11
@@ -65,7 +64,6 @@ enum qeth_link_types { 
	QETH_LINK_TYPE_LANE_TR      = 0x82,

	QETH_LINK_TYPE_LANE_ETH1000 = 0x83,

	QETH_LINK_TYPE_LANE         = 0x88,

	QETH_LINK_TYPE_ATM_NATIVE   = 0x90,

};



/*
@@ -185,8 +183,6 @@ enum qeth_ipa_return_codes { 
	IPA_RC_ENOMEM			= 0xfffe,

	IPA_RC_FFFF			= 0xffff

};

/* for DELIP */

#define IPA_RC_IP_ADDRESS_NOT_DEFINED	IPA_RC_PRIMARY_ALREADY_DEFINED

/* for SET_DIAGNOSTIC_ASSIST */

#define IPA_RC_INVALID_SUBCMD		IPA_RC_IP_TABLE_FULL

#define IPA_RC_HARDWARE_AUTH_ERROR	IPA_RC_UNKNOWN_ERROR
@@ -631,14 +627,6 @@ enum qeth_ipa_addr_change_code { 
	IPA_ADDR_CHANGE_CODE_MACADDR		= 0x02,

	IPA_ADDR_CHANGE_CODE_REMOVAL		= 0x80,	/* else addition */

};

enum qeth_ipa_addr_change_retcode {

	IPA_ADDR_CHANGE_RETCODE_OK		= 0x0000,

	IPA_ADDR_CHANGE_RETCODE_LOSTEVENTS	= 0x0010,

};

enum qeth_ipa_addr_change_lostmask {

	IPA_ADDR_CHANGE_MASK_OVERFLOW		= 0x01,

	IPA_ADDR_CHANGE_MASK_STATECHANGE	= 0x02,

};



struct qeth_ipacmd_addr_change_entry {

	struct net_if_token token;
@@ -817,9 +805,4 @@ extern unsigned char IDX_ACTIVATE_WRITE[]; 
	((buffer) && \

	 (*(buffer + ((*(buffer + 0x0b)) + 4)) == 0xc1))



#define ADDR_FRAME_TYPE_DIX 1

#define ADDR_FRAME_TYPE_802_3 2

#define ADDR_FRAME_TYPE_TR_WITHOUT_SR 0x10

#define ADDR_FRAME_TYPE_TR_WITH_SR 0x20



#endif

drivers/s390/net/qeth_l2_main.c

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
static int qeth_l2_set_offline(struct ccwgroup_device *);

static int qeth_l2_stop(struct net_device *);

static void qeth_l2_set_rx_mode(struct net_device *);

static int qeth_l2_recover(void *);

static void qeth_bridgeport_query_support(struct qeth_card *card);

static void qeth_bridge_state_change(struct qeth_card *card,

					struct qeth_ipa_cmd *cmd);

drivers/s390/net/qeth_l2_sys.c

+0 −3
Original line number Diff line number Diff line
@@ -8,9 +8,6 @@ 
#include "qeth_core.h"

#include "qeth_l2.h"



#define QETH_DEVICE_ATTR(_id, _name, _mode, _show, _store) \

struct device_attribute dev_attr_##_id = __ATTR(_name, _mode, _show, _store)



static ssize_t qeth_bridge_port_role_state_show(struct device *dev,

				struct device_attribute *attr, char *buf,

				int show_state)