s390/qeth: use netdev_name()

Replace our custom version of netdev_name().

Once we started to allocate the netdev at probe time with
commit d3d1b205e89f ("s390/qeth: allocate netdevice early"), this
stopped working as intended anyway.

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

diff --git a/drivers/s390/net/qeth_core.h b/drivers/s390/net/qeth_core.h
index e5f47a8..39d17ea 100644 (file)
--- a/drivers/s390/net/qeth_core.h
+++ b/drivers/s390/net/qeth_core.h
@@ -892,9 +892,6 @@ struct qeth_trap_id {
        __u16 devno;
 } __packed;
 
-/*some helper functions*/
-#define QETH_CARD_IFNAME(card) (((card)->dev)? (card)->dev->name : "")
-
 static inline bool qeth_uses_tx_prio_queueing(struct qeth_card *card)
 {
        return card->qdio.do_prio_queueing != QETH_NO_PRIO_QUEUEING;

diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index 9e9c229..5fd6142 100644 (file)
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -915,12 +915,12 @@ static struct qeth_ipa_cmd *qeth_check_ipa_data(struct qeth_card *card,
                if (cmd->hdr.return_code == IPA_RC_VEPA_TO_VEB_TRANSITION) {
                        dev_err(&card->gdev->dev,
                                "Interface %s is down because the adjacent port is no longer in reflective relay mode\n",
-                               QETH_CARD_IFNAME(card));
+                               netdev_name(card->dev));
                        schedule_work(&card->close_dev_work);
                } else {
                        dev_warn(&card->gdev->dev,
                                 "The link for interface %s on CHPID 0x%X failed\n",
-                                QETH_CARD_IFNAME(card), card->info.chpid);
+                                netdev_name(card->dev), card->info.chpid);
                        qeth_issue_ipa_msg(cmd, cmd->hdr.return_code, card);
                        netif_carrier_off(card->dev);
                }
@@ -928,7 +928,7 @@ static struct qeth_ipa_cmd *qeth_check_ipa_data(struct qeth_card *card,
        case IPA_CMD_STARTLAN:
                dev_info(&card->gdev->dev,
                         "The link for %s on CHPID 0x%X has been restored\n",
-                        QETH_CARD_IFNAME(card), card->info.chpid);
+                        netdev_name(card->dev), card->info.chpid);
                if (card->info.hwtrap)
                        card->info.hwtrap = 2;
                qeth_schedule_recovery(card);

diff --git a/drivers/s390/net/qeth_core_sys.c b/drivers/s390/net/qeth_core_sys.c
index 7cc5649..4441b33 100644 (file)
--- a/drivers/s390/net/qeth_core_sys.c
+++ b/drivers/s390/net/qeth_core_sys.c
@@ -52,7 +52,7 @@ static ssize_t qeth_dev_if_name_show(struct device *dev,
 {
        struct qeth_card *card = dev_get_drvdata(dev);
 
-       return sprintf(buf, "%s\n", QETH_CARD_IFNAME(card));
+       return sprintf(buf, "%s\n", netdev_name(card->dev));
 }
 
 static DEVICE_ATTR(if_name, 0444, qeth_dev_if_name_show, NULL);

diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index 2e9d3fe..a88d0a0 100644 (file)
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -1372,7 +1372,7 @@ static void qeth_addr_change_event_worker(struct work_struct *work)
 
                dev_info(&data->card->gdev->dev,
                         "Address change notification stopped on %s (%s)\n",
-                        data->card->dev->name,
+                        netdev_name(card->dev),
                        (data->ac_event.lost_event_mask == 0x01)
                        ? "Overflow"
                        : (data->ac_event.lost_event_mask == 0x02)

diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index 4db7ded..e7244aa 100644 (file)
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -706,16 +706,16 @@ static int qeth_l3_start_ipa_arp_processing(struct qeth_card *card)
 
        if (!qeth_is_supported(card, IPA_ARP_PROCESSING)) {
                dev_info(&card->gdev->dev,
-                       "ARP processing not supported on %s!\n",
-                       QETH_CARD_IFNAME(card));
+                        "ARP processing not supported on %s!\n",
+                        netdev_name(card->dev));
                return 0;
        }
        rc = qeth_send_simple_setassparms(card, IPA_ARP_PROCESSING,
                                          IPA_CMD_ASS_START, NULL);
        if (rc) {
                dev_warn(&card->gdev->dev,
-                       "Starting ARP processing support for %s failed\n",
-                       QETH_CARD_IFNAME(card));
+                        "Starting ARP processing support for %s failed\n",
+                        netdev_name(card->dev));
        }
        return rc;
 }
