s390: drop patch n/a for 4.18.x codebase

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

2 files changed, 0 insertions, 78 deletions

diff --git a/queue/s390-qeth-handle-error-from-qeth_update_from_chp_des.patch b/queue/s390-qeth-handle-error-from-qeth_update_from_chp_des.patch
deleted file mode 100644
index 65d86fc..0000000
--- a/queue/s390-qeth-handle-error-from-qeth_update_from_chp_des.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From a4cdc9baee0740748f16e50cd70c2607510df492 Mon Sep 17 00:00:00 2001
-From: Julian Wiedmann <jwi@linux.ibm.com>
-Date: Wed, 17 Apr 2019 18:17:29 +0200
-Subject: [PATCH] s390/qeth: handle error from qeth_update_from_chp_desc()
-
-commit a4cdc9baee0740748f16e50cd70c2607510df492 upstream.
-
-Subsequent code relies on the values that qeth_update_from_chp_desc()
-reads from the CHP descriptor. Rather than dealing with weird errors
-later on, just handle it properly here.
-
-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_main.c b/drivers/s390/net/qeth_core_main.c
-index ca71632a4fa0..ac592d610c5e 100644
---- a/drivers/s390/net/qeth_core_main.c
-+++ b/drivers/s390/net/qeth_core_main.c
-@@ -1298,7 +1298,7 @@ static void qeth_set_multiple_write_queues(struct qeth_card *card)
- 	card->qdio.no_out_queues = 4;
- }
- 
--static void qeth_update_from_chp_desc(struct qeth_card *card)
-+static int qeth_update_from_chp_desc(struct qeth_card *card)
- {
- 	struct ccw_device *ccwdev;
- 	struct channel_path_desc_fmt0 *chp_dsc;
-@@ -1308,7 +1308,7 @@ static void qeth_update_from_chp_desc(struct qeth_card *card)
- 	ccwdev = card->data.ccwdev;
- 	chp_dsc = ccw_device_get_chp_desc(ccwdev, 0);
- 	if (!chp_dsc)
--		goto out;
-+		return -ENOMEM;
- 
- 	card->info.func_level = 0x4100 + chp_dsc->desc;
- 	if (card->info.type == QETH_CARD_TYPE_IQD)
-@@ -1323,6 +1323,7 @@ out:
- 	kfree(chp_dsc);
- 	QETH_DBF_TEXT_(SETUP, 2, "nr:%x", card->qdio.no_out_queues);
- 	QETH_DBF_TEXT_(SETUP, 2, "lvl:%02x", card->info.func_level);
-+	return 0;
- }
- 
- static void qeth_init_qdio_info(struct qeth_card *card)
-@@ -4978,7 +4979,9 @@ int qeth_core_hardsetup_card(struct qeth_card *card, bool *carrier_ok)
- 
- 	QETH_DBF_TEXT(SETUP, 2, "hrdsetup");
- 	atomic_set(&card->force_alloc_skb, 0);
--	qeth_update_from_chp_desc(card);
-+	rc = qeth_update_from_chp_desc(card);
-+	if (rc)
-+		return rc;
- retry:
- 	if (retries < 3)
- 		QETH_DBF_MESSAGE(2, "Retrying to do IDX activates on device %x.\n",
-@@ -5635,7 +5638,9 @@ static int qeth_core_probe_device(struct ccwgroup_device *gdev)
- 	}
- 
- 	qeth_setup_card(card);
--	qeth_update_from_chp_desc(card);
-+	rc = qeth_update_from_chp_desc(card);
-+	if (rc)
-+		goto err_chp_desc;
- 
- 	card->dev = qeth_alloc_netdev(card);
- 	if (!card->dev) {
-@@ -5670,6 +5675,7 @@ err_disc:
- 	qeth_core_free_discipline(card);
- err_load:
- 	free_netdev(card->dev);
-+err_chp_desc:
- err_card:
- 	qeth_core_free_card(card);
- err_dev:
--- 
-2.7.4
-
diff --git a/queue/series b/queue/series
index 757237f..fc997a1 100644
--- a/queue/series
+++ b/queue/series
@@ -26,7 +26,6 @@ staging-vc04_services-handle-kzalloc-failure.patch
 drm-msm-a5xx-fix-possible-object-reference-leak.patch
 irq_work-Do-not-raise-an-IPI-when-queueing-work-on-t.patch
 thunderbolt-Take-domain-lock-in-switch-sysfs-attribu.patch
-s390-qeth-handle-error-from-qeth_update_from_chp_des.patch
 USB-core-Don-t-unbind-interfaces-following-device-re.patch
 x86-irq-64-Limit-IST-stack-overflow-check-to-DB-stac.patch
 drm-etnaviv-avoid-DMA-API-warning-when-importing-buf.patch