Skip to content

Commit 84c9148

Browse files
julianwiedmanndavem330
julianwiedmann
authored and
davem330
committed
s390/qeth: use netdev_name()
Replace our custom version of netdev_name(). Once we started to allocate the netdev at probe time with commit d3d1b20 ("s390/qeth: allocate netdevice early"), this stopped working as intended anyway. Signed-off-by: Julian Wiedmann <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 50144f6 commit 84c9148

File tree

5 files changed

+35
-36
lines changed

5 files changed

+35
-36
lines changed

‎drivers/s390/net/qeth_core.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -892,9 +892,6 @@ struct qeth_trap_id {
892892
__u16 devno;
893893
} __packed;
894894

895-
/*some helper functions*/
896-
#define QETH_CARD_IFNAME(card) (((card)->dev)? (card)->dev->name : "")
897-
898895
static inline bool qeth_uses_tx_prio_queueing(struct qeth_card *card)
899896
{
900897
return card->qdio.do_prio_queueing != QETH_NO_PRIO_QUEUEING;

‎drivers/s390/net/qeth_core_main.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -915,20 +915,20 @@ static struct qeth_ipa_cmd *qeth_check_ipa_data(struct qeth_card *card,
915915
if (cmd->hdr.return_code == IPA_RC_VEPA_TO_VEB_TRANSITION) {
916916
dev_err(&card->gdev->dev,
917917
"Interface %s is down because the adjacent port is no longer in reflective relay mode\n",
918-
QETH_CARD_IFNAME(card));
918+
netdev_name(card->dev));
919919
schedule_work(&card->close_dev_work);
920920
} else {
921921
dev_warn(&card->gdev->dev,
922922
"The link for interface %s on CHPID 0x%X failed\n",
923-
QETH_CARD_IFNAME(card), card->info.chpid);
923+
netdev_name(card->dev), card->info.chpid);
924924
qeth_issue_ipa_msg(cmd, cmd->hdr.return_code, card);
925925
netif_carrier_off(card->dev);
926926
}
927927
return NULL;
928928
case IPA_CMD_STARTLAN:
929929
dev_info(&card->gdev->dev,
930930
"The link for %s on CHPID 0x%X has been restored\n",
931-
QETH_CARD_IFNAME(card), card->info.chpid);
931+
netdev_name(card->dev), card->info.chpid);
932932
if (card->info.hwtrap)
933933
card->info.hwtrap = 2;
934934
qeth_schedule_recovery(card);

‎drivers/s390/net/qeth_core_sys.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ static ssize_t qeth_dev_if_name_show(struct device *dev,
5252
{
5353
struct qeth_card *card = dev_get_drvdata(dev);
5454

55-
return sprintf(buf, "%s\n", QETH_CARD_IFNAME(card));
55+
return sprintf(buf, "%s\n", netdev_name(card->dev));
5656
}
5757

5858
static DEVICE_ATTR(if_name, 0444, qeth_dev_if_name_show, NULL);

‎drivers/s390/net/qeth_l2_main.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1372,7 +1372,7 @@ static void qeth_addr_change_event_worker(struct work_struct *work)
13721372

13731373
dev_info(&data->card->gdev->dev,
13741374
"Address change notification stopped on %s (%s)\n",
1375-
data->card->dev->name,
1375+
netdev_name(card->dev),
13761376
(data->ac_event.lost_event_mask == 0x01)
13771377
? "Overflow"
13781378
: (data->ac_event.lost_event_mask == 0x02)

‎drivers/s390/net/qeth_l3_main.c‎

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -706,16 +706,16 @@ static int qeth_l3_start_ipa_arp_processing(struct qeth_card *card)
706706

707707
if (!qeth_is_supported(card, IPA_ARP_PROCESSING)) {
708708
dev_info(&card->gdev->dev,
709-
"ARP processing not supported on %s!\n",
710-
QETH_CARD_IFNAME(card));
709+
"ARP processing not supported on %s!\n",
710+
netdev_name(card->dev));
711711
return 0;
712712
}
713713
rc = qeth_send_simple_setassparms(card, IPA_ARP_PROCESSING,
714714
IPA_CMD_ASS_START, NULL);
715715
if (rc) {
716716
dev_warn(&card->gdev->dev,
717-
"Starting ARP processing support for %s failed\n",
718-
QETH_CARD_IFNAME(card));
717+
"Starting ARP processing support for %s failed\n",
718+
netdev_name(card->dev));
719719
}
720720
return rc;
721721
}
@@ -728,17 +728,17 @@ static int qeth_l3_start_ipa_source_mac(struct qeth_card *card)
728728

