Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1571970 > unrolled thread
| Started by | Logan Gorence <kernelgorence@gmail.com> |
|---|---|
| First post | 2017-02-01 22:00 +0100 |
| Last post | 2017-02-01 22:50 +0100 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH] Staging: ks7010: Fix tabs in ks_hostif.h. Logan Gorence <kernelgorence@gmail.com> - 2017-02-01 22:00 +0100
Re: [PATCH] Staging: ks7010: Fix tabs in ks_hostif.h. Joe Perches <joe@perches.com> - 2017-02-01 22:50 +0100
| From | Logan Gorence <kernelgorence@gmail.com> |
|---|---|
| Date | 2017-02-01 22:00 +0100 |
| Subject | [PATCH] Staging: ks7010: Fix tabs in ks_hostif.h. |
| Message-ID | <t6aau-2uM-7@gated-at.bofh.it> |
Convert spaces to tabs in ks_hostif.h, according to
the checkpatch.pl script.
Signed-off-by: Logan Gorence <kernelgorence@gmail.com>
---
drivers/staging/ks7010/ks_hostif.h | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/drivers/staging/ks7010/ks_hostif.h b/drivers/staging/ks7010/ks_hostif.h
index 743f31ead56e..fa6dc01dcae9 100644
--- a/drivers/staging/ks7010/ks_hostif.h
+++ b/drivers/staging/ks7010/ks_hostif.h
@@ -569,18 +569,18 @@ struct hostif_mic_failure_confirm_t {
#define TX_RATE_54M (uint8_t)(540/5)
#define IS_11B_RATE(A) (((A&RATE_MASK)==TX_RATE_1M)||((A&RATE_MASK)==TX_RATE_2M)||\
- ((A&RATE_MASK)==TX_RATE_5M)||((A&RATE_MASK)==TX_RATE_11M))
+ ((A&RATE_MASK)==TX_RATE_5M)||((A&RATE_MASK)==TX_RATE_11M))
#define IS_OFDM_RATE(A) (((A&RATE_MASK)==TX_RATE_6M)||((A&RATE_MASK)==TX_RATE_12M)||\
- ((A&RATE_MASK)==TX_RATE_24M)||((A&RATE_MASK)==TX_RATE_9M)||\
- ((A&RATE_MASK)==TX_RATE_18M)||((A&RATE_MASK)==TX_RATE_36M)||\
- ((A&RATE_MASK)==TX_RATE_48M)||((A&RATE_MASK)==TX_RATE_54M))
+ ((A&RATE_MASK)==TX_RATE_24M)||((A&RATE_MASK)==TX_RATE_9M)||\
+ ((A&RATE_MASK)==TX_RATE_18M)||((A&RATE_MASK)==TX_RATE_36M)||\
+ ((A&RATE_MASK)==TX_RATE_48M)||((A&RATE_MASK)==TX_RATE_54M))
#define IS_11BG_RATE(A) (IS_11B_RATE(A)||IS_OFDM_RATE(A))
#define IS_OFDM_EXT_RATE(A) (((A&RATE_MASK)==TX_RATE_9M)||((A&RATE_MASK)==TX_RATE_18M)||\
- ((A&RATE_MASK)==TX_RATE_36M)||((A&RATE_MASK)==TX_RATE_48M)||\
- ((A&RATE_MASK)==TX_RATE_54M))
+ ((A&RATE_MASK)==TX_RATE_36M)||((A&RATE_MASK)==TX_RATE_48M)||\
+ ((A&RATE_MASK)==TX_RATE_54M))
enum {
CONNECT_STATUS = 0,
@@ -603,16 +603,16 @@ enum {
/* macro function */
#define HIF_EVENT_MASK 0xE800
#define IS_HIF_IND(_EVENT) ((_EVENT&HIF_EVENT_MASK)==0xE800 && \
- ((_EVENT&~HIF_EVENT_MASK)==0x0001 || \
- (_EVENT&~HIF_EVENT_MASK)==0x0006 || \
- (_EVENT&~HIF_EVENT_MASK)==0x000C || \
- (_EVENT&~HIF_EVENT_MASK)==0x0011 || \
- (_EVENT&~HIF_EVENT_MASK)==0x0012))
+ ((_EVENT&~HIF_EVENT_MASK)==0x0001 || \
+ (_EVENT&~HIF_EVENT_MASK)==0x0006 || \
+ (_EVENT&~HIF_EVENT_MASK)==0x000C || \
+ (_EVENT&~HIF_EVENT_MASK)==0x0011 || \
+ (_EVENT&~HIF_EVENT_MASK)==0x0012))
#define IS_HIF_CONF(_EVENT) ((_EVENT&HIF_EVENT_MASK)==0xE800 && \
- (_EVENT&~HIF_EVENT_MASK)>0x0000 && \
- (_EVENT&~HIF_EVENT_MASK)<0x0012 && \
- !IS_HIF_IND(_EVENT) )
+ (_EVENT&~HIF_EVENT_MASK)>0x0000 && \
+ (_EVENT&~HIF_EVENT_MASK)<0x0012 && \
+ !IS_HIF_IND(_EVENT) )
#ifdef __KERNEL__
@@ -620,14 +620,14 @@ enum {
/* function prototype */
int hostif_data_request(struct ks_wlan_private *priv,
- struct sk_buff *packet);
+ struct sk_buff *packet);
void hostif_receive(struct ks_wlan_private *priv, unsigned char *p,
- unsigned int size);
+ unsigned int size);
void hostif_sme_enqueue(struct ks_wlan_private *priv, uint16_t event);
int hostif_init(struct ks_wlan_private *priv);
void hostif_exit(struct ks_wlan_private *priv);
int ks_wlan_hw_tx(struct ks_wlan_private *priv, void *p,
- unsigned long size,
+ unsigned long size,
void (*complete_handler) (void *arg1, void *arg2),
void *arg1, void *arg2);
void send_packet_complete(void *, void *);
--
2.11.0
[toc] | [next] | [standalone]
| From | Joe Perches <joe@perches.com> |
|---|---|
| Date | 2017-02-01 22:50 +0100 |
| Message-ID | <t6aWS-3dV-11@gated-at.bofh.it> |
| In reply to | #1571970 |
On Wed, 2017-02-01 at 12:59 -0800, Logan Gorence wrote:
> Convert spaces to tabs in ks_hostif.h, according to
> the checkpatch.pl script.
[]
> diff --git a/drivers/staging/ks7010/ks_hostif.h b/drivers/staging/ks7010/ks_hostif.h
[]
> @@ -569,18 +569,18 @@ struct hostif_mic_failure_confirm_t {
> #define TX_RATE_54M (uint8_t)(540/5)
>
> #define IS_11B_RATE(A) (((A&RATE_MASK)==TX_RATE_1M)||((A&RATE_MASK)==TX_RATE_2M)||\
> - ((A&RATE_MASK)==TX_RATE_5M)||((A&RATE_MASK)==TX_RATE_11M))
> + ((A&RATE_MASK)==TX_RATE_5M)||((A&RATE_MASK)==TX_RATE_11M))
>
> #define IS_OFDM_RATE(A) (((A&RATE_MASK)==TX_RATE_6M)||((A&RATE_MASK)==TX_RATE_12M)||\
> - ((A&RATE_MASK)==TX_RATE_24M)||((A&RATE_MASK)==TX_RATE_9M)||\
> - ((A&RATE_MASK)==TX_RATE_18M)||((A&RATE_MASK)==TX_RATE_36M)||\
> - ((A&RATE_MASK)==TX_RATE_48M)||((A&RATE_MASK)==TX_RATE_54M))
> + ((A&RATE_MASK)==TX_RATE_24M)||((A&RATE_MASK)==TX_RATE_9M)||\
> + ((A&RATE_MASK)==TX_RATE_18M)||((A&RATE_MASK)==TX_RATE_36M)||\
> + ((A&RATE_MASK)==TX_RATE_48M)||((A&RATE_MASK)==TX_RATE_54M))
>
> #define IS_11BG_RATE(A) (IS_11B_RATE(A)||IS_OFDM_RATE(A))
>
> #define IS_OFDM_EXT_RATE(A) (((A&RATE_MASK)==TX_RATE_9M)||((A&RATE_MASK)==TX_RATE_18M)||\
> - ((A&RATE_MASK)==TX_RATE_36M)||((A&RATE_MASK)==TX_RATE_48M)||\
> - ((A&RATE_MASK)==TX_RATE_54M))
> + ((A&RATE_MASK)==TX_RATE_36M)||((A&RATE_MASK)==TX_RATE_48M)||\
> + ((A&RATE_MASK)==TX_RATE_54M))
Rather than just quieting checkpatch messages,
please try to make the code more intelligible
for humans to read.
Doing something like the below is clearer and
can actually produce smaller object code too.
---
diff --git a/drivers/staging/ks7010/ks_hostif.h b/drivers/staging/ks7010/ks_hostif.h
index 743f31ead56e..755e53805102 100644
--- a/drivers/staging/ks7010/ks_hostif.h
+++ b/drivers/staging/ks7010/ks_hostif.h
@@ -568,19 +568,31 @@ struct hostif_mic_failure_confirm_t {
#define TX_RATE_48M (uint8_t)(480/5)
#define TX_RATE_54M (uint8_t)(540/5)
-#define IS_11B_RATE(A) (((A&RATE_MASK)==TX_RATE_1M)||((A&RATE_MASK)==TX_RATE_2M)||\
- ((A&RATE_MASK)==TX_RATE_5M)||((A&RATE_MASK)==TX_RATE_11M))
-
-#define IS_OFDM_RATE(A) (((A&RATE_MASK)==TX_RATE_6M)||((A&RATE_MASK)==TX_RATE_12M)||\
- ((A&RATE_MASK)==TX_RATE_24M)||((A&RATE_MASK)==TX_RATE_9M)||\
- ((A&RATE_MASK)==TX_RATE_18M)||((A&RATE_MASK)==TX_RATE_36M)||\
- ((A&RATE_MASK)==TX_RATE_48M)||((A&RATE_MASK)==TX_RATE_54M))
-
-#define IS_11BG_RATE(A) (IS_11B_RATE(A)||IS_OFDM_RATE(A))
-
-#define IS_OFDM_EXT_RATE(A) (((A&RATE_MASK)==TX_RATE_9M)||((A&RATE_MASK)==TX_RATE_18M)||\
- ((A&RATE_MASK)==TX_RATE_36M)||((A&RATE_MASK)==TX_RATE_48M)||\
- ((A&RATE_MASK)==TX_RATE_54M))
+#define IS_11B_RATE(A) \
+({ \
+ typeof(A) _r = (A) & RATE_MASK; \
+ (_r == TX_RATE_1M || _r == TX_RATE_2M || \
+ _r == TX_RATE_5M || _r == TX_RATE_11M); \
+})
+
+#define IS_OFDM_RATE(A) \
+({ \
+ typeof(A) _r = (A) & RATE_MASK; \
+ (_r == TX_RATE_6M || _r == TX_RATE_12M || \
+ _r == TX_RATE_24M || _r == TX_RATE_9M || \
+ _r == TX_RATE_18M || _r == TX_RATE_36M || \
+ _r == TX_RATE_48M || _r == TX_RATE_54M); \
+})
+
+#define IS_11BG_RATE(A) (IS_11B_RATE(A) || IS_OFDM_RATE(A))
+
+#define IS_OFDM_EXT_RATE(A) \
+({ \
+ typeof(A) _r = (A) & RATE_MASK; \
+ (_r == TX_RATE_9M || _r == TX_RATE_18M || \
+ _r == TX_RATE_36M || _r == TX_RATE_48M || \
+ _r == TX_RATE_54M); \
+})
enum {
CONNECT_STATUS = 0,
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web