Name: Remove __MODULE_STRING and replace with __stringify Status: Trivial Signed-off-by: Rusty Russell There used to be a __MODULE_STRING macro (mainly for MODULE_PARM). These days we have __stringify() which should be used. Index: linux-2.6.10-bk14-Module/drivers/char/watchdog/sbc60xxwdt.c =================================================================== --- linux-2.6.10-bk14-Module.orig/drivers/char/watchdog/sbc60xxwdt.c 2004-09-28 16:22:05.000000000 +1000 +++ linux-2.6.10-bk14-Module/drivers/char/watchdog/sbc60xxwdt.c 2005-01-12 13:28:27.244652560 +1100 @@ -96,7 +96,7 @@ #define WATCHDOG_TIMEOUT 30 /* 30 sec default timeout */ static int timeout = WATCHDOG_TIMEOUT; /* in seconds, will be multiplied by HZ to get seconds to wait for a ping */ module_param(timeout, int, 0); -MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. (1<=timeout<=3600, default=" __MODULE_STRING(WATCHDOG_TIMEOUT) ")"); +MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. (1<=timeout<=3600, default=" __stringify(WATCHDOG_TIMEOUT) ")"); #ifdef CONFIG_WATCHDOG_NOWAYOUT static int nowayout = 1; Index: linux-2.6.10-bk14-Module/drivers/char/watchdog/softdog.c =================================================================== --- linux-2.6.10-bk14-Module.orig/drivers/char/watchdog/softdog.c 2004-09-28 16:22:05.000000000 +1000 +++ linux-2.6.10-bk14-Module/drivers/char/watchdog/softdog.c 2005-01-12 13:28:27.241653016 +1100 @@ -54,7 +54,7 @@ #define TIMER_MARGIN 60 /* Default is 60 seconds */ static int soft_margin = TIMER_MARGIN; /* in seconds */ module_param(soft_margin, int, 0); -MODULE_PARM_DESC(soft_margin, "Watchdog soft_margin in seconds. (0 Specify V4L2 minor mode number." "\n -1 = use next available (default)" "\n n = use minor number n (integer >= 0)" - "\nYou can specify up to "__MODULE_STRING(SN9C102_MAX_DEVICES) + "\nYou can specify up to "__stringify(SN9C102_MAX_DEVICES) " cameras this way." "\nFor example:" "\nvideo_nr=-1,2,-1 would assign minor number 2 to" @@ -76,7 +76,7 @@ "\n3 = more verbose messages" "\nLevel 3 is useful for testing only, when only " "one device is used." - "\nDefault value is "__MODULE_STRING(SN9C102_DEBUG_LEVEL)"." + "\nDefault value is "__stringify(SN9C102_DEBUG_LEVEL)"." "\n"); #endif Index: linux-2.6.10-bk14-Module/drivers/char/watchdog/alim1535_wdt.c =================================================================== --- linux-2.6.10-bk14-Module.orig/drivers/char/watchdog/alim1535_wdt.c 2004-09-28 16:22:05.000000000 +1000 +++ linux-2.6.10-bk14-Module/drivers/char/watchdog/alim1535_wdt.c 2005-01-12 13:28:27.489615320 +1100 @@ -36,7 +36,7 @@ /* module parameters */ static int timeout = WATCHDOG_TIMEOUT; module_param(timeout, int, 0); -MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. (0 Automatic 'w9968cf-vpp' module loading." @@ -161,20 +161,20 @@ "\n image manipulation functions to the 'w9968cf' module,like" "\nsoftware up-scaling,colour conversions and video decoding" "\nfor very high frame rates." - "\nDefault value is "__MODULE_STRING(W9968CF_VPPMOD_LOAD)"." + "\nDefault value is "__stringify(W9968CF_VPPMOD_LOAD)"." "\n"); #endif MODULE_PARM_DESC(simcams, "\n Number of cameras allowed to stream simultaneously." "\nn may vary from 0 to " - __MODULE_STRING(W9968CF_MAX_DEVICES)"." - "\nDefault value is "__MODULE_STRING(W9968CF_SIMCAMS)"." + __stringify(W9968CF_MAX_DEVICES)"." + "\nDefault value is "__stringify(W9968CF_SIMCAMS)"." "\n"); MODULE_PARM_DESC(video_nr, "\n<-1|n[,...]> Specify V4L minor mode number." "\n -1 = use next available (default)" "\n n = use minor number n (integer >= 0)" - "\nYou can specify up to "__MODULE_STRING(W9968CF_MAX_DEVICES) + "\nYou can specify up to "__stringify(W9968CF_MAX_DEVICES) " cameras this way." "\nFor example:" "\nvideo_nr=-1,2,-1 would assign minor number 2 to" @@ -185,14 +185,14 @@ "\n Specify the maximum data payload" "\nsize in bytes for alternate settings, for each device." "\nn is scaled between 63 and 1023 " - "(default is "__MODULE_STRING(W9968CF_PACKET_SIZE)")." + "(default is "__stringify(W9968CF_PACKET_SIZE)")." "\n"); MODULE_PARM_DESC(max_buffers, "\n For advanced users." "\nSpecify the maximum number of video frame buffers" "\nto allocate for each device, from 2 to " - __MODULE_STRING(W9968CF_MAX_BUFFERS) - ". (default is "__MODULE_STRING(W9968CF_BUFFERS)")." + __stringify(W9968CF_MAX_BUFFERS) + ". (default is "__stringify(W9968CF_BUFFERS)")." "\n"); MODULE_PARM_DESC(double_buffer, "\n<0|1[,...]> " @@ -200,19 +200,19 @@ "\nIt should be enabled if you want smooth video output: if" "\nyou obtain out of sync. video, disable it, or try to" "\ndecrease the 'clockdiv' module parameter value." - "\nDefault value is "__MODULE_STRING(W9968CF_DOUBLE_BUFFER) + "\nDefault value is "__stringify(W9968CF_DOUBLE_BUFFER) " for every device." "\n"); MODULE_PARM_DESC(clamping, "\n<0|1[,...]> Video data clamping: 0 disabled, 1 enabled." - "\nDefault value is "__MODULE_STRING(W9968CF_CLAMPING) + "\nDefault value is "__stringify(W9968CF_CLAMPING) " for every device." "\n"); MODULE_PARM_DESC(filter_type, "\n<0|1|2[,...]> Video filter type." "\n0 none, 1 (1-2-1) 3-tap filter, " "2 (2-3-6-3-2) 5-tap filter." - "\nDefault value is "__MODULE_STRING(W9968CF_FILTER_TYPE) + "\nDefault value is "__stringify(W9968CF_FILTER_TYPE) " for every device." "\nThe filter is used to reduce noise and aliasing artifacts" "\nproduced by the CCD or CMOS image sensor, and the scaling" @@ -220,7 +220,7 @@ "\n"); MODULE_PARM_DESC(largeview, "\n<0|1[,...]> Large view: 0 disabled, 1 enabled." - "\nDefault value is "__MODULE_STRING(W9968CF_LARGEVIEW) + "\nDefault value is "__stringify(W9968CF_LARGEVIEW) " for every device." "\n"); MODULE_PARM_DESC(upscaling, @@ -228,7 +228,7 @@ "\n0 disabled, 1 enabled." "\nDisable it if you have a slow CPU or you don't have" " enough memory." - "\nDefault value is "__MODULE_STRING(W9968CF_UPSCALING) + "\nDefault value is "__stringify(W9968CF_UPSCALING) " for every device." "\nIf 'w9968cf-vpp' is not present, this parameter is" " set to 0." @@ -244,24 +244,24 @@ " YUV420P/YUV420 " "\nin any resolutions where both width and height are " "a multiple of 16." - "\nDefault value is "__MODULE_STRING(W9968CF_DECOMPRESSION) + "\nDefault value is "__stringify(W9968CF_DECOMPRESSION) " for every device." "\nIf 'w9968cf-vpp' is not present, forcing decompression is " "\nnot allowed; in this case this parameter is set to 2." "\n"); MODULE_PARM_DESC(force_palette, "\n<0" - "|" __MODULE_STRING(VIDEO_PALETTE_UYVY) - "|" __MODULE_STRING(VIDEO_PALETTE_YUV420) - "|" __MODULE_STRING(VIDEO_PALETTE_YUV422P) - "|" __MODULE_STRING(VIDEO_PALETTE_YUV420P) - "|" __MODULE_STRING(VIDEO_PALETTE_YUYV) - "|" __MODULE_STRING(VIDEO_PALETTE_YUV422) - "|" __MODULE_STRING(VIDEO_PALETTE_GREY) - "|" __MODULE_STRING(VIDEO_PALETTE_RGB555) - "|" __MODULE_STRING(VIDEO_PALETTE_RGB565) - "|" __MODULE_STRING(VIDEO_PALETTE_RGB24) - "|" __MODULE_STRING(VIDEO_PALETTE_RGB32) + "|" __stringify(VIDEO_PALETTE_UYVY) + "|" __stringify(VIDEO_PALETTE_YUV420) + "|" __stringify(VIDEO_PALETTE_YUV422P) + "|" __stringify(VIDEO_PALETTE_YUV420P) + "|" __stringify(VIDEO_PALETTE_YUYV) + "|" __stringify(VIDEO_PALETTE_YUV422) + "|" __stringify(VIDEO_PALETTE_GREY) + "|" __stringify(VIDEO_PALETTE_RGB555) + "|" __stringify(VIDEO_PALETTE_RGB565) + "|" __stringify(VIDEO_PALETTE_RGB24) + "|" __stringify(VIDEO_PALETTE_RGB32) "[,...]>" " Force picture palette." "\nIn order:" @@ -280,7 +280,7 @@ "\nWhen not 0, this parameter will override 'decompression'." "\nDefault value is 0 for every device." "\nInitial palette is " - __MODULE_STRING(W9968CF_PALETTE_DECOMP_ON)"." + __stringify(W9968CF_PALETTE_DECOMP_ON)"." "\nIf 'w9968cf-vpp' is not present, this parameter is" " set to 9 (UYVY)." "\n"); @@ -289,26 +289,26 @@ "\n 1 = use RGB component ordering." "\n 0 = use BGR component ordering." "\nThis parameter has effect when using RGBX palettes only." - "\nDefault value is "__MODULE_STRING(W9968CF_FORCE_RGB) + "\nDefault value is "__stringify(W9968CF_FORCE_RGB) " for every device." "\n"); MODULE_PARM_DESC(autobright, "\n<0|1[,...]> Image sensor automatically changes brightness:" "\n 0 = no, 1 = yes" - "\nDefault value is "__MODULE_STRING(W9968CF_AUTOBRIGHT) + "\nDefault value is "__stringify(W9968CF_AUTOBRIGHT) " for every device." "\n"); MODULE_PARM_DESC(autoexp, "\n<0|1[,...]> Image sensor automatically changes exposure:" "\n 0 = no, 1 = yes" - "\nDefault value is "__MODULE_STRING(W9968CF_AUTOEXP) + "\nDefault value is "__stringify(W9968CF_AUTOEXP) " for every device." "\n"); MODULE_PARM_DESC(lightfreq, "\n<50|60[,...]> Light frequency in Hz:" "\n 50 for European and Asian lighting," " 60 for American lighting." - "\nDefault value is "__MODULE_STRING(W9968CF_LIGHTFREQ) + "\nDefault value is "__stringify(W9968CF_LIGHTFREQ) " for every device." "\n"); MODULE_PARM_DESC(bandingfilter, @@ -318,7 +318,7 @@ "\nThis filter tries to reduce the pattern of horizontal" "\nlight/dark bands caused by some (usually fluorescent)" " lighting." - "\nDefault value is "__MODULE_STRING(W9968CF_BANDINGFILTER) + "\nDefault value is "__stringify(W9968CF_BANDINGFILTER) " for every device." "\n"); MODULE_PARM_DESC(clockdiv, @@ -327,52 +327,52 @@ "\n n may vary from 0 to 127." "\n -1 for automatic value." "\nSee also the 'double_buffer' module parameter." - "\nDefault value is "__MODULE_STRING(W9968CF_CLOCKDIV) + "\nDefault value is "__stringify(W9968CF_CLOCKDIV) " for every device." "\n"); MODULE_PARM_DESC(backlight, "\n<0|1[,...]> Objects are lit from behind:" "\n 0 = no, 1 = yes" - "\nDefault value is "__MODULE_STRING(W9968CF_BACKLIGHT) + "\nDefault value is "__stringify(W9968CF_BACKLIGHT) " for every device." "\n"); MODULE_PARM_DESC(mirror, "\n<0|1[,...]> Reverse image horizontally:" "\n 0 = no, 1 = yes" - "\nDefault value is "__MODULE_STRING(W9968CF_MIRROR) + "\nDefault value is "__stringify(W9968CF_MIRROR) " for every device." "\n"); MODULE_PARM_DESC(monochrome, "\n<0|1[,...]> Use image sensor as monochrome sensor:" "\n 0 = no, 1 = yes" "\nNot all the sensors support monochrome color." - "\nDefault value is "__MODULE_STRING(W9968CF_MONOCHROME) + "\nDefault value is "__stringify(W9968CF_MONOCHROME) " for every device." "\n"); MODULE_PARM_DESC(brightness, "\n Set picture brightness (0-65535)." - "\nDefault value is "__MODULE_STRING(W9968CF_BRIGHTNESS) + "\nDefault value is "__stringify(W9968CF_BRIGHTNESS) " for every device." "\nThis parameter has no effect if 'autobright' is enabled." "\n"); MODULE_PARM_DESC(hue, "\n Set picture hue (0-65535)." - "\nDefault value is "__MODULE_STRING(W9968CF_HUE) + "\nDefault value is "__stringify(W9968CF_HUE) " for every device." "\n"); MODULE_PARM_DESC(colour, "\n Set picture saturation (0-65535)." - "\nDefault value is "__MODULE_STRING(W9968CF_COLOUR) + "\nDefault value is "__stringify(W9968CF_COLOUR) " for every device." "\n"); MODULE_PARM_DESC(contrast, "\n Set picture contrast (0-65535)." - "\nDefault value is "__MODULE_STRING(W9968CF_CONTRAST) + "\nDefault value is "__stringify(W9968CF_CONTRAST) " for every device." "\n"); MODULE_PARM_DESC(whiteness, "\n Set picture whiteness (0-65535)." - "\nDefault value is "__MODULE_STRING(W9968CF_WHITENESS) + "\nDefault value is "__stringify(W9968CF_WHITENESS) " for every device." "\n"); #ifdef W9968CF_DEBUG @@ -387,7 +387,7 @@ "\n6 = function internals" "\nLevel 5 and 6 are useful for testing only, when only " "one device is used." - "\nDefault value is "__MODULE_STRING(W9968CF_DEBUG_LEVEL)"." + "\nDefault value is "__stringify(W9968CF_DEBUG_LEVEL)"." "\n"); MODULE_PARM_DESC(specific_debug, "\n<0|1> Enable or disable specific debugging messages:" @@ -396,7 +396,7 @@ "\n1 = print messages concerning the level" " indicated by 'debug'." "\nDefault value is " - __MODULE_STRING(W9968CF_SPECIFIC_DEBUG)"." + __stringify(W9968CF_SPECIFIC_DEBUG)"." "\n"); #endif /* W9968CF_DEBUG */ Index: linux-2.6.10-bk14-Module/drivers/char/watchdog/pcwd_usb.c =================================================================== --- linux-2.6.10-bk14-Module.orig/drivers/char/watchdog/pcwd_usb.c 2005-01-12 13:08:34.000000000 +1100 +++ linux-2.6.10-bk14-Module/drivers/char/watchdog/pcwd_usb.c 2005-01-12 13:28:27.643591912 +1100 @@ -77,7 +77,7 @@ #define WATCHDOG_HEARTBEAT 2 /* 2 sec default heartbeat */ static int heartbeat = WATCHDOG_HEARTBEAT; module_param(heartbeat, int, 0); -MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. (0