Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1637160 > unrolled thread

[PATCH 1/2] staging: ccree: Fix indentation of driver_hash[] initializers

Started byGeert Uytterhoeven <geert@linux-m68k.org>
First post2017-05-08 01:40 +0200
Last post2017-05-12 11:40 +0200
Articles 4 — 2 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH 1/2] staging: ccree: Fix indentation of driver_hash[] initializers Geert Uytterhoeven <geert@linux-m68k.org> - 2017-05-08 01:40 +0200
    Re: [PATCH 1/2] staging: ccree: Fix indentation of driver_hash[]  initializers Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-05-12 11:00 +0200
      Re: [PATCH 1/2] staging: ccree: Fix indentation of driver_hash[]  initializers Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-05-12 11:40 +0200
      Re: [PATCH 1/2] staging: ccree: Fix indentation of driver_hash[] initializers Geert Uytterhoeven <geert@linux-m68k.org> - 2017-05-12 11:40 +0200

#1637160 — [PATCH 1/2] staging: ccree: Fix indentation of driver_hash[] initializers

FromGeert Uytterhoeven <geert@linux-m68k.org>
Date2017-05-08 01:40 +0200
Subject[PATCH 1/2] staging: ccree: Fix indentation of driver_hash[] initializers
Message-ID<tEDWq-4jj-9@gated-at.bofh.it>
Closing braces should match the first characters of the opening.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
 drivers/staging/ccree/ssi_hash.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/drivers/staging/ccree/ssi_hash.c b/drivers/staging/ccree/ssi_hash.c
index 8ff5d4ec9e5c00d2..33f4515dd7af4830 100644
--- a/drivers/staging/ccree/ssi_hash.c
+++ b/drivers/staging/ccree/ssi_hash.c
@@ -2001,8 +2001,8 @@ static struct ssi_hash_template driver_hash[] = {
 			.halg = {
 				.digestsize = SHA1_DIGEST_SIZE,
 				.statesize = sizeof(struct sha1_state),
-				},
 			},
+		},
 		.hash_mode = DRV_HASH_SHA1,
 		.hw_mode = DRV_HASH_HW_SHA1,
 		.inter_digestsize = SHA1_DIGEST_SIZE,
@@ -2028,8 +2028,8 @@ static struct ssi_hash_template driver_hash[] = {
 			.halg = {
 				.digestsize = SHA256_DIGEST_SIZE,
 				.statesize = sizeof(struct sha256_state),
-				},
 			},
+		},
 		.hash_mode = DRV_HASH_SHA256,
 		.hw_mode = DRV_HASH_HW_SHA256,
 		.inter_digestsize = SHA256_DIGEST_SIZE,
@@ -2055,8 +2055,8 @@ static struct ssi_hash_template driver_hash[] = {
 			.halg = {
 				.digestsize = SHA224_DIGEST_SIZE,
 				.statesize = sizeof(struct sha256_state),
-				},
 			},
+		},
 		.hash_mode = DRV_HASH_SHA224,
 		.hw_mode = DRV_HASH_HW_SHA256,
 		.inter_digestsize = SHA256_DIGEST_SIZE,
@@ -2083,8 +2083,8 @@ static struct ssi_hash_template driver_hash[] = {
 			.halg = {
 				.digestsize = SHA384_DIGEST_SIZE,
 				.statesize = sizeof(struct sha512_state),
-				},
 			},
+		},
 		.hash_mode = DRV_HASH_SHA384,
 		.hw_mode = DRV_HASH_HW_SHA512,
 		.inter_digestsize = SHA512_DIGEST_SIZE,
@@ -2110,8 +2110,8 @@ static struct ssi_hash_template driver_hash[] = {
 			.halg = {
 				.digestsize = SHA512_DIGEST_SIZE,
 				.statesize = sizeof(struct sha512_state),
-				},
 			},
+		},
 		.hash_mode = DRV_HASH_SHA512,
 		.hw_mode = DRV_HASH_HW_SHA512,
 		.inter_digestsize = SHA512_DIGEST_SIZE,
@@ -2138,8 +2138,8 @@ static struct ssi_hash_template driver_hash[] = {
 			.halg = {
 				.digestsize = MD5_DIGEST_SIZE,
 				.statesize = sizeof(struct md5_state),
-				},
 			},
+		},
 		.hash_mode = DRV_HASH_MD5,
 		.hw_mode = DRV_HASH_HW_MD5,
 		.inter_digestsize = MD5_DIGEST_SIZE,
