diff options
| author | Jérôme Pouiller <jerome.pouiller@silabs.com> | 2019-10-17 12:40:04 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-10-26 21:41:17 +0300 |
| commit | 27a6fe3b21ec80662096b2c793036b5e8c3401ed (patch) | |
| tree | 36c92ccfc90351d54b4c3cffd6e9b91d902802a8 /drivers | |
| parent | ec9e2a0ff12c0046aa15673a1084a8d67a14bdb1 (diff) | |
| download | linux-27a6fe3b21ec80662096b2c793036b5e8c3401ed.tar.xz | |
staging: wfx: drop module version
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@silabs.com>
Link: https://lore.kernel.org/r/20191017093954.657-1-Jerome.Pouiller@silabs.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/wfx/TODO | 3 | ||||
| -rw-r--r-- | drivers/staging/wfx/main.c | 4 | ||||
| -rw-r--r-- | drivers/staging/wfx/wfx_version.h | 3 |
3 files changed, 0 insertions, 10 deletions
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@silabs.com>"); 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" |