Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8b754ee authored by Tomas Winkler's avatar Tomas Winkler Committed by Greg Kroah-Hartman
Browse files

staging: easycap: replace STRINGIZE with __stringify() 



Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 5a858078

drivers/staging/easycap/easycap.h

+0 −2
Original line number Diff line number Diff line
@@ -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

 *

drivers/staging/easycap/easycap_settings.c

+6 −6
Original line number Diff line number Diff line
@@ -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;