mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Jerome Pouiller <Jerome.Pouiller@silabs.com>
To: "devel@driverdev.osuosl.org" <devel@driverdev.osuosl.org>
Cc: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Jerome Pouiller <Jerome.Pouiller@silabs.com>
Subject: [PATCH 1/6] staging: wfx: drop module version
Date: Thu, 17 Oct 2019 09:40:04 +0000	[thread overview]
Message-ID: <20191017093954.657-1-Jerome.Pouiller@silabs.com> (raw)

From: Jérôme Pouiller <jerome.pouiller@silabs.com>

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>
---
 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@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"
-- 
2.20.1

             reply	other threads:[~2019-10-17  9:41 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-17  9:40 Jerome Pouiller [this message]
2019-10-17  9:40 ` [PATCH 2/6] staging: wfx: relocate wfx_fill_sl_key() in secure_link.h Jerome Pouiller
2019-10-17  9:40 ` [PATCH 3/6] staging: wfx: fix CONFIG_MMC=m with CONFIG_WFX=y Jerome Pouiller
2019-10-17  9:40 ` [PATCH 4/6] staging: wfx: fix Oops when CONFIG_OF_NET is not set Jerome Pouiller
2019-10-17  9:40 ` [PATCH 5/6] staging: wfx: fix setting MAC address from DT Jerome Pouiller
2019-10-17  9:40 ` [PATCH 6/6] staging: wfx: fix number of available tx_policies Jerome Pouiller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191017093954.657-1-Jerome.Pouiller@silabs.com \
    --to=jerome.pouiller@silabs.com \
    --cc=devel@driverdev.osuosl.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®