729729
if (!qeth_is_supported(card, IPA_SOURCE_MAC)) {
730730
dev_info(&card->gdev->dev,
731-
"Inbound source MAC-address not supported on %s\n",
732-
QETH_CARD_IFNAME(card));
731+
"Inbound source MAC-address not supported on %s\n",
732+
netdev_name(card->dev));
733733
return -EOPNOTSUPP;
734734
}
735735

736736
rc = qeth_send_simple_setassparms(card, IPA_SOURCE_MAC,
737737
IPA_CMD_ASS_START, NULL);
738738
if (rc)
739739
dev_warn(&card->gdev->dev,
740-
"Starting source MAC-address support for %s failed\n",
741-
QETH_CARD_IFNAME(card));
740+
"Starting source MAC-address support for %s failed\n",
741+
netdev_name(card->dev));
742742
return rc;
743743
}
744744

@@ -750,16 +750,16 @@ static int qeth_l3_start_ipa_vlan(struct qeth_card *card)
750750

751751
if (!qeth_is_supported(card, IPA_FULL_VLAN)) {
752752
dev_info(&card->gdev->dev,
753-
"VLAN not supported on %s\n", QETH_CARD_IFNAME(card));
753+
"VLAN not supported on %s\n", netdev_name(card->dev));
754754
return -EOPNOTSUPP;
755755
}
756756

757757
rc = qeth_send_simple_setassparms(card, IPA_VLAN_PRIO,
758758
IPA_CMD_ASS_START, NULL);
759759
if (rc) {
760760
dev_warn(&card->gdev->dev,
761-
"Starting VLAN support for %s failed\n",
762-
QETH_CARD_IFNAME(card));
761+
"Starting VLAN support for %s failed\n",
762+
netdev_name(card->dev));
763763
} else {
764764
dev_info(&card->gdev->dev, "VLAN enabled\n");
765765
}
@@ -774,17 +774,17 @@ static int qeth_l3_start_ipa_multicast(struct qeth_card *card)
774774

775775
if (!qeth_is_supported(card, IPA_MULTICASTING)) {
776776
dev_info(&card->gdev->dev,
777-
"Multicast not supported on %s\n",
778-
QETH_CARD_IFNAME(card));
777+
"Multicast not supported on %s\n",
778+
netdev_name(card->dev));
779779
return -EOPNOTSUPP;
780780
}
781781

