1 files changed, 0 insertions, 106 deletions
diff --git a/0001-brcmfmac-Remove-firmware-loading-code-duplication.patch b/0001-brcmfmac-Remove-firmware-loading-code-duplication.patch
deleted file mode 100644
index 5145e5534..000000000
--- a/0001-brcmfmac-Remove-firmware-loading-code-duplication.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From 920bc5d0e3a0ffa9142b54c3b6acf253e6e24d64 Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Thu, 27 Sep 2018 17:44:30 +0200
-Subject: [PATCH 1/5] brcmfmac: Remove firmware-loading code duplication
-
-brcmf_fw_request_next_item and brcmf_fw_request_done both have identical
-code to complete the fw-request depending on the item-type.
-
-This commit adds a new brcmf_fw_complete_request helper removing this code
-duplication.
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- .../broadcom/brcm80211/brcmfmac/firmware.c    | 62 +++++++++----------
- 1 file changed, 31 insertions(+), 31 deletions(-)
-
-diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
-index 2af2251cd8e9..848c3351d107 100644
---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
-@@ -587,6 +587,34 @@ static int brcmf_fw_request_nvram_done(const struct firmware *fw, void *ctx)
- 	return -ENOENT;
- }
- 
-+static int brcmf_fw_complete_request(const struct firmware *fw,
-+				     struct brcmf_fw *fwctx)
-+{
-+	struct brcmf_fw_item *cur = &fwctx->req->items[fwctx->curpos];
-+	int ret = 0;
-+
-+	brcmf_dbg(TRACE, "firmware %s %sfound\n", cur->path, fw ? "" : "not ");
-+
-+	switch (cur->type) {
-+	case BRCMF_FW_TYPE_NVRAM:
-+		ret = brcmf_fw_request_nvram_done(fw, fwctx);
-+		break;
-+	case BRCMF_FW_TYPE_BINARY:
-+		if (fw)
-+			cur->binary = fw;
-+		else
-+			ret = -ENOENT;
-+		break;
-+	default:
-+		/* something fishy here so bail out early */
-+		brcmf_err("unknown fw type: %d\n", cur->type);
-+		release_firmware(fw);
-+		ret = -EINVAL;
-+	}
-+
-+	return (cur->flags & BRCMF_FW_REQF_OPTIONAL) ? 0 : ret;
-+}
-+
- static int brcmf_fw_request_next_item(struct brcmf_fw *fwctx, bool async)
- {
- 	struct brcmf_fw_item *cur;
-@@ -608,15 +636,7 @@ static int brcmf_fw_request_next_item(struct brcmf_fw *fwctx, bool async)
- 	if (ret < 0) {
- 		brcmf_fw_request_done(NULL, fwctx);
- 	} else if (!async && fw) {
--		brcmf_dbg(TRACE, "firmware %s %sfound\n", cur->path,
--			  fw ? "" : "not ");
--		if (cur->type == BRCMF_FW_TYPE_BINARY)
--			cur->binary = fw;
--		else if (cur->type == BRCMF_FW_TYPE_NVRAM)
--			brcmf_fw_request_nvram_done(fw, fwctx);
--		else
--			release_firmware(fw);
--
-+		brcmf_fw_complete_request(fw, fwctx);
- 		return -EAGAIN;
- 	}
- 	return 0;
-@@ -630,28 +650,8 @@ static void brcmf_fw_request_done(const struct firmware *fw, void *ctx)
- 
- 	cur = &fwctx->req->items[fwctx->curpos];
- 
--	brcmf_dbg(TRACE, "enter: firmware %s %sfound\n", cur->path,
--		  fw ? "" : "not ");
--
--	if (!fw)
--		ret = -ENOENT;
--
--	switch (cur->type) {
--	case BRCMF_FW_TYPE_NVRAM:
--		ret = brcmf_fw_request_nvram_done(fw, fwctx);
--		break;
--	case BRCMF_FW_TYPE_BINARY:
--		cur->binary = fw;
--		break;
--	default:
--		/* something fishy here so bail out early */
--		brcmf_err("unknown fw type: %d\n", cur->type);
--		release_firmware(fw);
--		ret = -EINVAL;
--		goto fail;
--	}
--
--	if (ret < 0 && !(cur->flags & BRCMF_FW_REQF_OPTIONAL))
-+	ret = brcmf_fw_complete_request(fw, fwctx);
-+	if (ret < 0)
- 		goto fail;
- 
- 	do {
--- 
-2.19.0
-