From: Jérôme Pouiller <jerome.pouiller@xxxxxxxxxx>
wfx_version.h says that this code is same same than driver 2.3.1 hosted
on github:
https://github.com/siliconlabs/wfx-linux-driver/tree/2.3.1-public
However, it is inaccurate, driver in-tree contains multiple small
patches ahead 2.3.1.
I prefer to drop this confusing information.
Signed-off-by: Jérôme Pouiller <jerome.pouiller@xxxxxxxxxx>
---
drivers/staging/wfx/TODO | 3 ---
drivers/staging/wfx/main.c | 4 ----
drivers/staging/wfx/wfx_version.h | 3 ---
3 files changed, 10 deletions(-)
delete mode 100644 drivers/staging/wfx/wfx_version.h
diff --git a/drivers/staging/wfx/TODO b/drivers/staging/wfx/TODO
index be990e8f18b1..e44772289af8 100644
--- a/drivers/staging/wfx/TODO
+++ b/drivers/staging/wfx/TODO
@@ -1,9 +1,6 @@
This is a list of things that need to be done to get this driver out of the
staging directory.
- - wfx_version.h is still there in order to ensure synchronization with github.
- It can be dropped as soon as development is entirely in kernel
-
- I have to take a decision about secure link support. I can:
- drop completely
- keep it in an external patch (my preferred option)
diff --git a/drivers/staging/wfx/main.c b/drivers/staging/wfx/main.c
index d2508bc950fa..157e0fc0107e 100644
--- a/drivers/staging/wfx/main.c
+++ b/drivers/staging/wfx/main.c
@@ -33,14 +33,12 @@
#include "secure_link.h"
#include "hif_tx_mib.h"
#include "hif_api_cmd.h"
-#include "wfx_version.h"
#define WFX_PDS_MAX_SIZE 1500
MODULE_DESCRIPTION("Silicon Labs 802.11 Wireless LAN driver for WFx");
MODULE_AUTHOR("Jérôme Pouiller <jerome.pouiller@xxxxxxxxxx>");
MODULE_LICENSE("GPL");
-MODULE_VERSION(WFX_LABEL);
static int gpio_wakeup = -2;
module_param(gpio_wakeup, int, 0644);
@@ -480,8 +478,6 @@ static int __init wfx_core_init(void)
{
int ret = 0;
- pr_info("wfx: Silicon Labs " WFX_LABEL "\n");
-
if (IS_ENABLED(CONFIG_SPI))
ret = spi_register_driver(&wfx_spi_driver);
if (IS_ENABLED(CONFIG_MMC) && !ret)
diff --git a/drivers/staging/wfx/wfx_version.h b/drivers/staging/wfx/wfx_version.h
deleted file mode 100644
index 6e7f30207c73..000000000000
--- a/drivers/staging/wfx/wfx_version.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT! */
-#define WFX_LABEL "2.3.1"
--
2.20.1
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
