* [PATCH 1/2] staging: csr: Fixed indentation errors on csr_wifi_vif_utils.h
@ 2012-10-16 16:48 Sangho Yi
2012-10-16 16:48 ` [PATCH 2/2] staging: csr: Fixed macro definition style " Sangho Yi
2012-10-22 21:07 ` [PATCH 1/2] staging: csr: Fixed indentation " Greg KH
0 siblings, 2 replies; 3+ messages in thread
From: Sangho Yi @ 2012-10-16 16:48 UTC (permalink / raw)
To: devel; +Cc: gregkh, linux-kernel, Sangho Yi
There were 4 spaces indented lines, so I fixed using tabs.
Signed-off-by: Sangho Yi <antiroot@gmail.com>
---
drivers/staging/csr/csr_wifi_vif_utils.h | 58 ++++++++++++++++--------------
1 file changed, 31 insertions(+), 27 deletions(-)
diff --git a/drivers/staging/csr/csr_wifi_vif_utils.h b/drivers/staging/csr/csr_wifi_vif_utils.h
index 523172d..c997398 100644
--- a/drivers/staging/csr/csr_wifi_vif_utils.h
+++ b/drivers/staging/csr/csr_wifi_vif_utils.h
@@ -1,10 +1,10 @@
/*****************************************************************************
- (c) Cambridge Silicon Radio Limited 2011
- All rights reserved and confidential information of CSR
+(c) Cambridge Silicon Radio Limited 2011
+All rights reserved and confidential information of CSR
- Refer to LICENSE.txt included with this source for details
- on the license terms.
+Refer to LICENSE.txt included with this source for details
+on the license terms.
*****************************************************************************/
@@ -23,28 +23,29 @@ extern "C" {
/* MACROS *******************************************************************/
-/* Common macros for NME and SME to be used temporarily until SoftMAC changes are made */
-#define CSR_WIFI_NUM_INTERFACES (u8)0x1
-#define CSR_WIFI_INTERFACE_IN_USE (u16)0x0
+/* Common macros for NME and SME to be used temporarily until SoftMAC
+ * changes are made */
+#define CSR_WIFI_NUM_INTERFACES (u8)0x1
+#define CSR_WIFI_INTERFACE_IN_USE (u16)0x0
/* This is used at places where interface Id isn't available*/
-#define CSR_WIFI_INTERFACE_ZERO 0
-#define CSR_WIFI_INTERFACE_STA 0
-#define CSR_WIFI_INTERFACE_AMP 0
+#define CSR_WIFI_INTERFACE_ZERO 0
+#define CSR_WIFI_INTERFACE_STA 0
+#define CSR_WIFI_INTERFACE_AMP 0
#define CSR_WIFI_VIF_UTILS_UNDEFINED_TAG 0xFFFF
/* Extract the Interface Id from the event */
#define CsrWifiVifUtilsGetVifTagFromEvent(msg) \
- ((u16) * ((u16 *) ((u8 *) (msg) + sizeof(CsrWifiFsmEvent))))
+ ((u16) * ((u16 *) ((u8 *) (msg) + sizeof(CsrWifiFsmEvent))))
/* The HPI Vif combines the type and the interface id */
#define CsrWifiVifUtilsGetVifTagFromHipEvent(msg) \
- ((msg)->virtualInterfaceIdentifier & 0x00FF)
+ ((msg)->virtualInterfaceIdentifier & 0x00FF)
#define CsrWifiVifUtilsPackHipEventVif(type, interfaceId) \
- ((u16)((interfaceId) | ((type) << 8)))
+ ((u16)((interfaceId) | ((type) << 8)))
/* TYPES DEFINITIONS ********************************************************/
@@ -55,8 +56,10 @@ extern "C" {
/**
* @brief
- * First checks if the mode is supported capability bitmap of the interface.
- * If this succeeds, then checks if running this mode on this interface is allowed.
+ * First checks if the mode is supported capability bitmap
+ * of the interface.
+ * If this succeeds, then checks if running this mode on this
+ * interface is allowed.
*
* @param[in] u8 : interface capability bitmap
* @param[in] u8* : pointer to the array of current interface modes
@@ -64,36 +67,37 @@ extern "C" {
* @param[in] CsrWifiInterfaceMode : mode
*
* @return
- * u8 : returns true if the interface is allowed to operate in the mode otherwise false.
+ * u8 : returns true if the interface is allowed to operate
+ * in the mode otherwise false.
*/
-extern u8 CsrWifiVifUtilsCheckCompatibility(u8 interfaceCapability,
- u8 *currentInterfaceModes,
- u16 interfaceTag,
- CsrWifiInterfaceMode mode);
+extern u8 CsrWifiVifUtilsCheckCompatibility(u8 interfaceCapability,
+ u8 *currentInterfaceModes, u16 interfaceTag,
+ CsrWifiInterfaceMode mode);
/**
* @brief
- * Checks if the specified interface is supported.
- * NOTE: Only checks that the interface is supported, no checks are made to
- * determine whether a supported interface may be made active.
+ * Checks if the specified interface is supported.
+ * NOTE: Only checks that the interface is supported,
+ * no checks are made to determine whether a supported
+ * interface may be made active.
*
* @param[in] u16 : interfaceTag
*
* @return
- * u8 : returns true if the interface is supported, otherwise false.
+ * u8 : returns true if the interface is supported, otherwise false.
*/
extern u8 CsrWifiVifUtilsIsSupported(u16 interfaceTag);
#ifdef CSR_LOG_ENABLE
/**
* @brief
- * Registers the virtual interface utils logging details.
- * Should only be called once at initialisation.
+ * Registers the virtual interface utils logging details.
+ * Should only be called once at initialisation.
*
* @param[in/out] None
*
* @return
- * None
+ * None
*/
void CsrWifiVifUtilsLogTextRegister(void);
#else
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] staging: csr: Fixed macro definition style errors on csr_wifi_vif_utils.h
2012-10-16 16:48 [PATCH 1/2] staging: csr: Fixed indentation errors on csr_wifi_vif_utils.h Sangho Yi
@ 2012-10-16 16:48 ` Sangho Yi
2012-10-22 21:07 ` [PATCH 1/2] staging: csr: Fixed indentation " Greg KH
1 sibling, 0 replies; 3+ messages in thread
From: Sangho Yi @ 2012-10-16 16:48 UTC (permalink / raw)
To: devel; +Cc: gregkh, linux-kernel, Sangho Yi
I fixed 3 lines of code where there were the coding style errors on
defining the macros.
Signed-off-by: Sangho Yi <antiroot@gmail.com>
---
drivers/staging/csr/csr_wifi_vif_utils.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/csr/csr_wifi_vif_utils.h b/drivers/staging/csr/csr_wifi_vif_utils.h
index c997398..f1374f2 100644
--- a/drivers/staging/csr/csr_wifi_vif_utils.h
+++ b/drivers/staging/csr/csr_wifi_vif_utils.h
@@ -25,8 +25,8 @@ extern "C" {
/* Common macros for NME and SME to be used temporarily until SoftMAC
* changes are made */
-#define CSR_WIFI_NUM_INTERFACES (u8)0x1
-#define CSR_WIFI_INTERFACE_IN_USE (u16)0x0
+#define CSR_WIFI_NUM_INTERFACES ((u8)0x1)
+#define CSR_WIFI_INTERFACE_IN_USE ((u16)0x0)
/* This is used at places where interface Id isn't available*/
#define CSR_WIFI_INTERFACE_ZERO 0
@@ -38,7 +38,7 @@ extern "C" {
/* Extract the Interface Id from the event */
#define CsrWifiVifUtilsGetVifTagFromEvent(msg) \
- ((u16) * ((u16 *) ((u8 *) (msg) + sizeof(CsrWifiFsmEvent))))
+ ((u16) *((u16 *) ((u8 *) (msg) + sizeof(CsrWifiFsmEvent))))
/* The HPI Vif combines the type and the interface id */
#define CsrWifiVifUtilsGetVifTagFromHipEvent(msg) \
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] staging: csr: Fixed indentation errors on csr_wifi_vif_utils.h
2012-10-16 16:48 [PATCH 1/2] staging: csr: Fixed indentation errors on csr_wifi_vif_utils.h Sangho Yi
2012-10-16 16:48 ` [PATCH 2/2] staging: csr: Fixed macro definition style " Sangho Yi
@ 2012-10-22 21:07 ` Greg KH
1 sibling, 0 replies; 3+ messages in thread
From: Greg KH @ 2012-10-22 21:07 UTC (permalink / raw)
To: Sangho Yi; +Cc: devel, linux-kernel
On Wed, Oct 17, 2012 at 01:48:29AM +0900, Sangho Yi wrote:
> There were 4 spaces indented lines, so I fixed using tabs.
>
> Signed-off-by: Sangho Yi <antiroot@gmail.com>
> ---
> drivers/staging/csr/csr_wifi_vif_utils.h | 58 ++++++++++++++++--------------
> 1 file changed, 31 insertions(+), 27 deletions(-)
>
> diff --git a/drivers/staging/csr/csr_wifi_vif_utils.h b/drivers/staging/csr/csr_wifi_vif_utils.h
> index 523172d..c997398 100644
> --- a/drivers/staging/csr/csr_wifi_vif_utils.h
> +++ b/drivers/staging/csr/csr_wifi_vif_utils.h
> @@ -1,10 +1,10 @@
> /*****************************************************************************
>
> - (c) Cambridge Silicon Radio Limited 2011
> - All rights reserved and confidential information of CSR
> +(c) Cambridge Silicon Radio Limited 2011
> +All rights reserved and confidential information of CSR
>
> - Refer to LICENSE.txt included with this source for details
> - on the license terms.
> +Refer to LICENSE.txt included with this source for details
> +on the license terms.
>
> *****************************************************************************/
>
> @@ -23,28 +23,29 @@ extern "C" {
>
> /* MACROS *******************************************************************/
>
> -/* Common macros for NME and SME to be used temporarily until SoftMAC changes are made */
> -#define CSR_WIFI_NUM_INTERFACES (u8)0x1
> -#define CSR_WIFI_INTERFACE_IN_USE (u16)0x0
> +/* Common macros for NME and SME to be used temporarily until SoftMAC
> + * changes are made */
> +#define CSR_WIFI_NUM_INTERFACES (u8)0x1
> +#define CSR_WIFI_INTERFACE_IN_USE (u16)0x0
>
> /* This is used at places where interface Id isn't available*/
> -#define CSR_WIFI_INTERFACE_ZERO 0
> -#define CSR_WIFI_INTERFACE_STA 0
> -#define CSR_WIFI_INTERFACE_AMP 0
> +#define CSR_WIFI_INTERFACE_ZERO 0
> +#define CSR_WIFI_INTERFACE_STA 0
> +#define CSR_WIFI_INTERFACE_AMP 0
>
>
> #define CSR_WIFI_VIF_UTILS_UNDEFINED_TAG 0xFFFF
>
> /* Extract the Interface Id from the event */
> #define CsrWifiVifUtilsGetVifTagFromEvent(msg) \
> - ((u16) * ((u16 *) ((u8 *) (msg) + sizeof(CsrWifiFsmEvent))))
> + ((u16) * ((u16 *) ((u8 *) (msg) + sizeof(CsrWifiFsmEvent))))
>
> /* The HPI Vif combines the type and the interface id */
> #define CsrWifiVifUtilsGetVifTagFromHipEvent(msg) \
> - ((msg)->virtualInterfaceIdentifier & 0x00FF)
> + ((msg)->virtualInterfaceIdentifier & 0x00FF)
>
> #define CsrWifiVifUtilsPackHipEventVif(type, interfaceId) \
> - ((u16)((interfaceId) | ((type) << 8)))
> + ((u16)((interfaceId) | ((type) << 8)))
>
>
> /* TYPES DEFINITIONS ********************************************************/
> @@ -55,8 +56,10 @@ extern "C" {
>
> /**
> * @brief
> - * First checks if the mode is supported capability bitmap of the interface.
> - * If this succeeds, then checks if running this mode on this interface is allowed.
> + * First checks if the mode is supported capability bitmap
> + * of the interface.
> + * If this succeeds, then checks if running this mode on this
> + * interface is allowed.
> *
> * @param[in] u8 : interface capability bitmap
> * @param[in] u8* : pointer to the array of current interface modes
> @@ -64,36 +67,37 @@ extern "C" {
> * @param[in] CsrWifiInterfaceMode : mode
> *
> * @return
> - * u8 : returns true if the interface is allowed to operate in the mode otherwise false.
> + * u8 : returns true if the interface is allowed to operate
> + * in the mode otherwise false.
> */
> -extern u8 CsrWifiVifUtilsCheckCompatibility(u8 interfaceCapability,
> - u8 *currentInterfaceModes,
> - u16 interfaceTag,
> - CsrWifiInterfaceMode mode);
> +extern u8 CsrWifiVifUtilsCheckCompatibility(u8 interfaceCapability,
> + u8 *currentInterfaceModes, u16 interfaceTag,
> + CsrWifiInterfaceMode mode);
The first one was almost correct, please indent the parameters back out
to where they line up.
Please redo these two patches and resend.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-10-22 21:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-16 16:48 [PATCH 1/2] staging: csr: Fixed indentation errors on csr_wifi_vif_utils.h Sangho Yi
2012-10-16 16:48 ` [PATCH 2/2] staging: csr: Fixed macro definition style " Sangho Yi
2012-10-22 21:07 ` [PATCH 1/2] staging: csr: Fixed indentation " Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox