public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Randy Dunlap <randy.dunlap@oracle.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>, gregkh@suse.de
Cc: linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
	devel@driverdev.osuosl.org
Subject: [PATCH -next] staging: fix arlan build-braces
Date: Thu, 6 May 2010 16:43:03 -0700	[thread overview]
Message-ID: <20100506164303.510040dd.randy.dunlap@oracle.com> (raw)
In-Reply-To: <20100506151502.f97afe54.sfr@canb.auug.org.au>

From: Randy Dunlap <randy.dunlap@oracle.com>

The braces on the writeControlRegister() macro are not sufficient
(at least for one version of gcc):

drivers/staging/arlan/arlan-main.c:230: error: 'else' without a previous 'if'
drivers/staging/arlan/arlan-main.c:236: error: 'else' without a previous 'if'
drivers/staging/arlan/arlan-main.c:242: error: 'else' without a previous 'if'
drivers/staging/arlan/arlan-main.c:250: error: 'else' without a previous 'if'
drivers/staging/arlan/arlan-main.c:298: error: 'else' without a previous 'if'
drivers/staging/arlan/arlan-main.c:324: error: 'else' without a previous 'if'
drivers/staging/arlan/arlan-main.c:348: error: 'else' without a previous 'if'
drivers/staging/arlan/arlan-main.c:362: error: 'else' without a previous 'if'
drivers/staging/arlan/arlan-main.c:367: error: 'else' without a previous 'if'
drivers/staging/arlan/arlan-main.c:372: error: 'else' without a previous 'if'

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
 drivers/staging/arlan/arlan.h |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- linux-next-20100506.orig/drivers/staging/arlan/arlan.h
+++ linux-next-20100506/drivers/staging/arlan/arlan.h
@@ -461,10 +461,11 @@ struct arlan_private {
    int cr;   \
    \
    cr = readControlRegister(dev);\
-   if (cr & ARLAN_CHANNEL_ATTENTION) \
+   if (cr & ARLAN_CHANNEL_ATTENTION) { \
       writeControlRegister(dev, (cr & ~ARLAN_CHANNEL_ATTENTION));\
-   else \
+   } else { \
       writeControlRegister(dev, (cr | ARLAN_CHANNEL_ATTENTION));\
+   } \
 }
 
 #define clearChannelAttention(dev) { \

  parent reply	other threads:[~2010-05-06 23:45 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-05-06  5:15 linux-next: Tree for May 6 Stephen Rothwell
2010-05-06 15:05 ` linux-next: Tree for May 6 (acpi: PM=n) Randy Dunlap
2010-05-06 20:26   ` [linux-pm] " Len Brown
2010-05-06 20:32     ` Randy Dunlap
2010-05-06 23:27       ` James Morris
2010-05-06 23:38         ` Randy Dunlap
2010-05-06 15:07 ` linux-next: Tree for May 6 (acpi: PCI=n) Randy Dunlap
2010-05-06 20:29   ` Len Brown
2010-05-06 20:42     ` Randy Dunlap
2010-05-06 18:18 ` linux-next: Tree for May 6 (nouveau) Randy Dunlap
2010-05-06 20:37   ` Len Brown
2010-05-06 23:41 ` [PATCH -next] IR: add header file to fix build Randy Dunlap
2010-05-06 23:43 ` Randy Dunlap [this message]
2010-05-11 21:13   ` [PATCH -next] staging: fix arlan build-braces Greg KH
2010-05-06 23:44 ` [PATCH -next] staging: fix cxt1e1 semaphore build breakage Randy Dunlap
2010-05-06 23:45 ` [PATCH -next] staging: fix ti-st, depends on RFKILL Randy Dunlap
2010-05-06 23:46 ` [PATCH -next] usb: fix u132-hcd code/data warning Randy Dunlap
2010-05-11 23:43   ` patch usb-fix-u132-hcd-code-data-warning.patch added to gregkh-2.6 tree gregkh

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20100506164303.510040dd.randy.dunlap@oracle.com \
    --to=randy.dunlap@oracle.com \
    --cc=devel@driverdev.osuosl.org \
    --cc=gregkh@suse.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox