diff options
| author | Sergio Paracuellos <sergio.paracuellos@gmail.com> | 2018-03-20 15:36:43 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-03-22 18:20:54 +0100 |
| commit | 31ce0d861cd1053b3950cf405c73f32ca9ed73ea (patch) | |
| tree | cb2a941c15e0de3b4c911015b045b789bbc0fc07 /drivers/staging/ks7010 | |
| parent | 127aaef460ebb715f22d185db2b4d4149bd91c89 (diff) | |
| download | linux-31ce0d861cd1053b3950cf405c73f32ca9ed73ea.tar.bz2 | |
staging: ks7010: replace KS_WLAN_DEBUG with DEBUG preprocessor directive
This commit replaces custom KS_WLAN_DEBUG which is not being used anymore
in favour of DEBUG which is the one included when debugging is enabled.
Signed-off-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/ks7010')
| -rw-r--r-- | drivers/staging/ks7010/Makefile | 1 | ||||
| -rw-r--r-- | drivers/staging/ks7010/ks7010_sdio.c | 9 | ||||
| -rw-r--r-- | drivers/staging/ks7010/ks_hostif.c | 6 | ||||
| -rw-r--r-- | drivers/staging/ks7010/ks_wlan.h | 2 |
4 files changed, 8 insertions, 10 deletions
diff --git a/drivers/staging/ks7010/Makefile b/drivers/staging/ks7010/Makefile index 69fcf8d655c7..07dc16cc86f5 100644 --- a/drivers/staging/ks7010/Makefile +++ b/drivers/staging/ks7010/Makefile @@ -1,4 +1,3 @@ obj-$(CONFIG_KS7010) += ks7010.o -ccflags-y += -DKS_WLAN_DEBUG=0 ks7010-y := michael_mic.o ks_hostif.o ks_wlan_net.o ks7010_sdio.o diff --git a/drivers/staging/ks7010/ks7010_sdio.c b/drivers/staging/ks7010/ks7010_sdio.c index 50a7a15a93f1..b8f55a11ee1c 100644 --- a/drivers/staging/ks7010/ks7010_sdio.c +++ b/drivers/staging/ks7010/ks7010_sdio.c @@ -385,11 +385,10 @@ static void ks_wlan_hw_rx(struct ks_wlan_private *priv, uint16_t size) /* length check */ if (size > 2046 || size == 0) { -#ifdef KS_WLAN_DEBUG - if (KS_WLAN_DEBUG > 5) - print_hex_dump_bytes("INVALID DATA dump: ", - DUMP_PREFIX_OFFSET, - rx_buffer->data, 32); +#ifdef DEBUG + print_hex_dump_bytes("INVALID DATA dump: ", + DUMP_PREFIX_OFFSET, + rx_buffer->data, 32); #endif ret = ks7010_sdio_writeb(priv, READ_STATUS, REG_STATUS_IDLE); if (ret) diff --git a/drivers/staging/ks7010/ks_hostif.c b/drivers/staging/ks7010/ks_hostif.c index d644a1d7b564..81391df9e6d2 100644 --- a/drivers/staging/ks7010/ks_hostif.c +++ b/drivers/staging/ks7010/ks_hostif.c @@ -2409,10 +2409,10 @@ void hostif_sme_enqueue(struct ks_wlan_private *priv, unsigned short event) if (cnt_smeqbody(priv) < (SME_EVENT_BUFF_SIZE - 1)) { priv->sme_i.event_buff[priv->sme_i.qtail] = event; inc_smeqtail(priv); -#ifdef KS_WLAN_DEBUG +#ifdef DEBUG if (priv->sme_i.max_event_count < cnt_smeqbody(priv)) priv->sme_i.max_event_count = cnt_smeqbody(priv); -#endif /* KS_WLAN_DEBUG */ +#endif } else { /* in case of buffer overflow */ netdev_err(priv->net_dev, "sme queue buffer overflow\n"); @@ -2461,7 +2461,7 @@ int hostif_init(struct ks_wlan_private *priv) priv->sme_i.sme_status = SME_IDLE; priv->sme_i.qhead = 0; priv->sme_i.qtail = 0; -#ifdef KS_WLAN_DEBUG +#ifdef DEBUG priv->sme_i.max_event_count = 0; #endif spin_lock_init(&priv->sme_i.sme_spin); diff --git a/drivers/staging/ks7010/ks_wlan.h b/drivers/staging/ks7010/ks_wlan.h index 4fff7f7ebf1d..6bad88d287fd 100644 --- a/drivers/staging/ks7010/ks_wlan.h +++ b/drivers/staging/ks7010/ks_wlan.h @@ -192,7 +192,7 @@ struct sme_info { int event_buff[SME_EVENT_BUFF_SIZE]; unsigned int qhead; unsigned int qtail; -#ifdef KS_WLAN_DEBUG +#ifdef DEBUG /* for debug */ unsigned int max_event_count; #endif |