raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 10:00:17 +00:00
Code Issues Projects Releases Wiki Activity

s390/qeth: use netdev_name()

Browse Source 
Replace our custom version of netdev_name().

Once we started to allocate the netdev at probe time with
commit d3d1b205e8 ("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>
This commit is contained in:
Julian Wiedmann
2020-10-01 19:11:34 +02:00
committed by David S. Miller
parent 50144f6753
commit 84c91482ee
5 changed files with 35 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/s390/net/qeth_core.h
View File

@@ -892,9 +892,6 @@ struct qeth_trap_id {
__u16 devno; __u16 devno;
} __packed; } __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) static inline bool qeth_uses_tx_prio_queueing(struct qeth_card *card)
{ {
return card->qdio.do_prio_queueing != QETH_NO_PRIO_QUEUEING; return card->qdio.do_prio_queueing != QETH_NO_PRIO_QUEUEING;

6
drivers/s390/net/qeth_core_main.c
View File

@@ -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) { if (cmd->hdr.return_code == IPA_RC_VEPA_TO_VEB_TRANSITION) {
dev_err(&card->gdev->dev, dev_err(&card->gdev->dev,
"Interface %s is down because the adjacent port is no longer in reflective relay mode\n", "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); schedule_work(&card->close_dev_work);
} else { } else {
dev_warn(&card->gdev->dev, dev_warn(&card->gdev->dev,
"The link for interface %s on CHPID 0x%X failed\n", "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); qeth_issue_ipa_msg(cmd, cmd->hdr.return_code, card);
netif_carrier_off(card->dev); 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: case IPA_CMD_STARTLAN:
dev_info(&card->gdev->dev, dev_info(&card->gdev->dev,
"The link for %s on CHPID 0x%X has been restored\n", "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) if (card->info.hwtrap)
card->info.hwtrap = 2; card->info.hwtrap = 2;
qeth_schedule_recovery(card); qeth_schedule_recovery(card);

2
drivers/s390/net/qeth_core_sys.c
View File

@@ -52,7 +52,7 @@ static ssize_t qeth_dev_if_name_show(struct device *dev,
{ {
struct qeth_card *card = dev_get_drvdata(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); static DEVICE_ATTR(if_name, 0444, qeth_dev_if_name_show, NULL);

2
drivers/s390/net/qeth_l2_main.c
View File

@@ -1372,7 +1372,7 @@ static void qeth_addr_change_event_worker(struct work_struct *work)
dev_info(&data->card->gdev->dev, dev_info(&data->card->gdev->dev,
"Address change notification stopped on %s (%s)\n", "Address change notification stopped on %s (%s)\n",
data->card->dev->name, netdev_name(card->dev),
(data->ac_event.lost_event_mask == 0x01) (data->ac_event.lost_event_mask == 0x01)
? "Overflow" ? "Overflow"
: (data->ac_event.lost_event_mask == 0x02) : (data->ac_event.lost_event_mask == 0x02)

38
drivers/s390/net/qeth_l3_main.c
View File

@@ -707,7 +707,7 @@ static int qeth_l3_start_ipa_arp_processing(struct qeth_card *card)
if (!qeth_is_supported(card, IPA_ARP_PROCESSING)) { if (!qeth_is_supported(card, IPA_ARP_PROCESSING)) {
dev_info(&card->gdev->dev, dev_info(&card->gdev->dev,
"ARP processing not supported on %s!\n", "ARP processing not supported on %s!\n",
QETH_CARD_IFNAME(card)); netdev_name(card->dev));
return 0; return 0;
} }
rc = qeth_send_simple_setassparms(card, IPA_ARP_PROCESSING, rc = qeth_send_simple_setassparms(card, IPA_ARP_PROCESSING,
@@ -715,7 +715,7 @@ static int qeth_l3_start_ipa_arp_processing(struct qeth_card *card)
if (rc) { if (rc) {
dev_warn(&card->gdev->dev, dev_warn(&card->gdev->dev,
"Starting ARP processing support for %s failed\n", "Starting ARP processing support for %s failed\n",
QETH_CARD_IFNAME(card)); netdev_name(card->dev));
} }
return rc; return rc;
} }
@@ -729,7 +729,7 @@ static int qeth_l3_start_ipa_source_mac(struct qeth_card *card)
if (!qeth_is_supported(card, IPA_SOURCE_MAC)) { if (!qeth_is_supported(card, IPA_SOURCE_MAC)) {
dev_info(&card->gdev->dev, dev_info(&card->gdev->dev,
"Inbound source MAC-address not supported on %s\n", "Inbound source MAC-address not supported on %s\n",
QETH_CARD_IFNAME(card)); netdev_name(card->dev));
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
@@ -738,7 +738,7 @@ static int qeth_l3_start_ipa_source_mac(struct qeth_card *card)
if (rc) if (rc)
dev_warn(&card->gdev->dev, dev_warn(&card->gdev->dev,
"Starting source MAC-address support for %s failed\n", "Starting source MAC-address support for %s failed\n",
QETH_CARD_IFNAME(card)); netdev_name(card->dev));
return rc; 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)) { if (!qeth_is_supported(card, IPA_FULL_VLAN)) {
dev_info(&card->gdev->dev, 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; return -EOPNOTSUPP;
} }
@@ -759,7 +759,7 @@ static int qeth_l3_start_ipa_vlan(struct qeth_card *card)
if (rc) { if (rc) {
dev_warn(&card->gdev->dev, dev_warn(&card->gdev->dev,
"Starting VLAN support for %s failed\n", "Starting VLAN support for %s failed\n",
QETH_CARD_IFNAME(card)); netdev_name(card->dev));
} else { } else {
dev_info(&card->gdev->dev, "VLAN enabled\n"); dev_info(&card->gdev->dev, "VLAN enabled\n");
} }
@@ -775,7 +775,7 @@ static int qeth_l3_start_ipa_multicast(struct qeth_card *card)
if (!qeth_is_supported(card, IPA_MULTICASTING)) { if (!qeth_is_supported(card, IPA_MULTICASTING)) {
dev_info(&card->gdev->dev, dev_info(&card->gdev->dev,
"Multicast not supported on %s\n", "Multicast not supported on %s\n",
QETH_CARD_IFNAME(card)); netdev_name(card->dev));
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
@@ -784,7 +784,7 @@ static int qeth_l3_start_ipa_multicast(struct qeth_card *card)
if (rc) { if (rc) {
dev_warn(&card->gdev->dev, dev_warn(&card->gdev->dev,
"Starting multicast support for %s failed\n", "Starting multicast support for %s failed\n",
QETH_CARD_IFNAME(card)); netdev_name(card->dev));
} else { } else {
dev_info(&card->gdev->dev, "Multicast enabled\n"); dev_info(&card->gdev->dev, "Multicast enabled\n");
card->dev->flags |= IFF_MULTICAST; card->dev->flags |= IFF_MULTICAST;
@@ -807,7 +807,7 @@ static int qeth_l3_softsetup_ipv6(struct qeth_card *card)
if (rc) { if (rc) {
dev_err(&card->gdev->dev, dev_err(&card->gdev->dev,
"Activating IPv6 support for %s failed\n", "Activating IPv6 support for %s failed\n",
QETH_CARD_IFNAME(card)); netdev_name(card->dev));
return rc; return rc;
} }
rc = qeth_send_simple_setassparms_v6(card, IPA_IPV6, IPA_CMD_ASS_START, rc = qeth_send_simple_setassparms_v6(card, IPA_IPV6, IPA_CMD_ASS_START,
@@ -815,7 +815,7 @@ static int qeth_l3_softsetup_ipv6(struct qeth_card *card)
if (rc) { if (rc) {
dev_err(&card->gdev->dev, dev_err(&card->gdev->dev,
"Activating IPv6 support for %s failed\n", "Activating IPv6 support for %s failed\n",
QETH_CARD_IFNAME(card)); netdev_name(card->dev));
return rc; return rc;
} }
rc = qeth_send_simple_setassparms_v6(card, IPA_PASSTHRU, rc = qeth_send_simple_setassparms_v6(card, IPA_PASSTHRU,
@@ -823,7 +823,7 @@ static int qeth_l3_softsetup_ipv6(struct qeth_card *card)
if (rc) { if (rc) {
dev_warn(&card->gdev->dev, dev_warn(&card->gdev->dev,
"Enabling the passthrough mode for %s failed\n", "Enabling the passthrough mode for %s failed\n",
QETH_CARD_IFNAME(card)); netdev_name(card->dev));
return rc; return rc;
} }
out: out:
@@ -837,7 +837,7 @@ static int qeth_l3_start_ipa_ipv6(struct qeth_card *card)
if (!qeth_is_supported(card, IPA_IPV6)) { if (!qeth_is_supported(card, IPA_IPV6)) {
dev_info(&card->gdev->dev, 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 0;
} }
return qeth_l3_softsetup_ipv6(card); return qeth_l3_softsetup_ipv6(card);
@@ -853,15 +853,16 @@ static int qeth_l3_start_ipa_broadcast(struct qeth_card *card)
if (!qeth_is_supported(card, IPA_FILTERING)) { if (!qeth_is_supported(card, IPA_FILTERING)) {
dev_info(&card->gdev->dev, dev_info(&card->gdev->dev,
"Broadcast not supported on %s\n", "Broadcast not supported on %s\n",
QETH_CARD_IFNAME(card)); netdev_name(card->dev));
rc = -EOPNOTSUPP; rc = -EOPNOTSUPP;
goto out; goto out;
} }
rc = qeth_send_simple_setassparms(card, IPA_FILTERING, rc = qeth_send_simple_setassparms(card, IPA_FILTERING,
IPA_CMD_ASS_START, NULL); IPA_CMD_ASS_START, NULL);
if (rc) { if (rc) {
dev_warn(&card->gdev->dev, "Enabling broadcast filtering for " dev_warn(&card->gdev->dev,
"%s failed\n", QETH_CARD_IFNAME(card)); "Enabling broadcast filtering for %s failed\n",
netdev_name(card->dev));
goto out; goto out;
} }
@@ -870,7 +871,7 @@ static int qeth_l3_start_ipa_broadcast(struct qeth_card *card)
if (rc) { if (rc) {
dev_warn(&card->gdev->dev, dev_warn(&card->gdev->dev,
"Setting up broadcast filtering for %s failed\n", "Setting up broadcast filtering for %s failed\n",
QETH_CARD_IFNAME(card)); netdev_name(card->dev));
goto out; goto out;
} }
card->info.broadcast_capable = QETH_BROADCAST_WITH_ECHO; 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, rc = qeth_send_simple_setassparms(card, IPA_FILTERING,
IPA_CMD_ASS_ENABLE, &filter_data); IPA_CMD_ASS_ENABLE, &filter_data);
if (rc) { if (rc) {
dev_warn(&card->gdev->dev, "Setting up broadcast echo " dev_warn(&card->gdev->dev,
"filtering for %s failed\n", QETH_CARD_IFNAME(card)); "Setting up broadcast echo filtering for %s failed\n",
netdev_name(card->dev));
goto out; goto out;
} }
card->info.broadcast_capable = QETH_BROADCAST_WITHOUT_ECHO; card->info.broadcast_capable = QETH_BROADCAST_WITHOUT_ECHO;