Re: [PATCH 1/2] staging: csr: Fixed indentation errors oncsr_wifi_vif_utils.h

From: Greg KH
Date: Mon Oct 22 2012 - 17:07:14 EST


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@xxxxxxxxx>
> ---
> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/