@@ -728,8 +728,8 @@ static int qeth_l3_start_ipa_source_mac(struct qeth_card *card)
 
        if (!qeth_is_supported(card, IPA_SOURCE_MAC)) {
                dev_info(&card->gdev->dev,
-                       "Inbound source MAC-address not supported on %s\n",
-                       QETH_CARD_IFNAME(card));
+                        "Inbound source MAC-address not supported on %s\n",
+                        netdev_name(card->dev));
                return -EOPNOTSUPP;
        }
 
@@ -737,8 +737,8 @@ static int qeth_l3_start_ipa_source_mac(struct qeth_card *card)
                                          IPA_CMD_ASS_START, NULL);
        if (rc)
                dev_warn(&card->gdev->dev,
-                       "Starting source MAC-address support for %s failed\n",
-                       QETH_CARD_IFNAME(card));
+                        "Starting source MAC-address support for %s failed\n",
+                        netdev_name(card->dev));
        return rc;
 }
 
@@ -750,7 +750,7 @@ static int qeth_l3_start_ipa_vlan(struct qeth_card *card)
 
        if (!qeth_is_supported(card, IPA_FULL_VLAN)) {
                dev_info(&card->gdev->dev,
-                       "VLAN not supported on %s\n", QETH_CARD_IFNAME(card));
+                        "VLAN not supported on %s\n", netdev_name(card->dev));
                return -EOPNOTSUPP;
        }
 
@@ -758,8 +758,8 @@ static int qeth_l3_start_ipa_vlan(struct qeth_card *card)
                                          IPA_CMD_ASS_START, NULL);
        if (rc) {
                dev_warn(&card->gdev->dev,
-                       "Starting VLAN support for %s failed\n",
-                       QETH_CARD_IFNAME(card));
+                        "Starting VLAN support for %s failed\n",
+                        netdev_name(card->dev));
        } else {
                dev_info(&card->gdev->dev, "VLAN enabled\n");
        }
@@ -774,8 +774,8 @@ static int qeth_l3_start_ipa_multicast(struct qeth_card *card)
 
        if (!qeth_is_supported(card, IPA_MULTICASTING)) {
                dev_info(&card->gdev->dev,
-                       "Multicast not supported on %s\n",
-                       QETH_CARD_IFNAME(card));
+                        "Multicast not supported on %s\n",
+                        netdev_name(card->dev));
                return -EOPNOTSUPP;
        }
 
@@ -783,8 +783,8 @@ static int qeth_l3_start_ipa_multicast(struct qeth_card *card)
                                          IPA_CMD_ASS_START, NULL);
        if (rc) {
                dev_warn(&card->gdev->dev,
-                       "Starting multicast support for %s failed\n",
-                       QETH_CARD_IFNAME(card));
+                        "Starting multicast support for %s failed\n",
+                        netdev_name(card->dev));
        } else {
                dev_info(&card->gdev->dev, "Multicast enabled\n");
                card->dev->flags |= IFF_MULTICAST;
@@ -807,7 +807,7 @@ static int qeth_l3_softsetup_ipv6(struct qeth_card *card)
        if (rc) {
                dev_err(&card->gdev->dev,
                        "Activating IPv6 support for %s failed\n",
-                       QETH_CARD_IFNAME(card));
+                       netdev_name(card->dev));
                return rc;
        }
        rc = qeth_send_simple_setassparms_v6(card, IPA_IPV6, IPA_CMD_ASS_START,
@@ -815,15 +815,15 @@ static int qeth_l3_softsetup_ipv6(struct qeth_card *card)
        if (rc) {
                dev_err(&card->gdev->dev,
                        "Activating IPv6 support for %s failed\n",
-                        QETH_CARD_IFNAME(card));
+                        netdev_name(card->dev));
                return rc;
        }
        rc = qeth_send_simple_setassparms_v6(card, IPA_PASSTHRU,
                                             IPA_CMD_ASS_START, NULL);
        if (rc) {
                dev_warn(&card->gdev->dev,
-                       "Enabling the passthrough mode for %s failed\n",
-                       QETH_CARD_IFNAME(card));
+                        "Enabling the passthrough mode for %s failed\n",
+                        netdev_name(card->dev));
                return rc;
        }
 out:
@@ -837,7 +837,7 @@ static int qeth_l3_start_ipa_ipv6(struct qeth_card *card)
 
        if (!qeth_is_supported(card, IPA_IPV6)) {
                dev_info(&card->gdev->dev,
-                       "IPv6 not supported on %s\n", QETH_CARD_IFNAME(card));
+                        "IPv6 not supported on %s\n", netdev_name(card->dev));
                return 0;
        }
        return qeth_l3_softsetup_ipv6(card);
@@ -852,16 +852,17 @@ static int qeth_l3_start_ipa_broadcast(struct qeth_card *card)
        card->info.broadcast_capable = 0;
        if (!qeth_is_supported(card, IPA_FILTERING)) {
                dev_info(&card->gdev->dev,
-                       "Broadcast not supported on %s\n",
-                       QETH_CARD_IFNAME(card));
+                        "Broadcast not supported on %s\n",
+                        netdev_name(card->dev));
                rc = -EOPNOTSUPP;
                goto out;
        }
        rc = qeth_send_simple_setassparms(card, IPA_FILTERING,
                                          IPA_CMD_ASS_START, NULL);
        if (rc) {
-               dev_warn(&card->gdev->dev, "Enabling broadcast filtering for "
-                       "%s failed\n", QETH_CARD_IFNAME(card));
+               dev_warn(&card->gdev->dev,
+                        "Enabling broadcast filtering for %s failed\n",
+                        netdev_name(card->dev));
                goto out;
        }
 
@@ -869,8 +870,8 @@ static int qeth_l3_start_ipa_broadcast(struct qeth_card *card)
                                          IPA_CMD_ASS_CONFIGURE, &filter_data);
        if (rc) {
                dev_warn(&card->gdev->dev,
-                       "Setting up broadcast filtering for %s failed\n",
-                       QETH_CARD_IFNAME(card));
+                        "Setting up broadcast filtering for %s failed\n",
+                        netdev_name(card->dev));
                goto out;
        }
        card->info.broadcast_capable = QETH_BROADCAST_WITH_ECHO;
@@ -878,8 +879,9 @@ static int qeth_l3_start_ipa_broadcast(struct qeth_card *card)
        rc = qeth_send_simple_setassparms(card, IPA_FILTERING,
                                          IPA_CMD_ASS_ENABLE, &filter_data);
        if (rc) {
-               dev_warn(&card->gdev->dev, "Setting up broadcast echo "
-                       "filtering for %s failed\n", QETH_CARD_IFNAME(card));
+               dev_warn(&card->gdev->dev,
+                        "Setting up broadcast echo filtering for %s failed\n",
+                        netdev_name(card->dev));
                goto out;
        }
        card->info.broadcast_capable = QETH_BROADCAST_WITHOUT_ECHO;