linux-next: build warning after merge of the tty.current tree

linux-next: build warning after merge of the tty.current tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 458 bytes --]

Hi Greg,

After merging the tty.current tree, today's linux-next build (x86_64
allmodconfig) produced this warning:

drivers/tty/mxser.c: In function 'mxser_ioctl':
drivers/tty/mxser.c:1680:3: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
   int p;
   ^

Introduced by commit dfc7b837c7f9 ("tty: mxser: fix usage of
opmode_ioaddr").

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

[PATCH] tty: mxser: Fix build warning introduced by dfc7b837c7f9 (Re: linux-next: build warning after merge of the tty.current tree)

[Matwey V. Kornilov]

From: Matwey V. Kornilov <matwey@sai.msu.ru>

Fix build warning at mxser.c introduced by dfc7b837c7f9

Signed-off-by: Matwey V. Kornilov <matwey@sai.msu.ru>
---

diff --git a/drivers/tty/mxser.c b/drivers/tty/mxser.c
index f97b196..4c4a236 100644
--- a/drivers/tty/mxser.c
+++ b/drivers/tty/mxser.c
@@ -1674,15 +1674,15 @@ static int mxser_ioctl(struct tty_struct *tty,
  		return mxser_ioctl_special(cmd, argp);

  	if (cmd == MOXA_SET_OP_MODE || cmd == MOXA_GET_OP_MODE) {
-		if (info->board->chip_flag != MOXA_MUST_MU860_HWID)
-			return -EFAULT;
-
  		int p;
  		unsigned long opmode;
  		static unsigned char ModeMask[] = { 0xfc, 0xf3, 0xcf, 0x3f };
  		int shiftbit;
  		unsigned char val, mask;

+		if (info->board->chip_flag != MOXA_MUST_MU860_HWID)
+			return -EFAULT;
+
  		p = tty->index % 4;
  		if (cmd == MOXA_SET_OP_MODE) {
  			if (get_user(opmode, (int __user *) argp))

Re: [PATCH] tty: mxser: Fix build warning introduced by dfc7b837c7f9 (Re: linux-next: build warning after merge of the tty.current tree)

[Greg KH]

On Wed, May 22, 2013 at 11:13:38AM +0400, Matwey V. Kornilov wrote:
> From: Matwey V. Kornilov <matwey@sai.msu.ru>
> 
> Fix build warning at mxser.c introduced by dfc7b837c7f9
> 
> Signed-off-by: Matwey V. Kornilov <matwey@sai.msu.ru>
> ---

You forgot to add "reported-by:" :(

I'll go do it by hand...

thanks,

greg k-h