s390/qeth: shift some bridgeport code around

qeth_l2_setup_bridgeport_attrs() is entirely unrelated to sysfs
functionality, move it where it belongs.
While at it merge all the bridgeport-specific code in the set-online
path together.

Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Reviewed-by: Alexandra Winter <wintera@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/s390/net/qeth_l2.h b/drivers/s390/net/qeth_l2.h
index ddc615b431a8c826c29a46cbde29bfa47b08caa4..adf25c9fd2b3077b1c352d305a56cfb0bd43eeea 100644 (file)
--- a/drivers/s390/net/qeth_l2.h
+++ b/drivers/s390/net/qeth_l2.h
@@ -13,7 +13,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 *);
-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);

diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index 7175b5d8a23c91e723dddd655bd23aeb5bf50501..7da306e267c92d88278330264d5e1320938e9e13 100644 (file)
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -728,6 +728,24 @@ static void qeth_l2_trace_features(struct qeth_card *card)
                      sizeof(card->options.vnicc.sup_chars));
 }
 
+static void qeth_l2_setup_bridgeport_attrs(struct qeth_card *card)
+{
+       if (!card->options.sbp.reflect_promisc &&
+           card->options.sbp.role != QETH_SBP_ROLE_NONE) {
+               /* Conditional to avoid spurious error messages */
+               qeth_bridgeport_setrole(card, card->options.sbp.role);
+               /* Let the callback function refresh the stored role value. */
+               qeth_bridgeport_query_ports(card, &card->options.sbp.role,
+                                           NULL);
+       }
+       if (card->options.sbp.hostnotification) {
+               if (qeth_bridgeport_an_set(card, 1))
+                       card->options.sbp.hostnotification = 0;
+       } else {
+               qeth_bridgeport_an_set(card, 0);
+       }
+}
+
 static int qeth_l2_set_online(struct ccwgroup_device *gdev)
 {
        struct qeth_card *card = dev_get_drvdata(&gdev->dev);
@@ -748,9 +766,11 @@ static int qeth_l2_set_online(struct ccwgroup_device *gdev)
 
        mutex_lock(&card->sbp_lock);
        qeth_bridgeport_query_support(card);
-       if (card->options.sbp.supported_funcs)
+       if (card->options.sbp.supported_funcs) {
+               qeth_l2_setup_bridgeport_attrs(card);
                dev_info(&card->gdev->dev,
-               "The device represents a Bridge Capable Port\n");
+                        "The device represents a Bridge Capable Port\n");
+       }
        mutex_unlock(&card->sbp_lock);
 
        qeth_l2_register_dev_addr(card);
@@ -761,8 +781,6 @@ static int qeth_l2_set_online(struct ccwgroup_device *gdev)
        qeth_trace_features(card);
        qeth_l2_trace_features(card);
 
-       qeth_l2_setup_bridgeport_attrs(card);
-
        card->state = CARD_STATE_HARDSETUP;
        qeth_print_status_message(card);
 

diff --git a/drivers/s390/net/qeth_l2_sys.c b/drivers/s390/net/qeth_l2_sys.c
index 7fa325cf6f8d36323c43f6dacb72445830848a17..86bcae992f72568c82330b8e4bb352c9fd1eb0a0 100644 (file)
--- a/drivers/s390/net/qeth_l2_sys.c
+++ b/drivers/s390/net/qeth_l2_sys.c
@@ -246,40 +246,6 @@ static struct attribute_group qeth_l2_bridgeport_attr_group = {
        .attrs = qeth_l2_bridgeport_attrs,
 };
 
-/**
- * qeth_l2_setup_bridgeport_attrs() - set/restore attrs when turning online.
- * @card:                            qeth_card structure pointer
- *
- * Note: this function is called with conf_mutex held by the caller
- */
-void qeth_l2_setup_bridgeport_attrs(struct qeth_card *card)
-{
-       int rc;
-
-       if (!card)
-               return;
-       if (!card->options.sbp.supported_funcs)
-               return;
-
-       mutex_lock(&card->sbp_lock);
-       if (!card->options.sbp.reflect_promisc &&
-           card->options.sbp.role != QETH_SBP_ROLE_NONE) {
-               /* Conditional to avoid spurious error messages */
-               qeth_bridgeport_setrole(card, card->options.sbp.role);
-               /* Let the callback function refresh the stored role value. */
-               qeth_bridgeport_query_ports(card,
-                       &card->options.sbp.role, NULL);
-       }
-       if (card->options.sbp.hostnotification) {
-               rc = qeth_bridgeport_an_set(card, 1);
-               if (rc)
-                       card->options.sbp.hostnotification = 0;
-       } else {
-               qeth_bridgeport_an_set(card, 0);
-       }
-       mutex_unlock(&card->sbp_lock);
-}
-
 /* VNIC CHARS support */
 
 /* convert sysfs attr name to VNIC characteristic */