782782
rc = qeth_send_simple_setassparms(card, IPA_MULTICASTING,
783783
IPA_CMD_ASS_START, NULL);
784784
if (rc) {
785785
dev_warn(&card->gdev->dev,
786-
"Starting multicast support for %s failed\n",
787-
QETH_CARD_IFNAME(card));
786+
"Starting multicast support for %s failed\n",
787+
netdev_name(card->dev));
788788
} else {
789789
dev_info(&card->gdev->dev, "Multicast enabled\n");
790790
card->dev->flags |= IFF_MULTICAST;
@@ -807,23 +807,23 @@ static int qeth_l3_softsetup_ipv6(struct qeth_card *card)
807807
if (rc) {
808808
dev_err(&card->gdev->dev,
809809
"Activating IPv6 support for %s failed\n",
810-
QETH_CARD_IFNAME(card));
810+
netdev_name(card->dev));
811811
return rc;
812812
}
813813
rc = qeth_send_simple_setassparms_v6(card, IPA_IPV6, IPA_CMD_ASS_START,
814814
NULL);
815815
if (rc) {
816816
dev_err(&card->gdev->dev,
817817
"Activating IPv6 support for %s failed\n",
818-
QETH_CARD_IFNAME(card));
818+
netdev_name(card->dev));
819819
return rc;
820820
}
821821
rc = qeth_send_simple_setassparms_v6(card, IPA_PASSTHRU,
822822
IPA_CMD_ASS_START, NULL);
823823
if (rc) {
824824
dev_warn(&card->gdev->dev,
825-
"Enabling the passthrough mode for %s failed\n",
826-
QETH_CARD_IFNAME(card));
825+
"Enabling the passthrough mode for %s failed\n",
826+
netdev_name(card->dev));
827827
return rc;
828828
}
829829
out:
@@ -837,7 +837,7 @@ static int qeth_l3_start_ipa_ipv6(struct qeth_card *card)
837837

838838
if (!qeth_is_supported(card, IPA_IPV6)) {
839839
dev_info(&card->gdev->dev,
840-
"IPv6 not supported on %s\n", QETH_CARD_IFNAME(card));
840+
"IPv6 not supported on %s\n", netdev_name(card->dev));
841841
return 0;
842842
}
843843
return qeth_l3_softsetup_ipv6(card);
@@ -852,34 +852,36 @@ static int qeth_l3_start_ipa_broadcast(struct qeth_card *card)
852852
card->info.broadcast_capable = 0;
853853
if (!qeth_is_supported(card, IPA_FILTERING)) {
854854
dev_info(&card->gdev->dev,
855-
"Broadcast not supported on %s\n",
856-
QETH_CARD_IFNAME(card));
855+
"Broadcast not supported on %s\n",
856+
netdev_name(card->dev));
857857
rc = -EOPNOTSUPP;
858858
goto out;
859859
}
860860
rc = qeth_send_simple_setassparms(card, IPA_FILTERING,
861861
IPA_CMD_ASS_START, NULL);
862862
if (rc) {
863-
dev_warn(&card->gdev->dev, "Enabling broadcast filtering for "
864-
"%s failed\n", QETH_CARD_IFNAME(card));
863+
dev_warn(&card->gdev->dev,
864+
"Enabling broadcast filtering for %s failed\n",
865+
netdev_name(card->dev));
865866
goto out;
866867
}
867868

868869
rc = qeth_send_simple_setassparms(card, IPA_FILTERING,
869870
IPA_CMD_ASS_CONFIGURE, &filter_data);
870871
if (rc) {
871872
dev_warn(&card->gdev->dev,
872-
"Setting up broadcast filtering for %s failed\n",
873-
QETH_CARD_IFNAME(card));
873+
"Setting up broadcast filtering for %s failed\n",
874+
netdev_name(card->dev));
874875
goto out;
875876
}
876877
card->info.broadcast_capable = QETH_BROADCAST_WITH_ECHO;
877878
dev_info(&card->gdev->dev, "Broadcast enabled\n");
878879
rc = qeth_send_simple_setassparms(card, IPA_FILTERING,
879880
IPA_CMD_ASS_ENABLE, &filter_data);
880881
if (rc) {
881-
dev_warn(&card->gdev->dev, "Setting up broadcast echo "
882-
"filtering for %s failed\n", QETH_CARD_IFNAME(card));
882+
dev_warn(&card->gdev->dev,
883+
"Setting up broadcast echo filtering for %s failed\n",
884+
netdev_name(card->dev));
883885
goto out;
884886
}
885887
card->info.broadcast_capable = QETH_BROADCAST_WITHOUT_ECHO;

0 commit comments

Comments
 (0)