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

Commit cb63c2aa authored by Thiago Farina's avatar Thiago Farina Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (13594): cpia2: use __stringify macro. 



Replace MAKE_STRING to __stringify macro

Signed-off-by: default avatarThiago Farina <tfransosi@gmail.com>
Signed-off-by: default avatarDouglas Schilling Landgraf <dougsland@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 4315c414

drivers/media/video/cpia2/cpia2_v4l.c

+11 −16
Original line number Diff line number Diff line
@@ -38,17 +38,12 @@ 
#include <linux/slab.h>

#include <linux/init.h>

#include <linux/videodev.h>

#include <linux/stringify.h>

#include <media/v4l2-ioctl.h>



#include "cpia2.h"

#include "cpia2dev.h"





//#define _CPIA2_DEBUG_



#define MAKE_STRING_1(x)	#x

#define MAKE_STRING(x)	MAKE_STRING_1(x)



static int video_nr = -1;

module_param(video_nr, int, 0);

MODULE_PARM_DESC(video_nr,"video device to register (0=/dev/video0, etc)");
@@ -60,26 +55,26 @@ MODULE_PARM_DESC(buffer_size, "Size for each frame buffer in bytes (default 68k) 
static int num_buffers = 3;

module_param(num_buffers, int, 0);

MODULE_PARM_DESC(num_buffers, "Number of frame buffers (1-"

		 MAKE_STRING(VIDEO_MAX_FRAME) ", default 3)");

		 __stringify(VIDEO_MAX_FRAME) ", default 3)");



static int alternate = DEFAULT_ALT;

module_param(alternate, int, 0);

MODULE_PARM_DESC(alternate, "USB Alternate (" MAKE_STRING(USBIF_ISO_1) "-"

		 MAKE_STRING(USBIF_ISO_6) ", default "

		 MAKE_STRING(DEFAULT_ALT) ")");

MODULE_PARM_DESC(alternate, "USB Alternate (" __stringify(USBIF_ISO_1) "-"

		 __stringify(USBIF_ISO_6) ", default "

		 __stringify(DEFAULT_ALT) ")");



static int flicker_freq = 60;

module_param(flicker_freq, int, 0);

MODULE_PARM_DESC(flicker_freq, "Flicker frequency (" MAKE_STRING(50) "or"

		 MAKE_STRING(60) ", default "

		 MAKE_STRING(60) ")");

MODULE_PARM_DESC(flicker_freq, "Flicker frequency (" __stringify(50) "or"

		 __stringify(60) ", default "

		 __stringify(60) ")");



static int flicker_mode = NEVER_FLICKER;

module_param(flicker_mode, int, 0);

MODULE_PARM_DESC(flicker_mode,

		 "Flicker supression (" MAKE_STRING(NEVER_FLICKER) "or"

		 MAKE_STRING(ANTI_FLICKER_ON) ", default "

		 MAKE_STRING(NEVER_FLICKER) ")");

		 "Flicker supression (" __stringify(NEVER_FLICKER) "or"

		 __stringify(ANTI_FLICKER_ON) ", default "

		 __stringify(NEVER_FLICKER) ")");



MODULE_AUTHOR("Steve Miller (STMicroelectronics) <steve.miller@st.com>");

MODULE_DESCRIPTION("V4L-driver for STMicroelectronics CPiA2 based cameras");