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>
This commit is contained in:
parent
709107fcd3
commit
1a4e2351e7
|
@ -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);
|
spin_lock_irqsave(&info->card->card_lock, flags);
|
||||||
while (1) {
|
while (1) {
|
||||||
c = min(count, min((int)(SERIAL_XMIT_SIZE - info->xmit_cnt - 1),
|
c = min(count, (int)(SERIAL_XMIT_SIZE - info->xmit_cnt - 1));
|
||||||
(int)(SERIAL_XMIT_SIZE - info->xmit_head)));
|
c = min(c, (int)(SERIAL_XMIT_SIZE - info->xmit_head));
|
||||||
|
|
||||||
if (c <= 0)
|
if (c <= 0)
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in a new issue