diff options
| author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-04-30 00:53:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-30 08:29:44 -0700 |
| commit | 1a4e2351e7fcf2d10bb5524b0ace7797ffad4d98 (patch) | |
| tree | 7c5d9bed6f4252900a42779c13a5d5dd3c625310 | |
| parent | 709107fcd3c4ad82ff7c8137c27aa951d671706f (diff) | |
| download | linux-3.10-1a4e2351e7fcf2d10bb5524b0ace7797ffad4d98.tar.gz linux-3.10-1a4e2351e7fcf2d10bb5524b0ace7797ffad4d98.tar.bz2 linux-3.10-1a4e2351e7fcf2d10bb5524b0ace7797ffad4d98.zip | |
cyclades.c: fix sparse shadowed variable warnings
Nested min() macros.
drivers/char/cyclades.c:2750:7: warning: symbol '_x' shadows an earlier one
drivers/char/cyclades.c:2750:7: originally declared here
drivers/char/cyclades.c:2750:7: warning: symbol '_x' shadows an earlier one
drivers/char/cyclades.c:2750:7: originally declared here
drivers/char/cyclades.c:2750:7: warning: symbol '_y' shadows an earlier one
drivers/char/cyclades.c:2750:7: originally declared here
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | drivers/char/cyclades.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c index 23312f24454..028db1b8fc4 100644 --- a/drivers/char/cyclades.c +++ b/drivers/char/cyclades.c @@ -2747,8 +2747,8 @@ static int cy_write(struct tty_struct *tty, const unsigned char *buf, int count) spin_lock_irqsave(&info->card->card_lock, flags); while (1) { - c = min(count, min((int)(SERIAL_XMIT_SIZE - info->xmit_cnt - 1), - (int)(SERIAL_XMIT_SIZE - info->xmit_head))); + c = min(count, (int)(SERIAL_XMIT_SIZE - info->xmit_cnt - 1)); + c = min(c, (int)(SERIAL_XMIT_SIZE - info->xmit_head)); if (c <= 0) break; |