staging: easycap: replace STRINGIZE with __stringify()

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/easycap/easycap.h b/drivers/staging/easycap/easycap.h
index d8e4bb817188bbd51c9bc95673decc2548887b27..337c9bdcfe4df6e385f861d537c0b0663ca8868f 100644 (file)
--- 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 7b2dd6eeb41ff5d42551cf52d5d5ff7e2bffac2f..3a81cc26df03e69fa6ee202e093a0f8dc838fc47 100644 (file)
--- 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;