From e8b754ee8f71835281bdcea91d0ab37718abadb6 Mon Sep 17 00:00:00 2001 From: Tomas Winkler Date: Wed, 19 Jan 2011 00:24:10 +0200 Subject: [PATCH] staging: easycap: replace STRINGIZE with __stringify() Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman --- drivers/staging/easycap/easycap.h | 2 -- drivers/staging/easycap/easycap_settings.c | 12 ++++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/staging/easycap/easycap.h b/drivers/staging/easycap/easycap.h index d8e4bb817..337c9bd 100644 --- a/drivers/staging/easycap/easycap.h +++ b/drivers/staging/easycap/easycap.h @@ -109,8 +109,6 @@ #error "PAGE_SIZE not defined" #endif -#define STRINGIZE_AGAIN(x) #x -#define STRINGIZE(x) STRINGIZE_AGAIN(x) /*---------------------------------------------------------------------------*/ /* VENDOR, PRODUCT: Syntek Semiconductor Co., Ltd * diff --git a/drivers/staging/easycap/easycap_settings.c b/drivers/staging/easycap/easycap_settings.c index 7b2dd6e..3a81cc2 100644 --- a/drivers/staging/easycap/easycap_settings.c +++ b/drivers/staging/easycap/easycap_settings.c @@ -506,39 +506,39 @@ for (i = 0, n = 0; i < STANDARD_MANY; i++) { mask3 = 0x0000; switch (k) { case FMT_UYVY: { - strcpy(&name3[0], "_" STRINGIZE(FMT_UYVY)); + strcpy(&name3[0], "_" __stringify(FMT_UYVY)); pixelformat = V4L2_PIX_FMT_UYVY; mask3 |= (0x02 << 5); break; } case FMT_YUY2: { - strcpy(&name3[0], "_" STRINGIZE(FMT_YUY2)); + strcpy(&name3[0], "_" __stringify(FMT_YUY2)); pixelformat = V4L2_PIX_FMT_YUYV; mask3 |= (0x02 << 5); mask3 |= 0x0100; break; } case FMT_RGB24: { - strcpy(&name3[0], "_" STRINGIZE(FMT_RGB24)); + strcpy(&name3[0], "_" __stringify(FMT_RGB24)); pixelformat = V4L2_PIX_FMT_RGB24; mask3 |= (0x03 << 5); break; } case FMT_RGB32: { - strcpy(&name3[0], "_" STRINGIZE(FMT_RGB32)); + strcpy(&name3[0], "_" __stringify(FMT_RGB32)); pixelformat = V4L2_PIX_FMT_RGB32; mask3 |= (0x04 << 5); break; } case FMT_BGR24: { - strcpy(&name3[0], "_" STRINGIZE(FMT_BGR24)); + strcpy(&name3[0], "_" __stringify(FMT_BGR24)); pixelformat = V4L2_PIX_FMT_BGR24; mask3 |= (0x03 << 5); mask3 |= 0x0100; break; } case FMT_BGR32: { - strcpy(&name3[0], "_" STRINGIZE(FMT_BGR32)); + strcpy(&name3[0], "_" __stringify(FMT_BGR32)); pixelformat = V4L2_PIX_FMT_BGR32; mask3 |= (0x04 << 5); mask3 |= 0x0100; -- 2.7.4