xillybus: place 'else' on same line as '}'
PATCH 1/1 xillybus: place 'else' on same line as '}'
Place 'else' on same line as closing brace '}' as per Documentation/CodingStyle. Fixes 1 error found by checkpatch.pl.
--- drivers/staging/xillybus/xillybus_core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/staging/xillybus/xillybus_core.c +1 -2
@@ -546,8 +546,7 @@ static int xilly_setupchannels(struct xilly_endpoint *ep, channel->rd_buffers = buffers; rc =xilly_get_dma_buffers (ep, &rd_alloc, buffers, bufnum, bytebufsize); - } -else if (channelnum >0 ) { + }else if (channelnum >0 ) { channel->num_wr_buffers = bufnum; channel->seekable = seekable;
Signature · 1 line
2.0.1
Hi,
Thanks for this.
And since I looked at the part in Codingstyle that deals with if-else, I found another few mistakes regarding braces around a single statement. The rules say, it turns out, that if one of the clauses in an if-else is longer than one statement, both clauses should be wrapped with braces. This rule is broken in lines 162, 536 and 613 of the same file.
To avoid possible conflicts, I'll wait for this patch to be applied, and submit my corrections after that.
Regards,
Eli
Quoted 23 lines · Jeremiah Mahler
Place 'else' on same line as closing brace '}' as per
Documentation/CodingStyle. Fixes 1 error found by checkpatch.pl.Signed-off-by Jeremiah Mahler<[email protected]>--- drivers/staging/xillybus/xillybus_core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)drivers/staging/xillybus/xillybus_core.c +1
-2@@ -546,8 +546,7 @@ static int xilly_setupchannels(struct xilly_endpoint *ep, channel->rd_buffers = buffers; rc =xilly_get_dma_buffers (ep,&rd_alloc, buffers, bufnum, bytebufsize); - } -else if (channelnum>0 ) { + }else if (channelnum>0 ) { channel->num_wr_buffers = bufnum; channel->seekable = seekable;
Quoted 11 lines · Eli Billauer
Hi,
Thanks for this.
And since I looked at the part in Codingstyle that deals with if-else, I found another few mistakes regarding braces around a single statement. The rules say, it turns out, that if one of the clauses in an if-else is longer than one statement, both clauses should be wrapped with braces. This rule is broken in lines 162, 536 and 613 of the same file.
Quoted 2 lines
To avoid possible conflicts, I'll wait for this patch to be applied, and submit my corrections after that.
In theory there shouldn't be any need to wait because the rules about which patches go in first are very clear and predictable. First come first serve. Unless a patch is rejected. And they are only rejected if they violate some rule, but normally ok patches go in.
This patch is almost totally ok except it doesn't have "staging" in the subject. I'm not sure if that's enough to reject it... Probably it's ok and you should assume it will be merged.
The other reason that you don't need to wait is that this patch won't conflict with the other patch you are proposing.
regards,
dan carpenter
Dan,
Quoted 2 lines · Dan Carpenter
On Mon, Jul 14, 2014 at 09:40:39AM +0300, Eli Billauer wrote:
...
Quoted 5 lines
This patch is almost totally ok except it doesn't have "staging" in the subject. I'm not sure if that's enough to reject it... Probably it's ok and you should assume it will be merged.
I missed that. A subject line like this would have been better.
staging: xillybus: place 'else' on same line as '}'
Quoted 1 line
...
Quoted 4 lines
regards,
dan carpenter
Thanks,
Signature · 3 lines
Jeremiah Mahler [email protected] http://github.com/jmahler
Eli,
Quoted 10 lines · Eli Billauer
Hi,
Thanks for this.
And since I looked at the part in Codingstyle that deals with if-else, I found another few mistakes regarding braces around a single statement. The rules say, it turns out, that if one of the clauses in an if-else is longer than one statement, both clauses should be wrapped with braces. This rule is broken in lines 162, 536 and 613 of the same file.
I just looked through CodingStyle, and you are right. If braces are used on one branch they should be used on all branches.
Interestingly, checkpatch.pl doesn't warn about these.
Quoted 1 line
...
Cheers,
Signature · 3 lines
Jeremiah Mahler [email protected] http://github.com/jmahler
Greg Kroah-Hartman
maintainerQuoted 7 lines · Jeremiah Mahler
Place 'else' on same line as closing brace '}' as per
Documentation/CodingStyle. Fixes 1 error found by checkpatch.pl.Signed-off-by Jeremiah Mahler <[email protected]>--- drivers/staging/xillybus/xillybus_core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
Sorry, someone else sent this patch, which I applied already. They did so after you, but I missed this one as you didn't have the 'staging' line on the Subject, my fault.
Sorry about that.
greg k-h