@@ -2163,12 +2163,12 @@ static struct ssi_hash_template driver_hash[] = {
 			.halg = {
 				.digestsize = AES_BLOCK_SIZE,
 				.statesize = sizeof(struct aeshash_state),
-				},
 			},
-			.hash_mode = DRV_HASH_NULL,
-			.hw_mode = DRV_CIPHER_XCBC_MAC,
-			.inter_digestsize = AES_BLOCK_SIZE,
 		},
+		.hash_mode = DRV_HASH_NULL,
+		.hw_mode = DRV_CIPHER_XCBC_MAC,
+		.inter_digestsize = AES_BLOCK_SIZE,
+	},
 #if SSI_CC_HAS_CMAC
 	{
 		.name = "cmac(aes)",
@@ -2189,12 +2189,12 @@ static struct ssi_hash_template driver_hash[] = {
 			.halg = {
 				.digestsize = AES_BLOCK_SIZE,
 				.statesize = sizeof(struct aeshash_state),
-				},
 			},
-			.hash_mode = DRV_HASH_NULL,
-			.hw_mode = DRV_CIPHER_CMAC,
-			.inter_digestsize = AES_BLOCK_SIZE,
 		},
+		.hash_mode = DRV_HASH_NULL,
+		.hw_mode = DRV_CIPHER_CMAC,
+		.inter_digestsize = AES_BLOCK_SIZE,
+	},
 #endif
 	
 };
-- 
2.7.4

[toc] | [next] | [standalone]


#1640325 — Re: [PATCH 1/2] staging: ccree: Fix indentation of driver_hash[] initializers

FromGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Date2017-05-12 11:00 +0200
SubjectRe: [PATCH 1/2] staging: ccree: Fix indentation of driver_hash[] initializers
Message-ID<tGeAx-1Vp-1@gated-at.bofh.it>
In reply to#1637160
On Sun, May 07, 2017 at 09:53:29PM +0200, Geert Uytterhoeven wrote:
> Closing braces should match the first characters of the opening.
> 
> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
> ---
>  drivers/staging/ccree/ssi_hash.c | 28 ++++++++++++++--------------
>  1 file changed, 14 insertions(+), 14 deletions(-)

Doesn't apply to my tree at all :(

[toc] | [prev] | [next] | [standalone]


#1640350 — Re: [PATCH 1/2] staging: ccree: Fix indentation of driver_hash[] initializers

FromGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Date2017-05-12 11:40 +0200
SubjectRe: [PATCH 1/2] staging: ccree: Fix indentation of driver_hash[] initializers
Message-ID<tGfdf-2rg-1@gated-at.bofh.it>
In reply to#1640325
On Fri, May 12, 2017 at 11:28:37AM +0200, Geert Uytterhoeven wrote:
> Hi Greg,
> 
> On Fri, May 12, 2017 at 10:57 AM, Greg Kroah-Hartman
> <gregkh@linuxfoundation.org> wrote:
> > On Sun, May 07, 2017 at 09:53:29PM +0200, Geert Uytterhoeven wrote:
> >> Closing braces should match the first characters of the opening.
> >>
> >> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
> >> ---
> >>  drivers/staging/ccree/ssi_hash.c | 28 ++++++++++++++--------------
> >>  1 file changed, 14 insertions(+), 14 deletions(-)
> >
> > Doesn't apply to my tree at all :(
> 
> Not anymore, as Linus applied an alternative from Andrew for my 2/2.
> Hence see v2.

Ah, got that one now, sorry for the noise :)

greg k-h

[toc] | [prev] | [next] | [standalone]


#1640354

FromGeert Uytterhoeven <geert@linux-m68k.org>
Date2017-05-12 11:40 +0200
Message-ID<tGfdf-2rg-3@gated-at.bofh.it>
In reply to#1640325
Hi Greg,

On Fri, May 12, 2017 at 10:57 AM, Greg Kroah-Hartman
<gregkh@linuxfoundation.org> wrote:
> On Sun, May 07, 2017 at 09:53:29PM +0200, Geert Uytterhoeven wrote:
>> Closing braces should match the first characters of the opening.
>>
>> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
>> ---
>>  drivers/staging/ccree/ssi_hash.c | 28 ++++++++++++++--------------
>>  1 file changed, 14 insertions(+), 14 deletions(-)
>
> Doesn't apply to my tree at all :(

Not anymore, as Linus applied an alternative from Andrew for my 2/2.
Hence see v2.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web