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

s390/qeth: don't check drvdata in sysfs code 



Given the way how the sysfs attributes are registered / unregistered,
the show/store helpers will never be called with a NULL drvdata.

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

drivers/s390/net/qeth_core_sys.c

+4 −76
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ static ssize_t qeth_dev_state_show(struct device *dev, 
				struct device_attribute *attr, char *buf)

{

	struct qeth_card *card = dev_get_drvdata(dev);

	if (!card)

		return -EINVAL;



	switch (card->state) {

	case CARD_STATE_DOWN:
@@ -45,8 +43,6 @@ static ssize_t qeth_dev_chpid_show(struct device *dev, 
				struct device_attribute *attr, char *buf)

{

	struct qeth_card *card = dev_get_drvdata(dev);

	if (!card)

		return -EINVAL;



	return sprintf(buf, "%02X\n", card->info.chpid);

}
@@ -57,8 +53,7 @@ static ssize_t qeth_dev_if_name_show(struct device *dev, 
				struct device_attribute *attr, char *buf)

{

	struct qeth_card *card = dev_get_drvdata(dev);

	if (!card)

		return -EINVAL;



	return sprintf(buf, "%s\n", QETH_CARD_IFNAME(card));

}
@@ -68,8 +63,6 @@ static ssize_t qeth_dev_card_type_show(struct device *dev, 
				struct device_attribute *attr, char *buf)

{

	struct qeth_card *card = dev_get_drvdata(dev);

	if (!card)

		return -EINVAL;



	return sprintf(buf, "%s\n", qeth_get_cardname_short(card));

}
@@ -94,8 +87,6 @@ static ssize_t qeth_dev_inbuf_size_show(struct device *dev, 
				struct device_attribute *attr, char *buf)

{

	struct qeth_card *card = dev_get_drvdata(dev);

	if (!card)

		return -EINVAL;



	return sprintf(buf, "%s\n", qeth_get_bufsize_str(card));

}
@@ -106,8 +97,6 @@ static ssize_t qeth_dev_portno_show(struct device *dev, 
			struct device_attribute *attr, char *buf)

{

	struct qeth_card *card = dev_get_drvdata(dev);

	if (!card)

		return -EINVAL;



	return sprintf(buf, "%i\n", card->dev->dev_port);

}
@@ -120,9 +109,6 @@ static ssize_t qeth_dev_portno_store(struct device *dev, 
	unsigned int portno, limit;

	int rc = 0;



	if (!card)

		return -EINVAL;



	mutex_lock(&card->conf_mutex);

	if (card->state != CARD_STATE_DOWN) {

		rc = -EPERM;
@@ -171,9 +157,6 @@ static ssize_t qeth_dev_prioqing_show(struct device *dev, 
{

	struct qeth_card *card = dev_get_drvdata(dev);



	if (!card)

		return -EINVAL;



	switch (card->qdio.do_prio_queueing) {

	case QETH_PRIO_Q_ING_PREC:

		return sprintf(buf, "%s\n", "by precedence");
@@ -195,9 +178,6 @@ static ssize_t qeth_dev_prioqing_store(struct device *dev, 
	struct qeth_card *card = dev_get_drvdata(dev);

	int rc = 0;



	if (!card)

		return -EINVAL;



	if (IS_IQD(card))

		return -EOPNOTSUPP;
@@ -262,9 +242,6 @@ static ssize_t qeth_dev_bufcnt_show(struct device *dev, 
{

	struct qeth_card *card = dev_get_drvdata(dev);



	if (!card)

		return -EINVAL;



	return sprintf(buf, "%i\n", card->qdio.in_buf_pool.buf_count);

}
@@ -276,9 +253,6 @@ static ssize_t qeth_dev_bufcnt_store(struct device *dev, 
	int cnt, old_cnt;

	int rc = 0;



	if (!card)

		return -EINVAL;



	mutex_lock(&card->conf_mutex);

	if (card->state != CARD_STATE_DOWN) {

		rc = -EPERM;
@@ -307,9 +281,6 @@ static ssize_t qeth_dev_recover_store(struct device *dev, 
	char *tmp;

	int i;



	if (!card)

		return -EINVAL;



	if (!qeth_card_hw_is_reachable(card))

		return -EPERM;
@@ -325,11 +296,6 @@ static DEVICE_ATTR(recover, 0200, NULL, qeth_dev_recover_store); 
static ssize_t qeth_dev_performance_stats_show(struct device *dev,

				struct device_attribute *attr, char *buf)

{

	struct qeth_card *card = dev_get_drvdata(dev);



	if (!card)

		return -EINVAL;



	return sprintf(buf, "1\n");

}
@@ -342,9 +308,6 @@ static ssize_t qeth_dev_performance_stats_store(struct device *dev, 
	bool reset;

	int rc;



	if (!card)

		return -EINVAL;



	rc = kstrtobool(buf, &reset);

	if (rc)

		return rc;
@@ -370,9 +333,6 @@ static ssize_t qeth_dev_layer2_show(struct device *dev, 
{

	struct qeth_card *card = dev_get_drvdata(dev);



	if (!card)

		return -EINVAL;



	return sprintf(buf, "%i\n", card->options.layer);

}
@@ -385,9 +345,6 @@ static ssize_t qeth_dev_layer2_store(struct device *dev, 
	int i, rc = 0;

	enum qeth_discipline_id newdis;



	if (!card)

		return -EINVAL;



	mutex_lock(&card->discipline_mutex);

	if (card->state != CARD_STATE_DOWN) {

		rc = -EPERM;
@@ -453,9 +410,6 @@ static ssize_t qeth_dev_isolation_show(struct device *dev, 
{

	struct qeth_card *card = dev_get_drvdata(dev);



	if (!card)

		return -EINVAL;



	switch (card->options.isolation) {

	case ISOLATION_MODE_NONE:

		return snprintf(buf, 6, "%s\n", ATTR_QETH_ISOLATION_NONE);
@@ -475,9 +429,6 @@ static ssize_t qeth_dev_isolation_store(struct device *dev, 
	enum qeth_ipa_isolation_modes isolation;

	int rc = 0;



	if (!card)

		return -EINVAL;



	mutex_lock(&card->conf_mutex);

	if (!IS_OSD(card) && !IS_OSX(card)) {

		rc = -EOPNOTSUPP;
@@ -522,9 +473,6 @@ static ssize_t qeth_dev_switch_attrs_show(struct device *dev, 
	struct qeth_switch_info sw_info;

	int	rc = 0;



	if (!card)

		return -EINVAL;



	if (!qeth_card_hw_is_reachable(card))

		return sprintf(buf, "n/a\n");
@@ -555,8 +503,6 @@ static ssize_t qeth_hw_trap_show(struct device *dev, 
{

	struct qeth_card *card = dev_get_drvdata(dev);



	if (!card)

		return -EINVAL;

	if (card->info.hwtrap)

		return snprintf(buf, 5, "arm\n");

	else
@@ -570,9 +516,6 @@ static ssize_t qeth_hw_trap_store(struct device *dev, 
	int rc = 0;

	int state = 0;



	if (!card)

		return -EINVAL;



	mutex_lock(&card->conf_mutex);

	if (qeth_card_hw_is_reachable(card))

		state = 1;
@@ -607,24 +550,12 @@ static ssize_t qeth_hw_trap_store(struct device *dev, 
static DEVICE_ATTR(hw_trap, 0644, qeth_hw_trap_show,

		   qeth_hw_trap_store);



static ssize_t qeth_dev_blkt_show(char *buf, struct qeth_card *card, int value)

{



	if (!card)

		return -EINVAL;



	return sprintf(buf, "%i\n", value);

}



static ssize_t qeth_dev_blkt_store(struct qeth_card *card,

		const char *buf, size_t count, int *value, int max_value)

{

	char *tmp;

	int i, rc = 0;



	if (!card)

		return -EINVAL;



	mutex_lock(&card->conf_mutex);

	if (card->state != CARD_STATE_DOWN) {

		rc = -EPERM;
@@ -645,7 +576,7 @@ static ssize_t qeth_dev_blkt_total_show(struct device *dev, 
{

	struct qeth_card *card = dev_get_drvdata(dev);



	return qeth_dev_blkt_show(buf, card, card->info.blkt.time_total);

	return sprintf(buf, "%i\n", card->info.blkt.time_total);

}



static ssize_t qeth_dev_blkt_total_store(struct device *dev,
@@ -657,8 +588,6 @@ static ssize_t qeth_dev_blkt_total_store(struct device *dev, 
				   &card->info.blkt.time_total, 5000);

}







static DEVICE_ATTR(total, 0644, qeth_dev_blkt_total_show,

		   qeth_dev_blkt_total_store);
@@ -667,7 +596,7 @@ static ssize_t qeth_dev_blkt_inter_show(struct device *dev, 
{

	struct qeth_card *card = dev_get_drvdata(dev);



	return qeth_dev_blkt_show(buf, card, card->info.blkt.inter_packet);

	return sprintf(buf, "%i\n", card->info.blkt.inter_packet);

}



static ssize_t qeth_dev_blkt_inter_store(struct device *dev,
@@ -687,8 +616,7 @@ static ssize_t qeth_dev_blkt_inter_jumbo_show(struct device *dev, 
{

	struct qeth_card *card = dev_get_drvdata(dev);



	return qeth_dev_blkt_show(buf, card,

				  card->info.blkt.inter_packet_jumbo);

	return sprintf(buf, "%i\n", card->info.blkt.inter_packet_jumbo);

}



static ssize_t qeth_dev_blkt_inter_jumbo_store(struct device *dev,

drivers/s390/net/qeth_l2_sys.c

+0 −29
Original line number Diff line number Diff line
@@ -18,9 +18,6 @@ static ssize_t qeth_bridge_port_role_state_show(struct device *dev, 
	int rc = 0;

	char *word;



	if (!card)

		return -EINVAL;



	if (qeth_l2_vnicc_is_in_use(card))

		return sprintf(buf, "n/a (VNIC characteristics)\n");
@@ -79,8 +76,6 @@ static ssize_t qeth_bridge_port_role_store(struct device *dev, 
	int rc = 0;

	enum qeth_sbp_roles role;



	if (!card)

		return -EINVAL;

	if (sysfs_streq(buf, "primary"))

		role = QETH_SBP_ROLE_PRIMARY;

	else if (sysfs_streq(buf, "secondary"))
@@ -132,9 +127,6 @@ static ssize_t qeth_bridgeport_hostnotification_show(struct device *dev, 
	struct qeth_card *card = dev_get_drvdata(dev);

	int enabled;



	if (!card)

		return -EINVAL;



	if (qeth_l2_vnicc_is_in_use(card))

		return sprintf(buf, "n/a (VNIC characteristics)\n");
@@ -150,9 +142,6 @@ static ssize_t qeth_bridgeport_hostnotification_store(struct device *dev, 
	bool enable;

	int rc;



	if (!card)

		return -EINVAL;



	rc = kstrtobool(buf, &enable);

	if (rc)

		return rc;
@@ -183,9 +172,6 @@ static ssize_t qeth_bridgeport_reflect_show(struct device *dev, 
	struct qeth_card *card = dev_get_drvdata(dev);

	char *state;



	if (!card)

		return -EINVAL;



	if (qeth_l2_vnicc_is_in_use(card))

		return sprintf(buf, "n/a (VNIC characteristics)\n");
@@ -207,9 +193,6 @@ static ssize_t qeth_bridgeport_reflect_store(struct device *dev, 
	int enable, primary;

	int rc = 0;



	if (!card)

		return -EINVAL;



	if (sysfs_streq(buf, "none")) {

		enable = 0;

		primary = 0;
@@ -315,9 +298,6 @@ static ssize_t qeth_vnicc_timeout_show(struct device *dev, 
	u32 timeout;

	int rc;



	if (!card)

		return -EINVAL;



	rc = qeth_l2_vnicc_get_timeout(card, &timeout);

	if (rc == -EBUSY)

		return sprintf(buf, "n/a (BridgePort)\n");
@@ -335,9 +315,6 @@ static ssize_t qeth_vnicc_timeout_store(struct device *dev, 
	u32 timeout;

	int rc;



	if (!card)

		return -EINVAL;



	rc = kstrtou32(buf, 10, &timeout);

	if (rc)

		return rc;
@@ -357,9 +334,6 @@ static ssize_t qeth_vnicc_char_show(struct device *dev, 
	u32 vnicc;

	int rc;



	if (!card)

		return -EINVAL;



	vnicc = qeth_l2_vnicc_sysfs_attr_to_char(attr->attr.name);

	rc = qeth_l2_vnicc_get_state(card, vnicc, &state);
@@ -380,9 +354,6 @@ static ssize_t qeth_vnicc_char_store(struct device *dev, 
	u32 vnicc;

	int rc;



	if (!card)

		return -EINVAL;



	if (kstrtobool(buf, &state))

		return -EINVAL;

drivers/s390/net/qeth_l3_sys.c

+0 −94
Original line number Diff line number Diff line
@@ -60,9 +60,6 @@ static ssize_t qeth_l3_dev_route4_show(struct device *dev, 
{

	struct qeth_card *card = dev_get_drvdata(dev);



	if (!card)

		return -EINVAL;



	return qeth_l3_dev_route_show(card, &card->options.route4, buf);

}
@@ -109,9 +106,6 @@ static ssize_t qeth_l3_dev_route4_store(struct device *dev, 
{

	struct qeth_card *card = dev_get_drvdata(dev);



	if (!card)

		return -EINVAL;



	return qeth_l3_dev_route_store(card, &card->options.route4,

				QETH_PROT_IPV4, buf, count);

}
@@ -124,9 +118,6 @@ static ssize_t qeth_l3_dev_route6_show(struct device *dev, 
{

	struct qeth_card *card = dev_get_drvdata(dev);



	if (!card)

		return -EINVAL;



	return qeth_l3_dev_route_show(card, &card->options.route6, buf);

}
@@ -135,9 +126,6 @@ static ssize_t qeth_l3_dev_route6_store(struct device *dev, 
{

	struct qeth_card *card = dev_get_drvdata(dev);



	if (!card)

		return -EINVAL;



	return qeth_l3_dev_route_store(card, &card->options.route6,

				QETH_PROT_IPV6, buf, count);

}
@@ -150,9 +138,6 @@ static ssize_t qeth_l3_dev_fake_broadcast_show(struct device *dev, 
{

	struct qeth_card *card = dev_get_drvdata(dev);



	if (!card)

		return -EINVAL;



	return sprintf(buf, "%i\n", card->options.fake_broadcast? 1:0);

}
@@ -163,9 +148,6 @@ static ssize_t qeth_l3_dev_fake_broadcast_store(struct device *dev, 
	char *tmp;

	int i, rc = 0;



	if (!card)

		return -EINVAL;



	mutex_lock(&card->conf_mutex);

	if (card->state != CARD_STATE_DOWN) {

		rc = -EPERM;
@@ -190,9 +172,6 @@ static ssize_t qeth_l3_dev_sniffer_show(struct device *dev, 
{

	struct qeth_card *card = dev_get_drvdata(dev);



	if (!card)

		return -EINVAL;



	return sprintf(buf, "%i\n", card->options.sniffer ? 1 : 0);

}
@@ -203,9 +182,6 @@ static ssize_t qeth_l3_dev_sniffer_store(struct device *dev, 
	int rc = 0;

	unsigned long i;



	if (!card)

		return -EINVAL;



	if (!IS_IQD(card))

		return -EPERM;

	if (card->options.cq == QETH_CQ_ENABLED)
@@ -248,16 +224,12 @@ out: 
static DEVICE_ATTR(sniffer, 0644, qeth_l3_dev_sniffer_show,

		qeth_l3_dev_sniffer_store);





static ssize_t qeth_l3_dev_hsuid_show(struct device *dev,

		struct device_attribute *attr, char *buf)

{

	struct qeth_card *card = dev_get_drvdata(dev);

	char tmp_hsuid[9];



	if (!card)

		return -EINVAL;



	if (!IS_IQD(card))

		return -EPERM;
@@ -273,9 +245,6 @@ static ssize_t qeth_l3_dev_hsuid_store(struct device *dev, 
	char *tmp;

	int rc;



	if (!card)

		return -EINVAL;



	if (!IS_IQD(card))

		return -EPERM;

	if (card->state != CARD_STATE_DOWN)
@@ -336,9 +305,6 @@ static ssize_t qeth_l3_dev_ipato_enable_show(struct device *dev, 
{

	struct qeth_card *card = dev_get_drvdata(dev);



	if (!card)

		return -EINVAL;



	return sprintf(buf, "%i\n", card->ipato.enabled? 1:0);

}
@@ -349,9 +315,6 @@ static ssize_t qeth_l3_dev_ipato_enable_store(struct device *dev, 
	bool enable;

	int rc = 0;



	if (!card)

		return -EINVAL;



	mutex_lock(&card->conf_mutex);

	if (card->state != CARD_STATE_DOWN) {

		rc = -EPERM;
@@ -385,9 +348,6 @@ static ssize_t qeth_l3_dev_ipato_invert4_show(struct device *dev, 
{

	struct qeth_card *card = dev_get_drvdata(dev);



	if (!card)

		return -EINVAL;



	return sprintf(buf, "%i\n", card->ipato.invert4? 1:0);

}
@@ -399,9 +359,6 @@ static ssize_t qeth_l3_dev_ipato_invert4_store(struct device *dev, 
	bool invert;

	int rc = 0;



	if (!card)

		return -EINVAL;



	mutex_lock(&card->conf_mutex);

	if (sysfs_streq(buf, "toggle")) {

		invert = !card->ipato.invert4;
@@ -460,9 +417,6 @@ static ssize_t qeth_l3_dev_ipato_add4_show(struct device *dev, 
{

	struct qeth_card *card = dev_get_drvdata(dev);



	if (!card)

		return -EINVAL;



	return qeth_l3_dev_ipato_add_show(buf, card, QETH_PROT_IPV4);

}
@@ -528,9 +482,6 @@ static ssize_t qeth_l3_dev_ipato_add4_store(struct device *dev, 
{

	struct qeth_card *card = dev_get_drvdata(dev);



	if (!card)

		return -EINVAL;



	return qeth_l3_dev_ipato_add_store(buf, count, card, QETH_PROT_IPV4);

}
@@ -558,9 +509,6 @@ static ssize_t qeth_l3_dev_ipato_del4_store(struct device *dev, 
{

	struct qeth_card *card = dev_get_drvdata(dev);



	if (!card)

		return -EINVAL;



	return qeth_l3_dev_ipato_del_store(buf, count, card, QETH_PROT_IPV4);

}
@@ -572,9 +520,6 @@ static ssize_t qeth_l3_dev_ipato_invert6_show(struct device *dev, 
{

	struct qeth_card *card = dev_get_drvdata(dev);



	if (!card)

		return -EINVAL;



	return sprintf(buf, "%i\n", card->ipato.invert6? 1:0);

}
@@ -585,9 +530,6 @@ static ssize_t qeth_l3_dev_ipato_invert6_store(struct device *dev, 
	bool invert;

	int rc = 0;



	if (!card)

		return -EINVAL;



	mutex_lock(&card->conf_mutex);

	if (sysfs_streq(buf, "toggle")) {

		invert = !card->ipato.invert6;
@@ -617,9 +559,6 @@ static ssize_t qeth_l3_dev_ipato_add6_show(struct device *dev, 
{

	struct qeth_card *card = dev_get_drvdata(dev);



	if (!card)

		return -EINVAL;



	return qeth_l3_dev_ipato_add_show(buf, card, QETH_PROT_IPV6);

}
@@ -628,9 +567,6 @@ static ssize_t qeth_l3_dev_ipato_add6_store(struct device *dev, 
{

	struct qeth_card *card = dev_get_drvdata(dev);



	if (!card)

		return -EINVAL;



	return qeth_l3_dev_ipato_add_store(buf, count, card, QETH_PROT_IPV6);

}
@@ -643,9 +579,6 @@ static ssize_t qeth_l3_dev_ipato_del6_store(struct device *dev, 
{

	struct qeth_card *card = dev_get_drvdata(dev);



	if (!card)

		return -EINVAL;



	return qeth_l3_dev_ipato_del_store(buf, count, card, QETH_PROT_IPV6);

}
@@ -679,9 +612,6 @@ static ssize_t qeth_l3_dev_ip_add_show(struct device *dev, char *buf, 
	int entry_len; /* length of 1 entry string, differs between v4 and v6 */

	int i;



	if (!card)

		return -EINVAL;



	entry_len = (proto == QETH_PROT_IPV4)? 12 : 40;

	entry_len += 2; /* \n + terminator */

	mutex_lock(&card->ip_lock);
@@ -741,9 +671,6 @@ static ssize_t qeth_l3_dev_vipa_add4_store(struct device *dev, 
{

	struct qeth_card *card = dev_get_drvdata(dev);



	if (!card)

		return -EINVAL;



	return qeth_l3_dev_vipa_add_store(buf, count, card, QETH_PROT_IPV4);

}
@@ -771,9 +698,6 @@ static ssize_t qeth_l3_dev_vipa_del4_store(struct device *dev, 
{

	struct qeth_card *card = dev_get_drvdata(dev);



	if (!card)

		return -EINVAL;



	return qeth_l3_dev_vipa_del_store(buf, count, card, QETH_PROT_IPV4);

}
@@ -793,9 +717,6 @@ static ssize_t qeth_l3_dev_vipa_add6_store(struct device *dev, 
{

	struct qeth_card *card = dev_get_drvdata(dev);



	if (!card)

		return -EINVAL;



	return qeth_l3_dev_vipa_add_store(buf, count, card, QETH_PROT_IPV6);

}
@@ -808,9 +729,6 @@ static ssize_t qeth_l3_dev_vipa_del6_store(struct device *dev, 
{

	struct qeth_card *card = dev_get_drvdata(dev);



	if (!card)

		return -EINVAL;



	return qeth_l3_dev_vipa_del_store(buf, count, card, QETH_PROT_IPV6);

}
@@ -884,9 +802,6 @@ static ssize_t qeth_l3_dev_rxip_add4_store(struct device *dev, 
{

	struct qeth_card *card = dev_get_drvdata(dev);



	if (!card)

		return -EINVAL;



	return qeth_l3_dev_rxip_add_store(buf, count, card, QETH_PROT_IPV4);

}
@@ -914,9 +829,6 @@ static ssize_t qeth_l3_dev_rxip_del4_store(struct device *dev, 
{

	struct qeth_card *card = dev_get_drvdata(dev);



	if (!card)

		return -EINVAL;



	return qeth_l3_dev_rxip_del_store(buf, count, card, QETH_PROT_IPV4);

}
@@ -936,9 +848,6 @@ static ssize_t qeth_l3_dev_rxip_add6_store(struct device *dev, 
{

	struct qeth_card *card = dev_get_drvdata(dev);



	if (!card)

		return -EINVAL;



	return qeth_l3_dev_rxip_add_store(buf, count, card, QETH_PROT_IPV6);

}
@@ -951,9 +860,6 @@ static ssize_t qeth_l3_dev_rxip_del6_store(struct device *dev, 
{

	struct qeth_card *card = dev_get_drvdata(dev);



	if (!card)

		return -EINVAL;



	return qeth_l3_dev_rxip_del_store(buf, count, card, QETH_PROT_IPV6);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE