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

s390/qeth: use dev->groups for common sysfs attributes 



All qeth devices have a minimum set of sysfs attributes, and non-OSN
devices share a group of additional attributes. Depending on whether
the device is forced to use a specific discipline, the device_type then
specifies further attributes.

Shift the common attributes into dev->groups, so that the device_type
only contains the discipline-specific attributes. This avoids exposing
the common attributes to the disciplines, and nicely cleans up our
sysfs code.

While replacing the qeth_l*_*_device_attributes() helpers, switch from
sysfs_*_groups() to the more generic device_*_groups().

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

drivers/s390/net/qeth_core.h

+2 −4
Original line number Diff line number Diff line
@@ -1063,10 +1063,8 @@ extern const struct qeth_discipline qeth_l2_discipline; 
extern const struct qeth_discipline qeth_l3_discipline;

extern const struct ethtool_ops qeth_ethtool_ops;

extern const struct ethtool_ops qeth_osn_ethtool_ops;

extern const struct attribute_group *qeth_generic_attr_groups[];

extern const struct attribute_group *qeth_osn_attr_groups[];

extern const struct attribute_group qeth_device_attr_group;

extern const struct attribute_group qeth_device_blkt_group;

extern const struct attribute_group *qeth_dev_groups[];

extern const struct attribute_group *qeth_osn_dev_groups[];

extern const struct device_type qeth_generic_devtype;



const char *qeth_get_cardname_short(struct qeth_card *);

drivers/s390/net/qeth_core_main.c

+5 −2
Original line number Diff line number Diff line
@@ -6375,13 +6375,11 @@ void qeth_core_free_discipline(struct qeth_card *card) 


const struct device_type qeth_generic_devtype = {

	.name = "qeth_generic",

	.groups = qeth_generic_attr_groups,

};

EXPORT_SYMBOL_GPL(qeth_generic_devtype);



static const struct device_type qeth_osn_devtype = {

	.name = "qeth_osn",

	.groups = qeth_osn_attr_groups,

};



#define DBF_NAME_LEN	20
@@ -6561,6 +6559,11 @@ static int qeth_core_probe_device(struct ccwgroup_device *gdev) 
	if (rc)

		goto err_chp_desc;



	if (IS_OSN(card))

		gdev->dev.groups = qeth_osn_dev_groups;

	else

		gdev->dev.groups = qeth_dev_groups;



	enforced_disc = qeth_enforce_discipline(card);

	switch (enforced_disc) {

	case QETH_DISCIPLINE_UNDETERMINED:

drivers/s390/net/qeth_core_sys.c

+19 −22
Original line number Diff line number Diff line
@@ -640,23 +640,17 @@ static struct attribute *qeth_blkt_device_attrs[] = { 
	&dev_attr_inter_jumbo.attr,

	NULL,

};

const struct attribute_group qeth_device_blkt_group = {



static const struct attribute_group qeth_dev_blkt_group = {

	.name = "blkt",

	.attrs = qeth_blkt_device_attrs,

};

EXPORT_SYMBOL_GPL(qeth_device_blkt_group);



static struct attribute *qeth_device_attrs[] = {

	&dev_attr_state.attr,

	&dev_attr_chpid.attr,

	&dev_attr_if_name.attr,

	&dev_attr_card_type.attr,

static struct attribute *qeth_dev_extended_attrs[] = {

	&dev_attr_inbuf_size.attr,

	&dev_attr_portno.attr,

	&dev_attr_portname.attr,

	&dev_attr_priority_queueing.attr,

	&dev_attr_buffer_count.attr,

	&dev_attr_recover.attr,

	&dev_attr_performance_stats.attr,

	&dev_attr_layer2.attr,

	&dev_attr_isolation.attr,
@@ -664,18 +658,12 @@ static struct attribute *qeth_device_attrs[] = { 
	&dev_attr_switch_attrs.attr,

	NULL,

};

const struct attribute_group qeth_device_attr_group = {

	.attrs = qeth_device_attrs,

};

EXPORT_SYMBOL_GPL(qeth_device_attr_group);



const struct attribute_group *qeth_generic_attr_groups[] = {

	&qeth_device_attr_group,

	&qeth_device_blkt_group,

	NULL,

static const struct attribute_group qeth_dev_extended_group = {

	.attrs = qeth_dev_extended_attrs,

};



static struct attribute *qeth_osn_device_attrs[] = {

static struct attribute *qeth_dev_attrs[] = {

	&dev_attr_state.attr,

	&dev_attr_chpid.attr,

	&dev_attr_if_name.attr,
@@ -684,10 +672,19 @@ static struct attribute *qeth_osn_device_attrs[] = { 
	&dev_attr_recover.attr,

	NULL,

};

static struct attribute_group qeth_osn_device_attr_group = {

	.attrs = qeth_osn_device_attrs,



static const struct attribute_group qeth_dev_group = {

	.attrs = qeth_dev_attrs,

};

const struct attribute_group *qeth_osn_attr_groups[] = {

	&qeth_osn_device_attr_group,



const struct attribute_group *qeth_osn_dev_groups[] = {

	&qeth_dev_group,

	NULL,

};



const struct attribute_group *qeth_dev_groups[] = {

	&qeth_dev_group,

	&qeth_dev_extended_group,

	&qeth_dev_blkt_group,

	NULL,

};

drivers/s390/net/qeth_l2.h

+0 −2
Original line number Diff line number Diff line
@@ -11,8 +11,6 @@ 


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 *);

int qeth_bridgeport_query_ports(struct qeth_card *card,

				enum qeth_sbp_roles *role,

				enum qeth_sbp_states *state);

drivers/s390/net/qeth_l2_main.c

+2 −2
Original line number Diff line number Diff line
@@ -2189,7 +2189,7 @@ static int qeth_l2_probe_device(struct ccwgroup_device *gdev) 
	mutex_init(&card->sbp_lock);



	if (gdev->dev.type == &qeth_generic_devtype) {

		rc = qeth_l2_create_device_attributes(&gdev->dev);

		rc = device_add_groups(&gdev->dev, qeth_l2_attr_groups);

		if (rc)

			return rc;

	}
@@ -2203,7 +2203,7 @@ static void qeth_l2_remove_device(struct ccwgroup_device *gdev) 
	struct qeth_card *card = dev_get_drvdata(&gdev->dev);



	if (gdev->dev.type == &qeth_generic_devtype)

		qeth_l2_remove_device_attributes(&gdev->dev);

		device_remove_groups(&gdev->dev, qeth_l2_attr_groups);

	qeth_set_allowed_threads(card, 0, 1);

	wait_event(card->wait_q, qeth_threads_running(card, 0xffffffff) == 0);