From f8cc1e9373c253902a219ec805977d3b4f16a86c Mon Sep 17 00:00:00 2001 From: Tomas Winkler Date: Thu, 3 Feb 2011 13:42:48 +0200 Subject: staging/easycap: don't shadow rc variable from macros rc is used extensively in code as return code variable so it is better not shadowing it in macros Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman --- drivers/staging/easycap/easycap.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'drivers/staging/easycap') diff --git a/drivers/staging/easycap/easycap.h b/drivers/staging/easycap/easycap.h index b282b0b06986..df0440d5d48f 100644 --- a/drivers/staging/easycap/easycap.h +++ b/drivers/staging/easycap/easycap.h @@ -596,19 +596,19 @@ struct signed_div_result { */ /*---------------------------------------------------------------------------*/ #define GET(X, Y, Z) do { \ - int rc; \ + int __rc; \ *(Z) = (u16)0; \ - rc = regget(X, Y, Z); \ - if (0 > rc) { \ - JOT(8, ":-(%i\n", __LINE__); return(rc); \ + __rc = regget(X, Y, Z); \ + if (0 > __rc) { \ + JOT(8, ":-(%i\n", __LINE__); return __rc; \ } \ } while (0) #define SET(X, Y, Z) do { \ - int rc; \ - rc = regset(X, Y, Z); \ - if (0 > rc) { \ - JOT(8, ":-(%i\n", __LINE__); return(rc); \ + int __rc; \ + __rc = regset(X, Y, Z); \ + if (0 > __rc) { \ + JOT(8, ":-(%i\n", __LINE__); return __rc; \ } \ } while (0) /*---------------------------------------------------------------------------*/ -- cgit v1.2.3