Commit 27a6fe3b authored by Jérôme Pouiller's avatar Jérôme Pouiller Committed by Greg Kroah-Hartman
Browse files

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: default avatarJérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20191017093954.657-1-Jerome.Pouiller@silabs.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ec9e2a0f

drivers/staging/wfx/TODO

+0 −3
Original line number Diff line number Diff line 
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)

drivers/staging/wfx/main.c

+0 −4
Original line number Diff line number Diff line
@@ -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)

drivers/staging/wfx/wfx_version.h

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT! */

#define WFX_LABEL "2.3.1"

CRA Git | Maintained and supported by SUSTech CRA and CCSE