* [PATCH] staging: otus: Remove mix of tabs and spaces with just tabs in ioctl.c
@ 2010-03-14 15:56 Steven Harms
2010-03-14 21:20 ` Simon Horman
0 siblings, 1 reply; 2+ messages in thread
From: Steven Harms @ 2010-03-14 15:56 UTC (permalink / raw)
To: gregkh, bobby.prani, sharms, dcb314, horms, a.beregalov
Cc: devel, linux-kernel
Previously defines had a mix of both tabs and spaces, causing an error in the checkpatch tool. These tabs and spaces have been consolidated to only tabs.
Signed-off-by: Steven Harms <sharms@ubuntu.com>
---
drivers/staging/otus/ioctl.c | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/drivers/staging/otus/ioctl.c b/drivers/staging/otus/ioctl.c
index 8c47b1a..963d807 100644
--- a/drivers/staging/otus/ioctl.c
+++ b/drivers/staging/otus/ioctl.c
@@ -29,34 +29,34 @@
#include "usbdrv.h"
-#define ZD_IOCTL_WPA (SIOCDEVPRIVATE + 1)
-#define ZD_IOCTL_PARAM (SIOCDEVPRIVATE + 2)
-#define ZD_IOCTL_GETWPAIE (SIOCDEVPRIVATE + 3)
+#define ZD_IOCTL_WPA (SIOCDEVPRIVATE + 1)
+#define ZD_IOCTL_PARAM (SIOCDEVPRIVATE + 2)
+#define ZD_IOCTL_GETWPAIE (SIOCDEVPRIVATE + 3)
#ifdef ZM_ENABLE_CENC
-#define ZM_IOCTL_CENC (SIOCDEVPRIVATE + 4)
+#define ZM_IOCTL_CENC (SIOCDEVPRIVATE + 4)
#endif /* ZM_ENABLE_CENC */
-#define ZD_PARAM_ROAMING 0x0001
-#define ZD_PARAM_PRIVACY 0x0002
-#define ZD_PARAM_WPA 0x0003
+#define ZD_PARAM_ROAMING 0x0001
+#define ZD_PARAM_PRIVACY 0x0002
+#define ZD_PARAM_WPA 0x0003
#define ZD_PARAM_COUNTERMEASURES 0x0004
#define ZD_PARAM_DROPUNENCRYPTED 0x0005
-#define ZD_PARAM_AUTH_ALGS 0x0006
-#define ZD_PARAM_WPS_FILTER 0x0007
+#define ZD_PARAM_AUTH_ALGS 0x0006
+#define ZD_PARAM_WPS_FILTER 0x0007
#ifdef ZM_ENABLE_CENC
#define P80211_PACKET_CENCFLAG 0x0001
#endif /* ZM_ENABLE_CENC */
-#define P80211_PACKET_SETKEY 0x0003
+#define P80211_PACKET_SETKEY 0x0003
#define ZD_CMD_SET_ENCRYPT_KEY 0x0001
-#define ZD_CMD_SET_MLME 0x0002
-#define ZD_CMD_SCAN_REQ 0x0003
+#define ZD_CMD_SET_MLME 0x0002
+#define ZD_CMD_SCAN_REQ 0x0003
#define ZD_CMD_SET_GENERIC_ELEMENT 0x0004
-#define ZD_CMD_GET_TSC 0x0005
+#define ZD_CMD_GET_TSC 0x0005
#define ZD_CRYPT_ALG_NAME_LEN 16
-#define ZD_MAX_KEY_SIZE 32
-#define ZD_MAX_GENERIC_SIZE 64
+#define ZD_MAX_KEY_SIZE 32
+#define ZD_MAX_GENERIC_SIZE 64
#include <net/iw_handler.h>
--
1.6.3.3
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] staging: otus: Remove mix of tabs and spaces with just tabs in ioctl.c
2010-03-14 15:56 [PATCH] staging: otus: Remove mix of tabs and spaces with just tabs in ioctl.c Steven Harms
@ 2010-03-14 21:20 ` Simon Horman
0 siblings, 0 replies; 2+ messages in thread
From: Simon Horman @ 2010-03-14 21:20 UTC (permalink / raw)
To: Steven Harms
Cc: gregkh, bobby.prani, sharms, dcb314, a.beregalov, devel, linux-kernel
On Sun, Mar 14, 2010 at 11:56:00AM -0400, Steven Harms wrote:
> Previously defines had a mix of both tabs and spaces, causing an error in the checkpatch tool. These tabs and spaces have been consolidated to only tabs.
> Signed-off-by: Steven Harms <sharms@ubuntu.com>
Looks good to me.
Acked-by: Simon Horman <horms@verge.net.au>
> ---
> drivers/staging/otus/ioctl.c | 30 +++++++++++++++---------------
> 1 files changed, 15 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/staging/otus/ioctl.c b/drivers/staging/otus/ioctl.c
> index 8c47b1a..963d807 100644
> --- a/drivers/staging/otus/ioctl.c
> +++ b/drivers/staging/otus/ioctl.c
> @@ -29,34 +29,34 @@
>
> #include "usbdrv.h"
>
> -#define ZD_IOCTL_WPA (SIOCDEVPRIVATE + 1)
> -#define ZD_IOCTL_PARAM (SIOCDEVPRIVATE + 2)
> -#define ZD_IOCTL_GETWPAIE (SIOCDEVPRIVATE + 3)
> +#define ZD_IOCTL_WPA (SIOCDEVPRIVATE + 1)
> +#define ZD_IOCTL_PARAM (SIOCDEVPRIVATE + 2)
> +#define ZD_IOCTL_GETWPAIE (SIOCDEVPRIVATE + 3)
> #ifdef ZM_ENABLE_CENC
> -#define ZM_IOCTL_CENC (SIOCDEVPRIVATE + 4)
> +#define ZM_IOCTL_CENC (SIOCDEVPRIVATE + 4)
> #endif /* ZM_ENABLE_CENC */
> -#define ZD_PARAM_ROAMING 0x0001
> -#define ZD_PARAM_PRIVACY 0x0002
> -#define ZD_PARAM_WPA 0x0003
> +#define ZD_PARAM_ROAMING 0x0001
> +#define ZD_PARAM_PRIVACY 0x0002
> +#define ZD_PARAM_WPA 0x0003
> #define ZD_PARAM_COUNTERMEASURES 0x0004
> #define ZD_PARAM_DROPUNENCRYPTED 0x0005
> -#define ZD_PARAM_AUTH_ALGS 0x0006
> -#define ZD_PARAM_WPS_FILTER 0x0007
> +#define ZD_PARAM_AUTH_ALGS 0x0006
> +#define ZD_PARAM_WPS_FILTER 0x0007
>
> #ifdef ZM_ENABLE_CENC
> #define P80211_PACKET_CENCFLAG 0x0001
> #endif /* ZM_ENABLE_CENC */
> -#define P80211_PACKET_SETKEY 0x0003
> +#define P80211_PACKET_SETKEY 0x0003
>
> #define ZD_CMD_SET_ENCRYPT_KEY 0x0001
> -#define ZD_CMD_SET_MLME 0x0002
> -#define ZD_CMD_SCAN_REQ 0x0003
> +#define ZD_CMD_SET_MLME 0x0002
> +#define ZD_CMD_SCAN_REQ 0x0003
> #define ZD_CMD_SET_GENERIC_ELEMENT 0x0004
> -#define ZD_CMD_GET_TSC 0x0005
> +#define ZD_CMD_GET_TSC 0x0005
>
> #define ZD_CRYPT_ALG_NAME_LEN 16
> -#define ZD_MAX_KEY_SIZE 32
> -#define ZD_MAX_GENERIC_SIZE 64
> +#define ZD_MAX_KEY_SIZE 32
> +#define ZD_MAX_GENERIC_SIZE 64
>
> #include <net/iw_handler.h>
>
> --
> 1.6.3.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-03-14 21:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-03-14 15:56 [PATCH] staging: otus: Remove mix of tabs and spaces with just tabs in ioctl.c Steven Harms
2010-03-14 21:20 ` Simon Horman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®