From: Glen Lee <glen.lee@atmel.com>
To: <gregkh@linuxfoundation.org>
Cc: <devel@driverdev.osuosl.org>, <linux-wireless@vger.kernel.org>,
<tony.cho@atmel.com>, <glen.lee@atmel.com>, <leo.kim@atmel.com>,
<austin.shin@atmel.com>, <adel.noureldin@atmel.com>,
<adham.abozaeid@atmel.com>, <Nicolas.FERRE@atmel.com>
Subject: [PATCH 02/10] staging: wilc1000: remove wilc_debug_func of hif_init
Date: Mon, 23 Nov 2015 18:48:00 +0900 [thread overview]
Message-ID: <1448272088-13973-2-git-send-email-glen.lee@atmel.com> (raw)
In-Reply-To: <1448272088-13973-1-git-send-email-glen.lee@atmel.com>
This patch removes wilc_debug_func of hif_init and remove it's related
functions as well because it is not used anymore.
Signed-off-by: Glen Lee <glen.lee@atmel.com>
---
drivers/staging/wilc1000/wilc_sdio.c | 2 +-
drivers/staging/wilc1000/wilc_spi.c | 2 +-
drivers/staging/wilc1000/wilc_wlan.c | 2 +-
drivers/staging/wilc1000/wilc_wlan.h | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_sdio.c b/drivers/staging/wilc1000/wilc_sdio.c
index 30dd7f9..c2c10dd 100644
--- a/drivers/staging/wilc1000/wilc_sdio.c
+++ b/drivers/staging/wilc1000/wilc_sdio.c
@@ -512,7 +512,7 @@ static int sdio_sync(struct wilc *wilc)
return 1;
}
-static int sdio_init(struct wilc *wilc, wilc_debug_func debug_func)
+static int sdio_init(struct wilc *wilc)
{
struct sdio_func *func = dev_to_sdio_func(wilc->dev);
sdio_cmd52_t cmd;
diff --git a/drivers/staging/wilc1000/wilc_spi.c b/drivers/staging/wilc1000/wilc_spi.c
index 2d51748..6032a8f 100644
--- a/drivers/staging/wilc1000/wilc_spi.c
+++ b/drivers/staging/wilc1000/wilc_spi.c
@@ -734,7 +734,7 @@ static int wilc_spi_sync(struct wilc *wilc)
return 1;
}
-static int _wilc_spi_init(struct wilc *wilc, wilc_debug_func func)
+static int _wilc_spi_init(struct wilc *wilc)
{
struct spi_device *spi = to_spi_device(wilc->dev);
u32 reg;
diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c
index 0427349..32ecc2d 100644
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -1587,7 +1587,7 @@ int wilc_wlan_init(struct net_device *dev)
PRINT_D(INIT_DBG, "Initializing WILC_Wlan ...\n");
- if (!wilc->hif_func->hif_init(wilc, wilc_debug)) {
+ if (!wilc->hif_func->hif_init(wilc)) {
ret = -EIO;
goto _fail_;
}
diff --git a/drivers/staging/wilc1000/wilc_wlan.h b/drivers/staging/wilc1000/wilc_wlan.h
index 3666453..580e1d6 100644
--- a/drivers/staging/wilc1000/wilc_wlan.h
+++ b/drivers/staging/wilc1000/wilc_wlan.h
@@ -226,7 +226,7 @@ struct rxq_entry_t {
********************************************/
struct wilc;
struct wilc_hif_func {
- int (*hif_init)(struct wilc *, wilc_debug_func);
+ int (*hif_init)(struct wilc *);
int (*hif_deinit)(struct wilc *);
int (*hif_read_reg)(struct wilc *, u32, u32 *);
int (*hif_write_reg)(struct wilc *, u32, u32);
--
1.9.1
next prev parent reply other threads:[~2015-11-23 9:44 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-23 9:47 [PATCH 01/10] staging: wilc1000: sdio/spi: use device print api instead of custom one Glen Lee
2015-11-23 9:48 ` Glen Lee [this message]
2015-11-23 9:48 ` [PATCH 03/10] staging: wilc1000: remove unused functions Glen Lee
2015-11-23 9:48 ` [PATCH 04/10] staging: wilc1000: linux_wlan_sdio.c: fix checkpatch warning line over 80 Glen Lee
2015-11-23 9:48 ` [PATCH 05/10] staging: wilc1000: linux_wlan_sdio.c: remove braces Glen Lee
2015-11-23 9:48 ` [PATCH 06/10] staging: wilc1000: wilc_sdio_cmd53: return linux error value Glen Lee
2015-11-23 9:48 ` [PATCH 07/10] staging: wilc1000: wilc_sdio_cmd52: " Glen Lee
2015-11-23 9:48 ` [PATCH 08/10] staging: wilc1000: linux_wlan_spi.c: remove braces for single statement Glen Lee
2015-11-23 9:48 ` [PATCH 09/10] staging: wilc1000: linux_wlan_spi.c: add a blank Glen Lee
2015-11-23 9:48 ` [PATCH 10/10] staging: wilc1000: linux_wlan_spi.c: fix NULL comparison style Glen Lee
2015-12-18 22:38 ` [PATCH 01/10] staging: wilc1000: sdio/spi: use device print api instead of custom one Greg KH
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=1448272088-13973-2-git-send-email-glen.lee@atmel.com \
--to=glen.lee@atmel.com \
--cc=Nicolas.FERRE@atmel.com \
--cc=adel.noureldin@atmel.com \
--cc=adham.abozaeid@atmel.com \
--cc=austin.shin@atmel.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=leo.kim@atmel.com \
--cc=linux-wireless@vger.kernel.org \
--cc=tony.cho@atmel.com \
/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;
as well as URLs for NNTP newsgroup(s).