AI Trajectory

Trajectory: (Expand/Collapse All)
Seq	Timestamp	Type	Name	Duration
0/0	2026/09/24 21:39	flow	patch-triage	0m Args: null Results: { "EnableConfigs": null, "FocusSymbols": [], "KMSANReasoning": "", "NeedsKMSAN": false, "Reasoning": "The patch removes the obsolete macro alias __MODULE_STRING (defined as __stringify) from include/linux/module.h and replaces its occurrences with __stringify across various drivers. All modified lines are in MODULE_PARM_DESC metadata and error message strings, producing identical preprocessed code and zero changes to executable logic. Therefore, this patch does not warrant fuzzing.", "WorthFuzzing": false }
1/1	2026/09/24 21:39	action	read-patch-diff	0m Args: null Results: { "PatchDiff": "commit ca3d3efac47dcf7b3d0ace58513ba6fb59ce1800\nAuthor: syz-cluster \u003ctriage@syzkaller.com\u003e\nDate: Thu Sep 24 21:39:07 2026 +0000\n\n syz-cluster: applied patch under review\n\ndiff --git a/drivers/comedi/comedi_fops.c b/drivers/comedi/comedi_fops.c\nindex c09bbe04be6c1..05d14839c5a6a 100644\n--- a/drivers/comedi/comedi_fops.c\n+++ b/drivers/comedi/comedi_fops.c\n@@ -29,6 +29,7 @@\n #include \u003clinux/io.h\u003e\n #include \u003clinux/uaccess.h\u003e\n #include \u003clinux/compat.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #include \"comedi_internal.h\"\n \n@@ -82,14 +83,14 @@ unsigned int comedi_default_buf_size_kb = CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB;\n module_param(comedi_default_buf_size_kb, uint, 0644);\n MODULE_PARM_DESC(comedi_default_buf_size_kb,\n \t\t \"default asynchronous buffer size in KiB (default \"\n-\t\t __MODULE_STRING(CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB) \")\");\n+\t\t __stringify(CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB) \")\");\n \n unsigned int comedi_default_buf_maxsize_kb =\n \tCONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB;\n module_param(comedi_default_buf_maxsize_kb, uint, 0644);\n MODULE_PARM_DESC(comedi_default_buf_maxsize_kb,\n \t\t \"default maximum size of asynchronous buffer in KiB (default \"\n-\t\t __MODULE_STRING(CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB) \")\");\n+\t\t __stringify(CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB) \")\");\n \n static DEFINE_MUTEX(comedi_board_minor_table_lock);\n static struct comedi_device\ndiff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c\nindex d4664ed468b26..36009bb02c257 100644\n--- a/drivers/gpu/drm/drm_fb_helper.c\n+++ b/drivers/gpu/drm/drm_fb_helper.c\n@@ -31,6 +31,7 @@\n \n #include \u003clinux/console.h\u003e\n #include \u003clinux/export.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #include \u003cdrm/drm_atomic.h\u003e\n #include \u003cdrm/drm_drv.h\u003e\n@@ -54,7 +55,7 @@ static int drm_fbdev_overalloc = CONFIG_DRM_FBDEV_OVERALLOC;\n module_param(drm_fbdev_overalloc, int, 0444);\n MODULE_PARM_DESC(drm_fbdev_overalloc,\n \t\t \"Overallocation of the fbdev buffer (%) [default=\"\n-\t\t __MODULE_STRING(CONFIG_DRM_FBDEV_OVERALLOC) \"]\");\n+\t\t __stringify(CONFIG_DRM_FBDEV_OVERALLOC) \"]\");\n \n /\n In order to keep user-space compatibility, we want in certain use-cases\ndiff --git a/drivers/hwmon/fschmd.c b/drivers/hwmon/fschmd.c\nindex 019fc32bf3181..df9418a86c835 100644\n--- a/drivers/hwmon/fschmd.c\n+++ b/drivers/hwmon/fschmd.c\n@@ -35,6 +35,7 @@\n #include \u003clinux/miscdevice.h\u003e\n #include \u003clinux/uaccess.h\u003e\n #include \u003clinux/kref.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n /* Addresses to scan /\n static const unsigned short normal_i2c[] = { 0x73, I2C_CLIENT_END };\n@@ -43,7 +44,7 @@ static const unsigned short normal_i2c[] = { 0x73, I2C_CLIENT_END };\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n enum chips { fscpos, fscher, fscscy, fschrc, fschmd, fschds, fscsyl };\n \ndiff --git a/drivers/hwmon/nct7904.c b/drivers/hwmon/nct7904.c\nindex 976b8a008e448..04e1a8e6db37a 100644\n--- a/drivers/hwmon/nct7904.c\n+++ b/drivers/hwmon/nct7904.c\n@@ -23,6 +23,7 @@\n #include \u003clinux/i2c.h\u003e\n #include \u003clinux/hwmon.h\u003e\n #include \u003clinux/watchdog.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define VENDOR_ID_REG\t\t0x7A\t/ Any bank /\n #define NUVOTON_ID\t\t0x50\n@@ -113,12 +114,12 @@\n static int timeout;\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout, \"Watchdog timeout in minutes. 1 \u003c= timeout \u003c= 255, default=\"\n-\t\t\t__MODULE_STRING(WATCHDOG_TIMEOUT) \".\");\n+\t\t\t__stringify(WATCHDOG_TIMEOUT) \".\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static const unsigned short normal_i2c[] = {\n \t0x2d, 0x2e, I2C_CLIENT_END\ndiff --git a/drivers/hwmon/sch56xx-common.c b/drivers/hwmon/sch56xx-common.c\nindex a385aae3bb0fe..febb8ba7dc2c9 100644\n--- a/drivers/hwmon/sch56xx-common.c\n+++ b/drivers/hwmon/sch56xx-common.c\n@@ -18,13 +18,14 @@\n #include \u003clinux/watchdog.h\u003e\n #include \u003clinux/uaccess.h\u003e\n #include \u003clinux/slab.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \"sch56xx-common.h\"\n \n / Insmod parameters /\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n #define SIO_SCH56XX_LD_EM\t0x0C\t/ Embedded uController Logical Dev /\n #define SIO_UNLOCK_KEY\t\t0x55\t/ Key to enable Super-I/O /\ndiff --git a/drivers/hwmon/w83793.c b/drivers/hwmon/w83793.c\nindex c6ef04c69856e..e1f2708b5db6a 100644\n--- a/drivers/hwmon/w83793.c\n+++ b/drivers/hwmon/w83793.c\n@@ -34,6 +34,7 @@\n #include \u003clinux/notifier.h\u003e\n #include \u003clinux/reboot.h\u003e\n #include \u003clinux/jiffies.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n / Default values /\n #define WATCHDOG_TIMEOUT 2\t/ 2 minute default timeout /\n@@ -57,13 +58,13 @@ static int timeout = WATCHDOG_TIMEOUT;\t/ default timeout in minutes /\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout,\n \t\"Watchdog timeout in minutes. 2\u003c= timeout \u003c=255 (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_TIMEOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_TIMEOUT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n /\n * Address 0x00, 0x0d, 0x0e, 0x0f in all three banks are reserved\ndiff --git a/drivers/i2c/busses/i2c-kempld.c b/drivers/i2c/busses/i2c-kempld.c\nindex 9b4c7cba62b64..d0438960c2726 100644\n--- a/drivers/i2c/busses/i2c-kempld.c\n+++ b/drivers/i2c/busses/i2c-kempld.c\n@@ -13,6 +13,7 @@\n #include \u003clinux/i2c.h\u003e\n #include \u003clinux/delay.h\u003e\n #include \u003clinux/mfd/kempld.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define KEMPLD_I2C_PRELOW\t0x0b\n #define KEMPLD_I2C_PREHIGH\t0x0c\n@@ -66,7 +67,7 @@ struct kempld_i2c_data {\n static unsigned int bus_frequency = KEMPLD_I2C_FREQ_STD;\n module_param(bus_frequency, uint, 0);\n MODULE_PARM_DESC(bus_frequency, \"Set I2C bus frequency in kHz (default=\"\n-\t\t\t\t__MODULE_STRING(KEMPLD_I2C_FREQ_STD)\")\");\n+\t\t\t\t__stringify(KEMPLD_I2C_FREQ_STD)\")\");\n \n static int i2c_bus = -1;\n module_param(i2c_bus, int, 0);\ndiff --git a/drivers/net/ethernet/atheros/atl1e/atl1e_param.c b/drivers/net/ethernet/atheros/atl1e/atl1e_param.c\nindex 6b1d6df8da97c..ff3423a4dc2e5 100644\n--- a/drivers/net/ethernet/atheros/atl1e/atl1e_param.c\n+++ b/drivers/net/ethernet/atheros/atl1e/atl1e_param.c\n@@ -7,6 +7,7 @@\n /\n \n #include \u003clinux/netdevice.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #include \"atl1e.h\"\n \n@@ -181,7 +182,7 @@ void atl1e_check_options(struct atl1e_adapter adapter)\n \t\t\t.type = range_option,\n \t\t\t.name = \"Transmit Ddescription Count\",\n \t\t\t.err = \"using default of \"\n-\t\t\t\t__MODULE_STRING(ATL1E_DEFAULT_TX_DESC_CNT),\n+\t\t\t\t__stringify(ATL1E_DEFAULT_TX_DESC_CNT),\n \t\t\t.def = ATL1E_DEFAULT_TX_DESC_CNT,\n \t\t\t.arg = { .r = { .min = ATL1E_MIN_TX_DESC_CNT,\n \t\t\t\t\t .max = ATL1E_MAX_TX_DESC_CNT} }\n@@ -200,7 +201,7 @@ void atl1e_check_options(struct atl1e_adapter adapter)\n \t\t\t.type = range_option,\n \t\t\t.name = \"Memory size of rx buffer(KB)\",\n \t\t\t.err = \"using default of \"\n-\t\t\t\t__MODULE_STRING(ATL1E_DEFAULT_RX_MEM_SIZE),\n+\t\t\t\t__stringify(ATL1E_DEFAULT_RX_MEM_SIZE),\n \t\t\t.def = ATL1E_DEFAULT_RX_MEM_SIZE,\n \t\t\t.arg = { .r = { .min = ATL1E_MIN_RX_MEM_SIZE,\n \t\t\t\t\t .max = ATL1E_MAX_RX_MEM_SIZE} }\n@@ -220,7 +221,7 @@ void atl1e_check_options(struct atl1e_adapter adapter)\n \t\t\t.type = range_option,\n \t\t\t.name = \"Interrupt Moderate Timer\",\n \t\t\t.err = \"using default of \"\n-\t\t\t\t__MODULE_STRING(INT_MOD_DEFAULT_CNT),\n+\t\t\t\t__stringify(INT_MOD_DEFAULT_CNT),\n \t\t\t.def = INT_MOD_DEFAULT_CNT,\n \t\t\t.arg = { .r = { .min = INT_MOD_MIN_CNT,\n \t\t\t\t\t .max = INT_MOD_MAX_CNT} }\n@@ -239,7 +240,7 @@ void atl1e_check_options(struct atl1e_adapter adapter)\n \t\t\t.type = range_option,\n \t\t\t.name = \"Speed/Duplex Selection\",\n \t\t\t.err = \"using default of \"\n-\t\t\t\t__MODULE_STRING(MEDIA_TYPE_AUTO_SENSOR),\n+\t\t\t\t__stringify(MEDIA_TYPE_AUTO_SENSOR),\n \t\t\t.def = MEDIA_TYPE_AUTO_SENSOR,\n \t\t\t.arg = { .r = { .min = MEDIA_TYPE_AUTO_SENSOR,\n \t\t\t\t\t .max = MEDIA_TYPE_10M_HALF} }\ndiff --git a/drivers/net/ethernet/atheros/atlx/atl1.c b/drivers/net/ethernet/atheros/atlx/atl1.c\nindex 98a4d089270e4..aef5de6287dcf 100644\n--- a/drivers/net/ethernet/atheros/atlx/atl1.c\n+++ b/drivers/net/ethernet/atheros/atlx/atl1.c\n@@ -56,6 +56,7 @@\n #include \u003clinux/slab.h\u003e\n #include \u003clinux/spinlock.h\u003e\n #include \u003clinux/string.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/tcp.h\u003e\n #include \u003clinux/timer.h\u003e\n #include \u003clinux/types.h\u003e\n@@ -198,7 +199,7 @@ static void atl1_check_options(struct atl1_adapter adapter)\n \t\t\t.type = range_option,\n \t\t\t.name = \"Interrupt Moderator Timer\",\n \t\t\t.err = \"using default of \"\n-\t\t\t\t__MODULE_STRING(DEFAULT_INT_MOD_CNT),\n+\t\t\t\t__stringify(DEFAULT_INT_MOD_CNT),\n \t\t\t.def = DEFAULT_INT_MOD_CNT,\n \t\t\t.arg = {.r = {.min = MIN_INT_MOD_CNT,\n \t\t\t\t\t.max = MAX_INT_MOD_CNT} }\ndiff --git a/drivers/net/ethernet/atheros/atlx/atl2.c b/drivers/net/ethernet/atheros/atlx/atl2.c\nindex 5560d5cc31692..853d2e1eb9541 100644\n--- a/drivers/net/ethernet/atheros/atlx/atl2.c\n+++ b/drivers/net/ethernet/atheros/atlx/atl2.c\n@@ -29,6 +29,7 @@\n #include \u003clinux/slab.h\u003e\n #include \u003clinux/spinlock.h\u003e\n #include \u003clinux/string.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/tcp.h\u003e\n #include \u003clinux/timer.h\u003e\n #include \u003clinux/types.h\u003e\n@@ -2921,7 +2922,7 @@ static void atl2_check_options(struct atl2_adapter adapter)\n \t/ Bytes of Transmit Memory /\n \topt.type = range_option;\n \topt.name = \"Bytes of Transmit Memory\";\n-\topt.err = \"using default of \" __MODULE_STRING(ATL2_DEFAULT_TX_MEMSIZE);\n+\topt.err = \"using default of \" __stringify(ATL2_DEFAULT_TX_MEMSIZE);\n \topt.def = ATL2_DEFAULT_TX_MEMSIZE;\n \topt.arg.r.min = ATL2_MIN_TX_MEMSIZE;\n \topt.arg.r.max = ATL2_MAX_TX_MEMSIZE;\n@@ -2939,7 +2940,7 @@ static void atl2_check_options(struct atl2_adapter adapter)\n \t/* Receive Memory Block Count /\n \topt.type = range_option;\n \topt.name = \"Number of receive memory block\";\n-\topt.err = \"using default of \" __MODULE_STRING(ATL2_DEFAULT_RXD_COUNT);\n+\topt.err = \"using default of \" __stringify(ATL2_DEFAULT_RXD_COUNT);\n \topt.def = ATL2_DEFAULT_RXD_COUNT;\n \topt.arg.r.min = ATL2_MIN_RXD_COUNT;\n \topt.arg.r.max = ATL2_MAX_RXD_COUNT;\n@@ -2960,7 +2961,7 @@ static void atl2_check_options(struct atl2_adapter adapter)\n \t/* Interrupt Moderate Timer /\n \topt.type = range_option;\n \topt.name = \"Interrupt Moderate Timer\";\n-\topt.err = \"using default of \" __MODULE_STRING(INT_MOD_DEFAULT_CNT);\n+\topt.err = \"using default of \" __stringify(INT_MOD_DEFAULT_CNT);\n \topt.def = INT_MOD_DEFAULT_CNT;\n \topt.arg.r.min = INT_MOD_MIN_CNT;\n \topt.arg.r.max = INT_MOD_MAX_CNT;\n@@ -2973,7 +2974,7 @@ static void atl2_check_options(struct atl2_adapter adapter)\n \t/* Flash Vendor /\n \topt.type = range_option;\n \topt.name = \"SPI Flash Vendor\";\n-\topt.err = \"using default of \" __MODULE_STRING(FLASH_VENDOR_DEFAULT);\n+\topt.err = \"using default of \" __stringify(FLASH_VENDOR_DEFAULT);\n \topt.def = FLASH_VENDOR_DEFAULT;\n \topt.arg.r.min = FLASH_VENDOR_MIN;\n \topt.arg.r.max = FLASH_VENDOR_MAX;\n@@ -2986,7 +2987,7 @@ static void atl2_check_options(struct atl2_adapter adapter)\n \t/* MediaType /\n \topt.type = range_option;\n \topt.name = \"Speed/Duplex Selection\";\n-\topt.err = \"using default of \" __MODULE_STRING(MEDIA_TYPE_AUTO_SENSOR);\n+\topt.err = \"using default of \" __stringify(MEDIA_TYPE_AUTO_SENSOR);\n \topt.def = MEDIA_TYPE_AUTO_SENSOR;\n \topt.arg.r.min = MEDIA_TYPE_AUTO_SENSOR;\n \topt.arg.r.max = MEDIA_TYPE_10M_HALF;\ndiff --git a/drivers/net/ethernet/intel/e1000/e1000_param.c b/drivers/net/ethernet/intel/e1000/e1000_param.c\nindex f4154ca7fcb41..5faf6d6280c89 100644\n--- a/drivers/net/ethernet/intel/e1000/e1000_param.c\n+++ b/drivers/net/ethernet/intel/e1000/e1000_param.c\n@@ -1,6 +1,7 @@\n // SPDX-License-Identifier: GPL-2.0\n / Copyright(c) 1999 - 2006 Intel Corporation. /\n \n+#include \u003clinux/stringify.h\u003e\n #include \"e1000.h\"\n \n / This is the only thing that needs to be changed to adjust the\n@@ -259,7 +260,7 @@ void e1000_check_options(struct e1000_adapter adapter)\n \t\t\t.type = range_option,\n \t\t\t.name = \"Transmit Descriptors\",\n \t\t\t.err = \"using default of \"\n-\t\t\t\t__MODULE_STRING(E1000_DEFAULT_TXD),\n+\t\t\t\t__stringify(E1000_DEFAULT_TXD),\n \t\t\t.def = E1000_DEFAULT_TXD,\n \t\t\t.arg = { .r = {\n \t\t\t\t.min = E1000_MIN_TXD,\n@@ -287,7 +288,7 @@ void e1000_check_options(struct e1000_adapter adapter)\n \t\t\t.type = range_option,\n \t\t\t.name = \"Receive Descriptors\",\n \t\t\t.err = \"using default of \"\n-\t\t\t\t__MODULE_STRING(E1000_DEFAULT_RXD),\n+\t\t\t\t__stringify(E1000_DEFAULT_RXD),\n \t\t\t.def = E1000_DEFAULT_RXD,\n \t\t\t.arg = { .r = {\n \t\t\t\t.min = E1000_MIN_RXD,\n@@ -354,7 +355,7 @@ void e1000_check_options(struct e1000_adapter adapter)\n \t\topt = (struct e1000_option) {\n \t\t\t.type = range_option,\n \t\t\t.name = \"Transmit Interrupt Delay\",\n-\t\t\t.err = \"using default of \" __MODULE_STRING(DEFAULT_TIDV),\n+\t\t\t.err = \"using default of \" __stringify(DEFAULT_TIDV),\n \t\t\t.def = DEFAULT_TIDV,\n \t\t\t.arg = { .r = { .min = MIN_TXDELAY,\n \t\t\t\t\t .max = MAX_TXDELAY }}\n@@ -372,7 +373,7 @@ void e1000_check_options(struct e1000_adapter adapter)\n \t\topt = (struct e1000_option) {\n \t\t\t.type = range_option,\n \t\t\t.name = \"Transmit Absolute Interrupt Delay\",\n-\t\t\t.err = \"using default of \" __MODULE_STRING(DEFAULT_TADV),\n+\t\t\t.err = \"using default of \" __stringify(DEFAULT_TADV),\n \t\t\t.def = DEFAULT_TADV,\n \t\t\t.arg = { .r = { .min = MIN_TXABSDELAY,\n \t\t\t\t\t .max = MAX_TXABSDELAY }}\n@@ -390,7 +391,7 @@ void e1000_check_options(struct e1000_adapter adapter)\n \t\topt = (struct e1000_option) {\n \t\t\t.type = range_option,\n \t\t\t.name = \"Receive Interrupt Delay\",\n-\t\t\t.err = \"using default of \" __MODULE_STRING(DEFAULT_RDTR),\n+\t\t\t.err = \"using default of \" __stringify(DEFAULT_RDTR),\n \t\t\t.def = DEFAULT_RDTR,\n \t\t\t.arg = { .r = { .min = MIN_RXDELAY,\n \t\t\t\t\t .max = MAX_RXDELAY }}\n@@ -408,7 +409,7 @@ void e1000_check_options(struct e1000_adapter adapter)\n \t\topt = (struct e1000_option) {\n \t\t\t.type = range_option,\n \t\t\t.name = \"Receive Absolute Interrupt Delay\",\n-\t\t\t.err = \"using default of \" __MODULE_STRING(DEFAULT_RADV),\n+\t\t\t.err = \"using default of \" __stringify(DEFAULT_RADV),\n \t\t\t.def = DEFAULT_RADV,\n \t\t\t.arg = { .r = { .min = MIN_RXABSDELAY,\n \t\t\t\t\t .max = MAX_RXABSDELAY }}\n@@ -426,7 +427,7 @@ void e1000_check_options(struct e1000_adapter adapter)\n \t\topt = (struct e1000_option) {\n \t\t\t.type = range_option,\n \t\t\t.name = \"Interrupt Throttling Rate (ints/sec)\",\n-\t\t\t.err = \"using default of \" __MODULE_STRING(DEFAULT_ITR),\n+\t\t\t.err = \"using default of \" __stringify(DEFAULT_ITR),\n \t\t\t.def = DEFAULT_ITR,\n \t\t\t.arg = { .r = { .min = MIN_ITR,\n \t\t\t\t\t .max = MAX_ITR }}\ndiff --git a/drivers/net/ethernet/intel/e1000e/param.c b/drivers/net/ethernet/intel/e1000e/param.c\nindex 3132d8f2f207d..c6f400e6cdea8 100644\n--- a/drivers/net/ethernet/intel/e1000e/param.c\n+++ b/drivers/net/ethernet/intel/e1000e/param.c\n@@ -4,6 +4,7 @@\n #include \u003clinux/netdevice.h\u003e\n #include \u003clinux/module.h\u003e\n #include \u003clinux/pci.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #include \"e1000.h\"\n \n@@ -238,8 +239,7 @@ void e1000e_check_options(struct e1000_adapter adapter)\n \t\tstatic const struct e1000_option opt = {\n \t\t\t.type = range_option,\n \t\t\t.name = \"Transmit Interrupt Delay\",\n-\t\t\t.err = \"using default of \"\n-\t\t\t\t__MODULE_STRING(DEFAULT_TIDV),\n+\t\t\t.err = \"using default of \" __stringify(DEFAULT_TIDV),\n \t\t\t.def = DEFAULT_TIDV,\n \t\t\t.arg = { .r = { .min = MIN_TXDELAY,\n \t\t\t\t\t .max = MAX_TXDELAY } }\n@@ -258,8 +258,7 @@ void e1000e_check_options(struct e1000_adapter adapter)\n \t\tstatic const struct e1000_option opt = {\n \t\t\t.type = range_option,\n \t\t\t.name = \"Transmit Absolute Interrupt Delay\",\n-\t\t\t.err = \"using default of \"\n-\t\t\t\t__MODULE_STRING(DEFAULT_TADV),\n+\t\t\t.err = \"using default of \" __stringify(DEFAULT_TADV),\n \t\t\t.def = DEFAULT_TADV,\n \t\t\t.arg = { .r = { .min = MIN_TXABSDELAY,\n \t\t\t\t\t .max = MAX_TXABSDELAY } }\n@@ -278,8 +277,7 @@ void e1000e_check_options(struct e1000_adapter adapter)\n \t\tstatic struct e1000_option opt = {\n \t\t\t.type = range_option,\n \t\t\t.name = \"Receive Interrupt Delay\",\n-\t\t\t.err = \"using default of \"\n-\t\t\t\t__MODULE_STRING(DEFAULT_RDTR),\n+\t\t\t.err = \"using default of \" __stringify(DEFAULT_RDTR),\n \t\t\t.def = DEFAULT_RDTR,\n \t\t\t.arg = { .r = { .min = MIN_RXDELAY,\n \t\t\t\t\t .max = MAX_RXDELAY } }\n@@ -301,8 +299,7 @@ void e1000e_check_options(struct e1000_adapter adapter)\n \t\tstatic struct e1000_option opt = {\n \t\t\t.type = range_option,\n \t\t\t.name = \"Receive Absolute Interrupt Delay\",\n-\t\t\t.err = \"using default of \"\n-\t\t\t\t__MODULE_STRING(DEFAULT_RADV),\n+\t\t\t.err = \"using default of \" __stringify(DEFAULT_RADV),\n \t\t\t.def = DEFAULT_RADV,\n \t\t\t.arg = { .r = { .min = MIN_RXABSDELAY,\n \t\t\t\t\t .max = MAX_RXABSDELAY } }\n@@ -324,8 +321,7 @@ void e1000e_check_options(struct e1000_adapter adapter)\n \t\tstatic const struct e1000_option opt = {\n \t\t\t.type = range_option,\n \t\t\t.name = \"Interrupt Throttling Rate (ints/sec)\",\n-\t\t\t.err = \"using default of \"\n-\t\t\t\t__MODULE_STRING(DEFAULT_ITR),\n+\t\t\t.err = \"using default of \" __stringify(DEFAULT_ITR),\n \t\t\t.def = DEFAULT_ITR,\n \t\t\t.arg = { .r = { .min = MIN_ITR,\n \t\t\t\t\t .max = MAX_ITR } }\ndiff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c\nindex 81fc5a6e32219..6a1a6678bd1a5 100644\n--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c\n+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c\n@@ -7,7 +7,8 @@\n /\n \n #include \"pch_gbe.h\"\n-#include \u003clinux/module.h\u003e\t/ for __MODULE_STRING /\n+#include \u003clinux/module.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define OPTION_UNSET -1\n #define OPTION_DISABLED 0\n@@ -440,7 +441,7 @@ void pch_gbe_check_options(struct pch_gbe_adapter adapter)\n \t\t\t.type = range_option,\n \t\t\t.name = \"Transmit Descriptors\",\n \t\t\t.err = \"using default of \"\n-\t\t\t\t__MODULE_STRING(PCH_GBE_DEFAULT_TXD),\n+\t\t\t\t__stringify(PCH_GBE_DEFAULT_TXD),\n \t\t\t.def = PCH_GBE_DEFAULT_TXD,\n \t\t\t.arg = { .r = { .min = PCH_GBE_MIN_TXD,\n \t\t\t\t\t .max = PCH_GBE_MAX_TXD } }\n@@ -456,7 +457,7 @@ void pch_gbe_check_options(struct pch_gbe_adapter adapter)\n \t\t\t.type = range_option,\n \t\t\t.name = \"Receive Descriptors\",\n \t\t\t.err = \"using default of \"\n-\t\t\t\t__MODULE_STRING(PCH_GBE_DEFAULT_RXD),\n+\t\t\t\t__stringify(PCH_GBE_DEFAULT_RXD),\n \t\t\t.def = PCH_GBE_DEFAULT_RXD,\n \t\t\t.arg = { .r = { .min = PCH_GBE_MIN_RXD,\n \t\t\t\t\t .max = PCH_GBE_MAX_RXD } }\ndiff --git a/drivers/platform/cznic/turris-omnia-mcu-watchdog.c b/drivers/platform/cznic/turris-omnia-mcu-watchdog.c\nindex 3ad146ec1d809..daabd88eb9133 100644\n--- a/drivers/platform/cznic/turris-omnia-mcu-watchdog.c\n+++ b/drivers/platform/cznic/turris-omnia-mcu-watchdog.c\n@@ -9,6 +9,7 @@\n #include \u003clinux/device.h\u003e\n #include \u003clinux/i2c.h\u003e\n #include \u003clinux/moduleparam.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/types.h\u003e\n #include \u003clinux/units.h\u003e\n #include \u003clinux/watchdog.h\u003e\n@@ -25,7 +26,7 @@ MODULE_PARM_DESC(timeout, \"Watchdog timeout in seconds\");\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static int omnia_wdt_start(struct watchdog_device wdt)\n {\ndiff --git a/drivers/rtc/rtc-ds1374.c b/drivers/rtc/rtc-ds1374.c\nindex 8c247215d6116..2ed6777e7035e 100644\n--- a/drivers/rtc/rtc-ds1374.c\n+++ b/drivers/rtc/rtc-ds1374.c\n@@ -26,6 +26,7 @@\n #include \u003clinux/workqueue.h\u003e\n #include \u003clinux/slab.h\u003e\n #include \u003clinux/pm.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #ifdef CONFIG_RTC_DRV_DS1374_WDT\n #include \u003clinux/fs.h\u003e\n #include \u003clinux/ioctl.h\u003e\n@@ -381,7 +382,7 @@ MODULE_PARM_DESC(wdt_margin, \"Watchdog timeout in seconds (default 32s)\");\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default =\"\n-\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT)\")\");\n+\t\t__stringify(WATCHDOG_NOWAYOUT)\")\");\n \n static const struct watchdog_info ds1374_wdt_info = {\n \t.identity = \"DS1374 Watchdog\",\ndiff --git a/drivers/thunderbolt/tb.c b/drivers/thunderbolt/tb.c\nindex 47753a5c0f2eb..a2459e44e3205 100644\n--- a/drivers/thunderbolt/tb.c\n+++ b/drivers/thunderbolt/tb.c\n@@ -11,6 +11,7 @@\n #include \u003clinux/delay.h\u003e\n #include \u003clinux/pm_runtime.h\u003e\n #include \u003clinux/platform_data/x86/apple.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #include \"tb.h\"\n #include \"tb_regs.h\"\n@@ -47,7 +48,7 @@ static unsigned int asym_threshold = TB_ASYM_THRESHOLD;\n module_param_named(asym_threshold, asym_threshold, uint, 0444);\n MODULE_PARM_DESC(asym_threshold,\n \t\t\"threshold (Mb/s) when to Gen 4 switch link symmetry. 0 disables. (default: \"\n-\t\t__MODULE_STRING(TB_ASYM_THRESHOLD) \")\");\n+\t\t__stringify(TB_ASYM_THRESHOLD) \")\");\n \n /*\n struct tb_cm - Simple Thunderbolt connection manager\ndiff --git a/drivers/thunderbolt/tunnel.c b/drivers/thunderbolt/tunnel.c\nindex 7e8284575dffb..ad4916748789b 100644\n--- a/drivers/thunderbolt/tunnel.c\n+++ b/drivers/thunderbolt/tunnel.c\n@@ -11,6 +11,7 @@\n #include \u003clinux/list.h\u003e\n #include \u003clinux/ktime.h\u003e\n #include \u003clinux/string_helpers.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #include \"tunnel.h\"\n #include \"tb.h\"\n@@ -89,12 +90,12 @@ static int dprx_timeout = TB_DPRX_TIMEOUT;\n module_param(dprx_timeout, int, 0444);\n MODULE_PARM_DESC(dprx_timeout,\n \t\t \"DPRX capability read timeout in ms, -1 waits forever (default: \"\n-\t\t __MODULE_STRING(TB_DPRX_TIMEOUT) \")\");\n+\t\t __stringify(TB_DPRX_TIMEOUT) \")\");\n \n static unsigned int dma_credits = TB_DMA_CREDITS;\n module_param(dma_credits, uint, 0444);\n MODULE_PARM_DESC(dma_credits, \"specify custom credits for DMA tunnels (default: \"\n- __MODULE_STRING(TB_DMA_CREDITS) \")\");\n+\t\t __stringify(TB_DMA_CREDITS) \")\");\n \n static bool bw_alloc_mode = true;\n module_param(bw_alloc_mode, bool, 0444);\ndiff --git a/drivers/tty/serial/8250/8250_platform.c b/drivers/tty/serial/8250/8250_platform.c\nindex af946d12e7648..e060e0427fc9a 100644\n--- a/drivers/tty/serial/8250/8250_platform.c\n+++ b/drivers/tty/serial/8250/8250_platform.c\n@@ -16,6 +16,7 @@\n #include \u003clinux/moduleparam.h\u003e\n #include \u003clinux/once.h\u003e\n #include \u003clinux/platform_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #include \u003clinux/serial_8250.h\u003e\n \n@@ -382,6 +383,6 @@ module_param_hw(share_irqs, bool, other, 0644);\n MODULE_PARM_DESC(share_irqs, \"Share IRQs with other non-8250/16x50 devices (unsafe)\");\n \n module_param(nr_uarts, uint, 0644);\n-MODULE_PARM_DESC(nr_uarts, \"Maximum number of UARTs supported. (1-\" __MODULE_STRING(CONFIG_SERIAL_8250_NR_UARTS) \")\");\n+MODULE_PARM_DESC(nr_uarts, \"Maximum number of UARTs supported. (1-\" __stringify(CONFIG_SERIAL_8250_NR_UARTS) \")\");\n \n MODULE_ALIAS_CHARDEV_MAJOR(TTY_MAJOR);\ndiff --git a/drivers/usb/atm/speedtch.c b/drivers/usb/atm/speedtch.c\nindex 9d28c652bcd80..95cd8ce99a645 100644\n--- a/drivers/usb/atm/speedtch.c\n+++ b/drivers/usb/atm/speedtch.c\n@@ -19,6 +19,7 @@\n #include \u003clinux/moduleparam.h\u003e\n #include \u003clinux/slab.h\u003e\n #include \u003clinux/stat.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/timer.h\u003e\n #include \u003clinux/types.h\u003e\n #include \u003clinux/usb/ch9.h\u003e\n@@ -77,31 +78,31 @@ static unsigned int num_ModemOption;\n module_param(altsetting, uint, S_IRUGO \| S_IWUSR);\n MODULE_PARM_DESC(altsetting,\n \t\t\"Alternative setting for data interface (bulk_default: \"\n-\t\t__MODULE_STRING(DEFAULT_BULK_ALTSETTING) \"; isoc_default: \"\n-\t\t__MODULE_STRING(DEFAULT_ISOC_ALTSETTING) \")\");\n+\t\t__stringify(DEFAULT_BULK_ALTSETTING) \"; isoc_default: \"\n+\t\t__stringify(DEFAULT_ISOC_ALTSETTING) \")\");\n \n module_param(dl_512_first, bool, S_IRUGO \| S_IWUSR);\n MODULE_PARM_DESC(dl_512_first,\n \t\t \"Read 512 bytes before sending firmware (default: \"\n-\t\t __MODULE_STRING(DEFAULT_DL_512_FIRST) \")\");\n+\t\t __stringify(DEFAULT_DL_512_FIRST) \")\");\n \n module_param(enable_isoc, bool, S_IRUGO \| S_IWUSR);\n MODULE_PARM_DESC(enable_isoc,\n \t\t\"Use isochronous transfers if available (default: \"\n-\t\t__MODULE_STRING(DEFAULT_ENABLE_ISOC) \")\");\n+\t\t__stringify(DEFAULT_ENABLE_ISOC) \")\");\n \n module_param(sw_buffering, bool, S_IRUGO \| S_IWUSR);\n MODULE_PARM_DESC(sw_buffering,\n \t\t \"Enable software buffering (default: \"\n-\t\t __MODULE_STRING(DEFAULT_SW_BUFFERING) \")\");\n+\t\t __stringify(DEFAULT_SW_BUFFERING) \")\");\n \n module_param(BMaxDSL, uint, S_IRUGO \| S_IWUSR);\n MODULE_PARM_DESC(BMaxDSL,\n-\t\t\"default: \" __MODULE_STRING(DEFAULT_B_MAX_DSL));\n+\t\t\"default: \" __stringify(DEFAULT_B_MAX_DSL));\n \n module_param(ModemMode, byte, S_IRUGO \| S_IWUSR);\n MODULE_PARM_DESC(ModemMode,\n-\t\t\"default: \" __MODULE_STRING(DEFAULT_MODEM_MODE));\n+\t\t\"default: \" __stringify(DEFAULT_MODEM_MODE));\n \n module_param_array(ModemOption, byte, \u0026num_ModemOption, S_IRUGO);\n MODULE_PARM_DESC(ModemOption, \"default: 0x10,0x00,0x00,0x00,0x20\");\ndiff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c\nindex 7b0c791399eaa..d4052d206e006 100644\n--- a/drivers/usb/atm/usbatm.c\n+++ b/drivers/usb/atm/usbatm.c\n@@ -64,6 +64,7 @@\n #include \u003clinux/signal.h\u003e\n #include \u003clinux/slab.h\u003e\n #include \u003clinux/stat.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/timer.h\u003e\n #include \u003clinux/wait.h\u003e\n #include \u003clinux/kthread.h\u003e\n@@ -103,26 +104,26 @@ static unsigned int snd_buf_bytes = UDSL_DEFAULT_SND_BUF_SIZE;\n module_param(num_rcv_urbs, uint, S_IRUGO);\n MODULE_PARM_DESC(num_rcv_urbs,\n \t\t \"Number of urbs used for reception (range: 0-\"\n-\t\t __MODULE_STRING(UDSL_MAX_RCV_URBS) \", default: \"\n-\t\t __MODULE_STRING(UDSL_DEFAULT_RCV_URBS) \")\");\n+\t\t __stringify(UDSL_MAX_RCV_URBS) \", default: \"\n+\t\t __stringify(UDSL_DEFAULT_RCV_URBS) \")\");\n \n module_param(num_snd_urbs, uint, S_IRUGO);\n MODULE_PARM_DESC(num_snd_urbs,\n \t\t \"Number of urbs used for transmission (range: 0-\"\n-\t\t __MODULE_STRING(UDSL_MAX_SND_URBS) \", default: \"\n-\t\t __MODULE_STRING(UDSL_DEFAULT_SND_URBS) \")\");\n+\t\t __stringify(UDSL_MAX_SND_URBS) \", default: \"\n+\t\t __stringify(UDSL_DEFAULT_SND_URBS) \")\");\n \n module_param(rcv_buf_bytes, uint, S_IRUGO);\n MODULE_PARM_DESC(rcv_buf_bytes,\n \t\t \"Size of the buffers used for reception, in bytes (range: 1-\"\n-\t\t __MODULE_STRING(UDSL_MAX_BUF_SIZE) \", default: \"\n-\t\t __MODULE_STRING(UDSL_DEFAULT_RCV_BUF_SIZE) \")\");\n+\t\t __stringify(UDSL_MAX_BUF_SIZE) \", default: \"\n+\t\t __stringify(UDSL_DEFAULT_RCV_BUF_SIZE) \")\");\n \n module_param(snd_buf_bytes, uint, S_IRUGO);\n MODULE_PARM_DESC(snd_buf_bytes,\n \t\t \"Size of the buffers used for transmission, in bytes (range: 1-\"\n-\t\t __MODULE_STRING(UDSL_MAX_BUF_SIZE) \", default: \"\n-\t\t __MODULE_STRING(UDSL_DEFAULT_SND_BUF_SIZE) \")\");\n+\t\t __stringify(UDSL_MAX_BUF_SIZE) \", default: \"\n+\t\t __stringify(UDSL_DEFAULT_SND_BUF_SIZE) \")\");\n \n \n /* receive /\ndiff --git a/drivers/watchdog/acquirewdt.c b/drivers/watchdog/acquirewdt.c\nindex 052f65c48a703..cb62800e89ed4 100644\n--- a/drivers/watchdog/acquirewdt.c\n+++ b/drivers/watchdog/acquirewdt.c\n@@ -64,6 +64,7 @@\n #include \u003clinux/init.h\u003e\t\t\t/ For __init/__exit/... /\n #include \u003clinux/uaccess.h\u003e\t\t/ For copy_to_user/put_user/... /\n #include \u003clinux/io.h\u003e\t\t\t/ For inb/outb/... /\n+#include \u003clinux/stringify.h\u003e\t\t/ For __stringify /\n \n / Module information /\n #define DRV_NAME \"acquirewdt\"\n@@ -92,7 +93,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\"Watchdog cannot be stopped once started (default=\"\n-\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n /\n \tWatchdog Operations\ndiff --git a/drivers/watchdog/advantech_ec_wdt.c b/drivers/watchdog/advantech_ec_wdt.c\nindex 7c380f90ca583..2470c43032672 100644\n--- a/drivers/watchdog/advantech_ec_wdt.c\n+++ b/drivers/watchdog/advantech_ec_wdt.c\n@@ -14,6 +14,7 @@\n #include \u003clinux/kernel.h\u003e\n #include \u003clinux/module.h\u003e\n #include \u003clinux/moduleparam.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n #define DRIVER_NAME\t\t\"advantech_ec_wdt\"\n@@ -49,7 +50,7 @@ static ktime_t ec_timestamp;\n \n module_param(timeout, uint, 0);\n MODULE_PARM_DESC(timeout,\n-\t\t \"Default Watchdog timer setting (\" __MODULE_STRING(DEFAULT_TIME) \"s). The range is from \" __MODULE_STRING(MIN_TIME) \" to \" __MODULE_STRING(MAX_TIME) \".\");\n+\t\t \"Default Watchdog timer setting (\" __stringify(DEFAULT_TIME) \"s). The range is from \" __stringify(MIN_TIME) \" to \" __stringify(MAX_TIME) \".\");\n \n static void adv_ec_wdt_timing_gate(void)\n {\ndiff --git a/drivers/watchdog/advantechwdt.c b/drivers/watchdog/advantechwdt.c\nindex 42d3f37717810..6d24a6bc8f908 100644\n--- a/drivers/watchdog/advantechwdt.c\n+++ b/drivers/watchdog/advantechwdt.c\n@@ -37,6 +37,7 @@\n #include \u003clinux/init.h\u003e\n #include \u003clinux/io.h\u003e\n #include \u003clinux/uaccess.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n \n #define DRV_NAME \"advantechwdt\"\n@@ -71,13 +72,13 @@ static int timeout = WATCHDOG_TIMEOUT;\t/ in seconds /\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout,\n \t\"Watchdog timeout in seconds. 1\u003c= timeout \u003c=63, default=\"\n-\t\t__MODULE_STRING(WATCHDOG_TIMEOUT) \".\");\n+\t\t__stringify(WATCHDOG_TIMEOUT) \".\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\"Watchdog cannot be stopped once started (default=\"\n-\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n /\n \tWatchdog Operations\ndiff --git a/drivers/watchdog/airoha_wdt.c b/drivers/watchdog/airoha_wdt.c\nindex 4bd333189b87e..c535c48ab6a86 100644\n--- a/drivers/watchdog/airoha_wdt.c\n+++ b/drivers/watchdog/airoha_wdt.c\n@@ -20,6 +20,7 @@\n #include \u003clinux/of.h\u003e\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/watchdog.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n / Base address of timer and watchdog registers /\n #define TIMER_CTRL\t\t\t0x0\n@@ -44,12 +45,12 @@ struct airoha_wdt_desc {\n static int heartbeat = WDT_HEARTBEAT;\n module_param(heartbeat, int, 0);\n MODULE_PARM_DESC(heartbeat, \"Watchdog heartbeats in seconds. (default=\"\n-\t\t __MODULE_STRING(WDT_HEARTBEAT) \")\");\n+\t\t __stringify(WDT_HEARTBEAT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static int airoha_wdt_start(struct watchdog_device wdog_dev)\n {\ndiff --git a/drivers/watchdog/alim1535_wdt.c b/drivers/watchdog/alim1535_wdt.c\nindex 1ecbd1ac5c3a0..d2f8d3331fe40 100644\n--- a/drivers/watchdog/alim1535_wdt.c\n+++ b/drivers/watchdog/alim1535_wdt.c\n@@ -18,6 +18,7 @@\n #include \u003clinux/pci.h\u003e\n #include \u003clinux/uaccess.h\u003e\n #include \u003clinux/io.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define WATCHDOG_NAME \"ALi_M1535\"\n #define WATCHDOG_TIMEOUT 60\t/* 60 sec default timeout /\n@@ -34,13 +35,13 @@ static int timeout = WATCHDOG_TIMEOUT;\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout,\n \t\t\"Watchdog timeout in seconds. (0 \u003c timeout \u003c 18000, default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_TIMEOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_TIMEOUT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n /\n \tali_start\t-\tstart watchdog countdown\ndiff --git a/drivers/watchdog/alim7101_wdt.c b/drivers/watchdog/alim7101_wdt.c\nindex 03a559b41f5b8..e9611c76a2696 100644\n--- a/drivers/watchdog/alim7101_wdt.c\n+++ b/drivers/watchdog/alim7101_wdt.c\n@@ -36,6 +36,7 @@\n #include \u003clinux/pci.h\u003e\n #include \u003clinux/io.h\u003e\n #include \u003clinux/uaccess.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n \n #define WDT_ENABLE 0x9C\n@@ -64,7 +65,7 @@ static int timeout = WATCHDOG_TIMEOUT;\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout,\n \t\t\"Watchdog timeout in seconds. (1\u003c=timeout\u003c=3600, default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_TIMEOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_TIMEOUT) \")\");\n \n static int use_gpio; / Use the pic (for a1d revision alim7101) /\n module_param(use_gpio, int, 0);\n@@ -82,7 +83,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n /\n \tWhack the dog\ndiff --git a/drivers/watchdog/arm_smc_wdt.c b/drivers/watchdog/arm_smc_wdt.c\nindex bbba23ace7b85..c73ed1dcdfcb0 100644\n--- a/drivers/watchdog/arm_smc_wdt.c\n+++ b/drivers/watchdog/arm_smc_wdt.c\n@@ -13,6 +13,7 @@\n #include \u003clinux/moduleparam.h\u003e\n #include \u003clinux/of.h\u003e\n #include \u003clinux/platform_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/types.h\u003e\n #include \u003clinux/watchdog.h\u003e\n #include \u003cuapi/linux/psci.h\u003e\n@@ -191,7 +192,7 @@ MODULE_PARM_DESC(timeout, \"Watchdog heartbeat in seconds\");\n \n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n MODULE_LICENSE(\"GPL\");\n MODULE_AUTHOR(\"Julius Werner \u003cjwerner@chromium.org\u003e\");\ndiff --git a/drivers/watchdog/armada_37xx_wdt.c b/drivers/watchdog/armada_37xx_wdt.c\nindex a17a7911771ac..d62b02c40b0eb 100644\n--- a/drivers/watchdog/armada_37xx_wdt.c\n+++ b/drivers/watchdog/armada_37xx_wdt.c\n@@ -16,6 +16,7 @@\n #include \u003clinux/of.h\u003e\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/regmap.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/types.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n@@ -70,7 +71,7 @@ MODULE_PARM_DESC(timeout, \"Watchdog timeout in seconds\");\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n struct armada_37xx_watchdog {\n \tstruct watchdog_device wdt;\ndiff --git a/drivers/watchdog/aspeed_wdt.c b/drivers/watchdog/aspeed_wdt.c\nindex 48454ac860746..d4bd41cb801e6 100644\n--- a/drivers/watchdog/aspeed_wdt.c\n+++ b/drivers/watchdog/aspeed_wdt.c\n@@ -17,12 +17,13 @@\n #include \u003clinux/of_irq.h\u003e\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/regmap.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n struct aspeed_wdt_scu {\n \tconst char compatible;\n \tu32 reset_status_reg;\ndiff --git a/drivers/watchdog/at91rm9200_wdt.c b/drivers/watchdog/at91rm9200_wdt.c\nindex d5afcc6342215..8c292d2469813 100644\n--- a/drivers/watchdog/at91rm9200_wdt.c\n+++ b/drivers/watchdog/at91rm9200_wdt.c\n@@ -23,6 +23,7 @@\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/reboot.h\u003e\n #include \u003clinux/regmap.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/types.h\u003e\n #include \u003clinux/watchdog.h\u003e\n #include \u003clinux/uaccess.h\u003e\n@@ -36,13 +37,13 @@ static struct regmap regmap_st;\n \n module_param(wdt_time, int, 0);\n MODULE_PARM_DESC(wdt_time, \"Watchdog time in seconds. (default=\"\n-\t\t\t\t__MODULE_STRING(WDT_DEFAULT_TIME) \")\");\n+\t\t\t\t__stringify(WDT_DEFAULT_TIME) \")\");\n \n #ifdef CONFIG_WATCHDOG_NOWAYOUT\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n #endif\n \n \ndiff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c\nindex 80ba04df54adf..f966da6020111 100644\n--- a/drivers/watchdog/at91sam9_wdt.c\n+++ b/drivers/watchdog/at91sam9_wdt.c\n@@ -32,6 +32,7 @@\n #include \u003clinux/uaccess.h\u003e\n #include \u003clinux/of.h\u003e\n #include \u003clinux/of_irq.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #include \"at91sam9_wdt.h\"\n \n@@ -70,12 +71,12 @@\n static int heartbeat;\n module_param(heartbeat, int, 0);\n MODULE_PARM_DESC(heartbeat, \"Watchdog heartbeats in seconds. \"\n-\t\"(default = \" __MODULE_STRING(WDT_HEARTBEAT) \")\");\n+\t\"(default = \" __stringify(WDT_HEARTBEAT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started \"\n-\t\"(default=\" __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\"(default=\" __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n #define to_wdt(wdd) container_of(wdd, struct at91wdt, wdd)\n struct at91wdt {\ndiff --git a/drivers/watchdog/atcwdt200_wdt.c b/drivers/watchdog/atcwdt200_wdt.c\nindex 7e757c217b0b5..ceedc3f676320 100644\n--- a/drivers/watchdog/atcwdt200_wdt.c\n+++ b/drivers/watchdog/atcwdt200_wdt.c\n@@ -19,6 +19,7 @@\n #include \u003clinux/pm.h\u003e\n #include \u003clinux/pm_runtime.h\u003e\n #include \u003clinux/regmap.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n / Register definitions /\n@@ -570,11 +571,11 @@ module_platform_driver(atcwdt_driver);\n \n module_param(timeout, uint, 0);\n MODULE_PARM_DESC(timeout, \"Watchdog timeout in seconds (default=\"\n-\t\t __MODULE_STRING(ATCWDT_TIMEOUT) \")\");\n+\t\t __stringify(ATCWDT_TIMEOUT) \")\");\n \n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n MODULE_LICENSE(\"GPL\");\n MODULE_AUTHOR(\"CL Wang \u003ccl634@andestech.com\u003e\");\ndiff --git a/drivers/watchdog/ath79_wdt.c b/drivers/watchdog/ath79_wdt.c\nindex 7df703e9852a6..02783c1ec5264 100644\n--- a/drivers/watchdog/ath79_wdt.c\n+++ b/drivers/watchdog/ath79_wdt.c\n@@ -32,6 +32,7 @@\n #include \u003clinux/of.h\u003e\n #include \u003clinux/of_platform.h\u003e\n #include \u003clinux/uaccess.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define DRIVER_NAME\t\"ath79-wdt\"\n \n@@ -50,12 +51,12 @@\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started \"\n-\t\t\t \"(default=\" __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t \"(default=\" __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static int timeout = WDT_TIMEOUT;\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout, \"Watchdog timeout in seconds \"\n-\t\t\t \"(default=\" __MODULE_STRING(WDT_TIMEOUT) \"s)\");\n+\t\t\t \"(default=\" __stringify(WDT_TIMEOUT) \"s)\");\n \n static unsigned long wdt_flags;\n \ndiff --git a/drivers/watchdog/bcm2835_wdt.c b/drivers/watchdog/bcm2835_wdt.c\nindex 6fd8b1b8e386a..1a0fc66cc0930 100644\n--- a/drivers/watchdog/bcm2835_wdt.c\n+++ b/drivers/watchdog/bcm2835_wdt.c\n@@ -20,6 +20,7 @@\n #include \u003clinux/of_address.h\u003e\n #include \u003clinux/of_platform.h\u003e\n #include \u003clinux/reboot.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define PM_RSTC\t\t\t\t0x1c\n #define PM_RSTS\t\t\t\t0x20\n@@ -229,7 +230,7 @@ MODULE_PARM_DESC(heartbeat, \"Initial watchdog heartbeat in seconds\");\n \n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n MODULE_ALIAS(\"platform:bcm2835-wdt\");\n MODULE_AUTHOR(\"Lubomir Rintel \u003clkundrak@v3.sk\u003e\");\ndiff --git a/drivers/watchdog/bcm47xx_wdt.c b/drivers/watchdog/bcm47xx_wdt.c\nindex e13ec0975bef3..0d7e8a87074a5 100644\n--- a/drivers/watchdog/bcm47xx_wdt.c\n+++ b/drivers/watchdog/bcm47xx_wdt.c\n@@ -21,6 +21,7 @@\n #include \u003clinux/watchdog.h\u003e\n #include \u003clinux/timer.h\u003e\n #include \u003clinux/jiffies.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define DRV_NAME\t\t\"bcm47xx_wdt\"\n \n@@ -33,12 +34,12 @@ static bool nowayout = WATCHDOG_NOWAYOUT;\n \n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout, \"Watchdog time in seconds. (default=\"\n-\t\t\t\t__MODULE_STRING(WDT_DEFAULT_TIME) \")\");\n+\t\t\t\t__stringify(WDT_DEFAULT_TIME) \")\");\n \n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static inline struct bcm47xx_wdt bcm47xx_wdt_get(struct watchdog_device wdd)\n {\ndiff --git a/drivers/watchdog/bcm7038_wdt.c b/drivers/watchdog/bcm7038_wdt.c\nindex e038dd66b8198..1117026cf9594 100644\n--- a/drivers/watchdog/bcm7038_wdt.c\n+++ b/drivers/watchdog/bcm7038_wdt.c\n@@ -12,6 +12,7 @@\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/platform_data/bcm7038_wdt.h\u003e\n #include \u003clinux/pm.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n #define WDT_START_1\t\t0xff00\n@@ -228,7 +229,7 @@ module_platform_driver(bcm7038_wdt_driver);\n \n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n MODULE_LICENSE(\"GPL\");\n MODULE_DESCRIPTION(\"Driver for Broadcom 7038 SoCs Watchdog\");\n MODULE_AUTHOR(\"Justin Chen\");\ndiff --git a/drivers/watchdog/booke_wdt.c b/drivers/watchdog/booke_wdt.c\nindex 1b1fb389b89ba..1224d1737e87b 100644\n--- a/drivers/watchdog/booke_wdt.c\n+++ b/drivers/watchdog/booke_wdt.c\n@@ -12,6 +12,7 @@\n \n #include \u003clinux/module.h\u003e\n #include \u003clinux/smp.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n #include \u003casm/reg_booke.h\u003e\n@@ -43,7 +44,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n #ifdef CONFIG_PPC_E500\n \ndiff --git a/drivers/watchdog/cadence_wdt.c b/drivers/watchdog/cadence_wdt.c\nindex ad46b33ce5f2e..0d635fb8b0f7c 100644\n--- a/drivers/watchdog/cadence_wdt.c\n+++ b/drivers/watchdog/cadence_wdt.c\n@@ -15,6 +15,7 @@\n #include \u003clinux/module.h\u003e\n #include \u003clinux/of.h\u003e\n #include \u003clinux/platform_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n #define CDNS_WDT_DEFAULT_TIMEOUT\t10\n@@ -52,12 +53,12 @@ static int nowayout = WATCHDOG_NOWAYOUT;\n module_param(wdt_timeout, int, 0644);\n MODULE_PARM_DESC(wdt_timeout,\n \t\t \"Watchdog time in seconds. (default=\"\n-\t\t __MODULE_STRING(CDNS_WDT_DEFAULT_TIMEOUT) \")\");\n+\t\t __stringify(CDNS_WDT_DEFAULT_TIMEOUT) \")\");\n \n module_param(nowayout, int, 0644);\n MODULE_PARM_DESC(nowayout,\n \t\t \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n /\n struct cdns_wdt - Watchdog device structure\ndiff --git a/drivers/watchdog/cgbc_wdt.c b/drivers/watchdog/cgbc_wdt.c\nindex 702b055ba6f4b..a90e6af13bed3 100644\n--- a/drivers/watchdog/cgbc_wdt.c\n+++ b/drivers/watchdog/cgbc_wdt.c\n@@ -11,6 +11,7 @@\n #include \u003clinux/limits.h\u003e\n #include \u003clinux/module.h\u003e\n #include \u003clinux/platform_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n #include \u003clinux/mfd/cgbc.h\u003e\n@@ -38,19 +39,19 @@ static unsigned int timeout;\n module_param(timeout, uint, 0);\n MODULE_PARM_DESC(timeout,\n \t\t \"Watchdog timeout in seconds. (\u003e=0, default=\"\n-\t\t __MODULE_STRING(CGBC_WDT_DEFAULT_TIMEOUT) \")\");\n+\t\t __stringify(CGBC_WDT_DEFAULT_TIMEOUT) \")\");\n \n static unsigned int pretimeout = CGBC_WDT_DEFAULT_PRETIMEOUT;\n module_param(pretimeout, uint, 0);\n MODULE_PARM_DESC(pretimeout,\n \t\t \"Watchdog pretimeout in seconds. (\u003e=0, default=\"\n-\t\t __MODULE_STRING(CGBC_WDT_DEFAULT_PRETIMEOUT) \")\");\n+\t\t __stringify(CGBC_WDT_DEFAULT_PRETIMEOUT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n struct cgbc_wdt_data {\n \tstruct cgbc_device_data\tcgbc;\ndiff --git a/drivers/watchdog/da9052_wdt.c b/drivers/watchdog/da9052_wdt.c\nindex afb7887c3a1e8..959cba0a88195 100644\n--- a/drivers/watchdog/da9052_wdt.c\n+++ b/drivers/watchdog/da9052_wdt.c\n@@ -17,6 +17,7 @@\n #include \u003clinux/types.h\u003e\n #include \u003clinux/kernel.h\u003e\n #include \u003clinux/jiffies.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #include \u003clinux/mfd/da9052/reg.h\u003e\n #include \u003clinux/mfd/da9052/da9052.h\u003e\n@@ -34,13 +35,13 @@ static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static int timeout;\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout,\n \t\"Watchdog timeout in seconds. (default = \"\n-\t__MODULE_STRING(WDT_DEFAULT_TIMEOUT) \")\");\n+\t__stringify(WDT_DEFAULT_TIMEOUT) \")\");\n \n static const struct {\n \tu8 reg_val;\ndiff --git a/drivers/watchdog/da9055_wdt.c b/drivers/watchdog/da9055_wdt.c\nindex 9d5a2009466f7..cbb87855bd6a4 100644\n--- a/drivers/watchdog/da9055_wdt.c\n+++ b/drivers/watchdog/da9055_wdt.c\n@@ -15,6 +15,7 @@\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/watchdog.h\u003e\n #include \u003clinux/delay.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #include \u003clinux/mfd/da9055/core.h\u003e\n #include \u003clinux/mfd/da9055/reg.h\u003e\n@@ -23,7 +24,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n #define DA9055_DEF_TIMEOUT\t4\n #define DA9055_TWDMIN\t\t256\ndiff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c\nindex 6ea0434f45c22..fcee686315c34 100644\n--- a/drivers/watchdog/davinci_wdt.c\n+++ b/drivers/watchdog/davinci_wdt.c\n@@ -19,6 +19,7 @@\n #include \u003clinux/device.h\u003e\n #include \u003clinux/clk.h\u003e\n #include \u003clinux/err.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define MODULE_NAME \"DAVINCI-WDT: \"\n \n@@ -250,8 +251,8 @@ MODULE_DESCRIPTION(\"DaVinci Watchdog Driver\");\n module_param(heartbeat, int, 0);\n MODULE_PARM_DESC(heartbeat,\n \t\t \"Watchdog heartbeat period in seconds from 1 to \"\n-\t\t __MODULE_STRING(MAX_HEARTBEAT) \", default \"\n-\t\t __MODULE_STRING(DEFAULT_HEARTBEAT));\n+\t\t __stringify(MAX_HEARTBEAT) \", default \"\n+\t\t __stringify(DEFAULT_HEARTBEAT));\n \n MODULE_LICENSE(\"GPL\");\n MODULE_ALIAS(\"platform:davinci-wdt\");\ndiff --git a/drivers/watchdog/db8500_wdt.c b/drivers/watchdog/db8500_wdt.c\nindex 70ccea13288d8..7e11c28997ec6 100644\n--- a/drivers/watchdog/db8500_wdt.c\n+++ b/drivers/watchdog/db8500_wdt.c\n@@ -15,6 +15,7 @@\n #include \u003clinux/uaccess.h\u003e\n #include \u003clinux/watchdog.h\u003e\n #include \u003clinux/platform_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #include \u003clinux/mfd/db8500-prcmu.h\u003e\n \n@@ -27,13 +28,13 @@ static unsigned int timeout = WATCHDOG_TIMEOUT;\n module_param(timeout, uint, 0);\n MODULE_PARM_DESC(timeout,\n \t\"Watchdog timeout in seconds. default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_TIMEOUT) \".\");\n+\t\t\t\t__stringify(WATCHDOG_TIMEOUT) \".\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static int db8500_wdt_start(struct watchdog_device wdd)\n {\ndiff --git a/drivers/watchdog/dw_wdt.c b/drivers/watchdog/dw_wdt.c\nindex 39031445d754b..c1d40d7b2165f 100644\n--- a/drivers/watchdog/dw_wdt.c\n+++ b/drivers/watchdog/dw_wdt.c\n@@ -27,6 +27,7 @@\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/pm.h\u003e\n #include \u003clinux/reset.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n #define WDOG_CONTROL_REG_OFFSET\t\t 0x00\n@@ -66,7 +67,7 @@ static const u32 dw_wdt_fix_tops[DW_WDT_NUM_TOPS] = {\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started \"\n-\t\t \"(default=\" __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t \"(default=\" __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n enum dw_wdt_rmod {\n \tDW_WDT_RMOD_RESET = 1,\ndiff --git a/drivers/watchdog/ebc-c384_wdt.c b/drivers/watchdog/ebc-c384_wdt.c\nindex 8ef4b0df3855f..39cc1f7e1cdb0 100644\n--- a/drivers/watchdog/ebc-c384_wdt.c\n+++ b/drivers/watchdog/ebc-c384_wdt.c\n@@ -13,6 +13,7 @@\n #include \u003clinux/module.h\u003e\n #include \u003clinux/moduleparam.h\u003e\n #include \u003clinux/types.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n #define MODULE_NAME\t\t\"ebc-c384_wdt\"\n@@ -30,12 +31,12 @@\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static unsigned timeout;\n module_param(timeout, uint, 0);\n MODULE_PARM_DESC(timeout, \"Watchdog timeout in seconds (default=\"\n-\t__MODULE_STRING(WATCHDOG_TIMEOUT) \")\");\n+\t__stringify(WATCHDOG_TIMEOUT) \")\");\n \n static int ebc_c384_wdt_start(struct watchdog_device wdev)\n {\ndiff --git a/drivers/watchdog/eurotechwdt.c b/drivers/watchdog/eurotechwdt.c\nindex 10c647b1226af..4d671c4e148af 100644\n--- a/drivers/watchdog/eurotechwdt.c\n+++ b/drivers/watchdog/eurotechwdt.c\n@@ -56,6 +56,7 @@\n #include \u003clinux/init.h\u003e\n #include \u003clinux/io.h\u003e\n #include \u003clinux/uaccess.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n \n static unsigned long eurwdt_is_open;\n@@ -77,7 +78,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n /\n * Some symbolic names\ndiff --git a/drivers/watchdog/exar_wdt.c b/drivers/watchdog/exar_wdt.c\nindex db62c9797406f..553be158a7252 100644\n--- a/drivers/watchdog/exar_wdt.c\n+++ b/drivers/watchdog/exar_wdt.c\n@@ -14,6 +14,7 @@\n #include \u003clinux/module.h\u003e\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/slab.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n #define DRV_NAME\t\"exar_wdt\"\n@@ -70,13 +71,13 @@ static int timeout = WATCHDOG_TIMEOUT;\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout,\n \t\t \"Watchdog timeout in seconds. 1\u003c=timeout\u003c=15300, default=\"\n-\t\t __MODULE_STRING(WATCHDOG_TIMEOUT) \".\");\n+\t\t __stringify(WATCHDOG_TIMEOUT) \".\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static int exar_sio_enter(const unsigned short config_port,\n \t\t\t const unsigned char key)\ndiff --git a/drivers/watchdog/f71808e_wdt.c b/drivers/watchdog/f71808e_wdt.c\nindex 6a16d3d0bb1e6..2790061a68f34 100644\n--- a/drivers/watchdog/f71808e_wdt.c\n+++ b/drivers/watchdog/f71808e_wdt.c\n@@ -14,6 +14,7 @@\n #include \u003clinux/ioport.h\u003e\n #include \u003clinux/module.h\u003e\n #include \u003clinux/platform_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n #define DRVNAME \"f71808e_wdt\"\n@@ -81,20 +82,20 @@ static int timeout = WATCHDOG_TIMEOUT;\t/* default timeout in seconds /\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout,\n \t\"Watchdog timeout in seconds. 1\u003c= timeout \u003c=\"\n-\t\t\t__MODULE_STRING(WATCHDOG_MAX_TIMEOUT) \" (default=\"\n-\t\t\t__MODULE_STRING(WATCHDOG_TIMEOUT) \")\");\n+\t\t\t__stringify(WATCHDOG_MAX_TIMEOUT) \" (default=\"\n+\t\t\t__stringify(WATCHDOG_TIMEOUT) \")\");\n \n static unsigned int pulse_width = WATCHDOG_PULSE_WIDTH;\n module_param(pulse_width, uint, 0);\n MODULE_PARM_DESC(pulse_width,\n \t\"Watchdog signal pulse width. 0(=level), 1, 25, 30, 125, 150, 5000 or 6000 ms\"\n-\t\t\t\" (default=\" __MODULE_STRING(WATCHDOG_PULSE_WIDTH) \")\");\n+\t\t\t\" (default=\" __stringify(WATCHDOG_PULSE_WIDTH) \")\");\n \n static unsigned int f71862fg_pin = WATCHDOG_F71862FG_PIN;\n module_param(f71862fg_pin, uint, 0);\n MODULE_PARM_DESC(f71862fg_pin,\n \t\"Watchdog f71862fg reset output pin configuration. Choose pin 56 or 63\"\n-\t\t\t\" (default=\" __MODULE_STRING(WATCHDOG_F71862FG_PIN)\")\");\n+\t\t\t\" (default=\" __stringify(WATCHDOG_F71862FG_PIN)\")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0444);\ndiff --git a/drivers/watchdog/gef_wdt.c b/drivers/watchdog/gef_wdt.c\nindex bf6f733dfb5f7..4d39588a49c32 100644\n--- a/drivers/watchdog/gef_wdt.c\n+++ b/drivers/watchdog/gef_wdt.c\n@@ -34,6 +34,7 @@\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/io.h\u003e\n #include \u003clinux/uaccess.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #include \u003csysdev/fsl_soc.h\u003e\n \n@@ -70,7 +71,7 @@ static DEFINE_SPINLOCK(gef_wdt_spinlock);\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n \n static int gef_wdt_toggle_wdc(int enabled_predicate, int field_shift)\ndiff --git a/drivers/watchdog/geodewdt.c b/drivers/watchdog/geodewdt.c\nindex 5b80ade1c6814..437cc0a536545 100644\n--- a/drivers/watchdog/geodewdt.c\n+++ b/drivers/watchdog/geodewdt.c\n@@ -16,6 +16,7 @@\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/reboot.h\u003e\n #include \u003clinux/uaccess.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #include \u003clinux/cs5535.h\u003e\n \n@@ -34,13 +35,13 @@ static int timeout = WATCHDOG_TIMEOUT;\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout,\n \t\"Watchdog timeout in seconds. 1\u003c= timeout \u003c=131, default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_TIMEOUT) \".\");\n+\t\t\t\t__stringify(WATCHDOG_TIMEOUT) \".\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static struct platform_device geodewdt_platform_device;\n static unsigned long wdt_flags;\ndiff --git a/drivers/watchdog/gpio_wdt.c b/drivers/watchdog/gpio_wdt.c\nindex 1abc7d0b78a62..2cd79c8f60dcd 100644\n--- a/drivers/watchdog/gpio_wdt.c\n+++ b/drivers/watchdog/gpio_wdt.c\n@@ -11,13 +11,14 @@\n #include \u003clinux/module.h\u003e\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/property.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n #define SOFT_TIMEOUT_MIN\t1\n #define SOFT_TIMEOUT_DEF\t60\ndiff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c\nindex 8af1fad2de0bd..7b9eb4e4b6e7c 100644\n--- a/drivers/watchdog/hpwdt.c\n+++ b/drivers/watchdog/hpwdt.c\n@@ -20,6 +20,7 @@\n #include \u003clinux/pci.h\u003e\n #include \u003clinux/pci_ids.h\u003e\n #include \u003clinux/types.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n #ifdef CONFIG_HPWDT_NMI_DECODING\n #include \u003casm/nmi.h\u003e\n@@ -432,7 +433,7 @@ MODULE_PARM_DESC(timeout, \"Alias of soft_margin\");\n \n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n module_param(kdumptimeout, int, 0444);\n MODULE_PARM_DESC(kdumptimeout, \"Timeout applied for crash kernel transition in seconds\");\ndiff --git a/drivers/watchdog/i6300esb.c b/drivers/watchdog/i6300esb.c\nindex a30835f547b32..006d263cf1356 100644\n--- a/drivers/watchdog/i6300esb.c\n+++ b/drivers/watchdog/i6300esb.c\n@@ -37,6 +37,7 @@\n #include \u003clinux/ioport.h\u003e\n #include \u003clinux/uaccess.h\u003e\n #include \u003clinux/io.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n /* Module and version information /\n #define ESB_MODULE_NAME \"i6300ESB timer\"\n@@ -74,19 +75,19 @@\n #define ESB_HEARTBEAT_MIN\t1\n #define ESB_HEARTBEAT_MAX\t2046\n #define ESB_HEARTBEAT_DEFAULT\t30\n-#define ESB_HEARTBEAT_RANGE __MODULE_STRING(ESB_HEARTBEAT_MIN) \\\n-\t\"\u003cheartbeat\u003c\" __MODULE_STRING(ESB_HEARTBEAT_MAX)\n+#define ESB_HEARTBEAT_RANGE __stringify(ESB_HEARTBEAT_MIN) \\\n+\t\"\u003cheartbeat\u003c\" __stringify(ESB_HEARTBEAT_MAX)\n static int heartbeat; / in seconds /\n module_param(heartbeat, int, 0);\n MODULE_PARM_DESC(heartbeat,\n \t\"Watchdog heartbeat in seconds. (\" ESB_HEARTBEAT_RANGE\n-\t\", default=\" __MODULE_STRING(ESB_HEARTBEAT_DEFAULT) \")\");\n+\t\", default=\" __stringify(ESB_HEARTBEAT_DEFAULT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n / internal variables /\n struct esb_dev {\ndiff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c\nindex 1dec9cd155b11..0a8bf28f57688 100644\n--- a/drivers/watchdog/iTCO_wdt.c\n+++ b/drivers/watchdog/iTCO_wdt.c\n@@ -60,6 +60,7 @@\n #include \u003clinux/ioport.h\u003e\t\t/ For io-port access /\n #include \u003clinux/uaccess.h\u003e\t\t/ For copy_to_user/put_user/... /\n #include \u003clinux/io.h\u003e\t\t\t/ For inb/outb/... /\n+#include \u003clinux/stringify.h\u003e\t\t/ For __stringify /\n #include \u003clinux/platform_data/itco_wdt.h\u003e\n #include \u003clinux/mfd/intel_pmc_bxt.h\u003e\n \n@@ -115,13 +116,13 @@ static int heartbeat = WATCHDOG_TIMEOUT; / in seconds /\n module_param(heartbeat, int, 0);\n MODULE_PARM_DESC(heartbeat, \"Watchdog timeout in seconds. \"\n \t\"5..76 (TCO v1) or 3..614 (TCO v2), default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_TIMEOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_TIMEOUT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static int turn_SMI_watchdog_clear_off = 1;\n module_param(turn_SMI_watchdog_clear_off, int, 0);\ndiff --git a/drivers/watchdog/ib700wdt.c b/drivers/watchdog/ib700wdt.c\nindex 5ce6101d236d7..3806d86eb36ad 100644\n--- a/drivers/watchdog/ib700wdt.c\n+++ b/drivers/watchdog/ib700wdt.c\n@@ -41,6 +41,7 @@\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/io.h\u003e\n #include \u003clinux/uaccess.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n \n static struct platform_device ibwdt_platform_device;\n@@ -96,13 +97,13 @@ static int timeout = WATCHDOG_TIMEOUT;\t/* in seconds /\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout,\n \t\"Watchdog timeout in seconds. 0\u003c= timeout \u003c=30, default=\"\n-\t\t__MODULE_STRING(WATCHDOG_TIMEOUT) \".\");\n+\t\t__stringify(WATCHDOG_TIMEOUT) \".\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n \n /\ndiff --git a/drivers/watchdog/ibmasr.c b/drivers/watchdog/ibmasr.c\nindex cf845f865945d..53bd84e6d57f1 100644\n--- a/drivers/watchdog/ibmasr.c\n+++ b/drivers/watchdog/ibmasr.c\n@@ -21,6 +21,7 @@\n #include \u003clinux/dmi.h\u003e\n #include \u003clinux/io.h\u003e\n #include \u003clinux/uaccess.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n \n enum {\n@@ -413,7 +414,7 @@ module_exit(ibmasr_exit);\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n MODULE_DESCRIPTION(\"IBM Automatic Server Restart driver\");\n MODULE_AUTHOR(\"Andrey Panin\");\ndiff --git a/drivers/watchdog/ie6xx_wdt.c b/drivers/watchdog/ie6xx_wdt.c\nindex 5a7bb7e84653f..eda515b917cc4 100644\n--- a/drivers/watchdog/ie6xx_wdt.c\n+++ b/drivers/watchdog/ie6xx_wdt.c\n@@ -17,6 +17,7 @@\n #include \u003clinux/debugfs.h\u003e\n #include \u003clinux/uaccess.h\u003e\n #include \u003clinux/spinlock.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define DRIVER_NAME \"ie6xx_wdt\"\n \n@@ -49,14 +50,14 @@ static unsigned int timeout = DEFAULT_TIME;\n module_param(timeout, uint, 0);\n MODULE_PARM_DESC(timeout,\n \t\t\"Default Watchdog timer setting (\"\n-\t\t__MODULE_STRING(DEFAULT_TIME) \"s).\"\n+\t\t__stringify(DEFAULT_TIME) \"s).\"\n \t\t\"The range is from 1 to 600\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\"Watchdog cannot be stopped once started (default=\"\n-\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static u8 resetmode = 0x10;\n module_param(resetmode, byte, 0);\ndiff --git a/drivers/watchdog/imgpdc_wdt.c b/drivers/watchdog/imgpdc_wdt.c\nindex 65cc8396aa595..bb6227c40de43 100644\n--- a/drivers/watchdog/imgpdc_wdt.c\n+++ b/drivers/watchdog/imgpdc_wdt.c\n@@ -43,6 +43,7 @@\n #include \u003clinux/module.h\u003e\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/slab.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n /* registers /\n@@ -71,12 +72,12 @@\n static int heartbeat;\n module_param(heartbeat, int, 0);\n MODULE_PARM_DESC(heartbeat, \"Watchdog heartbeats in seconds \"\n-\t\"(default=\" __MODULE_STRING(PDC_WDT_DEF_TIMEOUT) \")\");\n+\t\"(default=\" __stringify(PDC_WDT_DEF_TIMEOUT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started \"\n-\t\"(default=\" __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\"(default=\" __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n struct pdc_wdt_dev {\n \tstruct watchdog_device wdt_dev;\ndiff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c\nindex 4b3a192ee3e82..58aa5f999f4fe 100644\n--- a/drivers/watchdog/imx2_wdt.c\n+++ b/drivers/watchdog/imx2_wdt.c\n@@ -29,6 +29,7 @@\n #include \u003clinux/of.h\u003e\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/regmap.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n #define DRIVER_NAME \"imx2-wdt\"\n@@ -79,12 +80,12 @@ struct imx2_wdt_device {\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static unsigned timeout;\n module_param(timeout, uint, 0);\n MODULE_PARM_DESC(timeout, \"Watchdog timeout in seconds (default=\"\n-\t\t\t\t__MODULE_STRING(IMX2_WDT_DEFAULT_TIME) \")\");\n+\t\t\t\t__stringify(IMX2_WDT_DEFAULT_TIME) \")\");\n \n static const struct watchdog_info imx2_wdt_info = {\n \t.identity = \"imx2+ watchdog\",\ndiff --git a/drivers/watchdog/imx7ulp_wdt.c b/drivers/watchdog/imx7ulp_wdt.c\nindex 855dc9d5083a5..f61936194aea8 100644\n--- a/drivers/watchdog/imx7ulp_wdt.c\n+++ b/drivers/watchdog/imx7ulp_wdt.c\n@@ -11,6 +11,7 @@\n #include \u003clinux/of.h\u003e\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/reboot.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n #define WDOG_CS\t\t\t0x0\n@@ -51,7 +52,7 @@\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0000);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n struct imx_wdt_hw_feature {\n \tbool prescaler_enable;\ndiff --git a/drivers/watchdog/imx_sc_wdt.c b/drivers/watchdog/imx_sc_wdt.c\nindex 1280b9b1ec2ac..fc39f9db4c06f 100644\n--- a/drivers/watchdog/imx_sc_wdt.c\n+++ b/drivers/watchdog/imx_sc_wdt.c\n@@ -11,6 +11,7 @@\n #include \u003clinux/moduleparam.h\u003e\n #include \u003clinux/of.h\u003e\n #include \u003clinux/platform_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n #define DEFAULT_TIMEOUT 60\n@@ -39,7 +40,7 @@\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0000);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n struct imx_sc_wdt_device {\n \tstruct watchdog_device wdd;\ndiff --git a/drivers/watchdog/indydog.c b/drivers/watchdog/indydog.c\nindex d3092d2613452..5268b1feb7ce7 100644\n--- a/drivers/watchdog/indydog.c\n+++ b/drivers/watchdog/indydog.c\n@@ -22,6 +22,7 @@\n #include \u003clinux/reboot.h\u003e\n #include \u003clinux/init.h\u003e\n #include \u003clinux/uaccess.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003casm/sgi/mc.h\u003e\n \n static unsigned long indydog_alive;\n@@ -33,7 +34,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static void indydog_start(void)\n {\ndiff --git a/drivers/watchdog/intel_oc_wdt.c b/drivers/watchdog/intel_oc_wdt.c\nindex a39892c10770e..d1e9a3f62369f 100644\n--- a/drivers/watchdog/intel_oc_wdt.c\n+++ b/drivers/watchdog/intel_oc_wdt.c\n@@ -14,6 +14,7 @@\n #include \u003clinux/module.h\u003e\n #include \u003clinux/moduleparam.h\u003e\n #include \u003clinux/platform_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n #define INTEL_OC_WDT_TOV\t\tGENMASK(9, 0)\n@@ -48,12 +49,12 @@ struct intel_oc_wdt {\n static int heartbeat;\n module_param(heartbeat, uint, 0);\n MODULE_PARM_DESC(heartbeat, \"Watchdog heartbeats in seconds. (default=\"\n-\t\t __MODULE_STRING(WDT_HEARTBEAT) \")\");\n+\t\t __stringify(WDT_HEARTBEAT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static int intel_oc_wdt_start(struct watchdog_device wdd)\n {\ndiff --git a/drivers/watchdog/it87_wdt.c b/drivers/watchdog/it87_wdt.c\nindex 1d9f8591f38d8..087250ab036a9 100644\n--- a/drivers/watchdog/it87_wdt.c\n+++ b/drivers/watchdog/it87_wdt.c\n@@ -29,6 +29,7 @@\n #include \u003clinux/module.h\u003e\n #include \u003clinux/moduleparam.h\u003e\n #include \u003clinux/printk.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/types.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n@@ -105,13 +106,13 @@ static bool nowayout = DEFAULT_NOWAYOUT;\n \n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout, \"Watchdog timeout in seconds, default=\"\n-\t\t__MODULE_STRING(DEFAULT_TIMEOUT));\n+\t\t__stringify(DEFAULT_TIMEOUT));\n module_param(testmode, int, 0);\n MODULE_PARM_DESC(testmode, \"Watchdog test mode (1 = no reboot), default=\"\n-\t\t__MODULE_STRING(DEFAULT_TESTMODE));\n+\t\t__stringify(DEFAULT_TESTMODE));\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started, default=\"\n-\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT));\n+\t\t__stringify(WATCHDOG_NOWAYOUT));\n \n /* Superio Chip /\n \ndiff --git a/drivers/watchdog/jz4740_wdt.c b/drivers/watchdog/jz4740_wdt.c\nindex 395bde79e2920..9dec1b8224101 100644\n--- a/drivers/watchdog/jz4740_wdt.c\n+++ b/drivers/watchdog/jz4740_wdt.c\n@@ -19,6 +19,7 @@\n #include \u003clinux/err.h\u003e\n #include \u003clinux/of.h\u003e\n #include \u003clinux/regmap.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define DEFAULT_HEARTBEAT 5\n #define MAX_HEARTBEAT 2048\n@@ -27,14 +28,14 @@ static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static unsigned int heartbeat = DEFAULT_HEARTBEAT;\n module_param(heartbeat, uint, 0);\n MODULE_PARM_DESC(heartbeat,\n \t\t\"Watchdog heartbeat period in seconds from 1 to \"\n-\t\t__MODULE_STRING(MAX_HEARTBEAT) \", default \"\n-\t\t__MODULE_STRING(DEFAULT_HEARTBEAT));\n+\t\t__stringify(MAX_HEARTBEAT) \", default \"\n+\t\t__stringify(DEFAULT_HEARTBEAT));\n \n struct jz4740_wdt_drvdata {\n \tstruct watchdog_device wdt;\ndiff --git a/drivers/watchdog/keembay_wdt.c b/drivers/watchdog/keembay_wdt.c\nindex 7c8e53921e407..11b4b26f7b88e 100644\n--- a/drivers/watchdog/keembay_wdt.c\n+++ b/drivers/watchdog/keembay_wdt.c\n@@ -14,6 +14,7 @@\n #include \u003clinux/module.h\u003e\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/reboot.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n / Non-secure watchdog register offsets /\n@@ -39,12 +40,12 @@\n static unsigned int timeout = WDT_TIMEOUT;\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout, \"Watchdog timeout period in seconds (default = \"\n-\t\t __MODULE_STRING(WDT_TIMEOUT) \")\");\n+\t\t __stringify(WDT_TIMEOUT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default = \"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n struct keembay_wdt {\n \tstruct watchdog_device\twdd;\ndiff --git a/drivers/watchdog/kempld_wdt.c b/drivers/watchdog/kempld_wdt.c\nindex e6c7a29066804..b4cde48d2b10a 100644\n--- a/drivers/watchdog/kempld_wdt.c\n+++ b/drivers/watchdog/kempld_wdt.c\n@@ -21,6 +21,7 @@\n #include \u003clinux/uaccess.h\u003e\n #include \u003clinux/watchdog.h\u003e\n #include \u003clinux/platform_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/mfd/kempld.h\u003e\n \n #define KEMPLD_WDT_STAGE_TIMEOUT(x)\t(0x1b + (x) 4)\n@@ -85,19 +86,19 @@ static unsigned int timeout = DEFAULT_TIMEOUT;\n module_param(timeout, uint, 0);\n MODULE_PARM_DESC(timeout,\n \t\"Watchdog timeout in seconds. (\u003e=0, default=\"\n-\t__MODULE_STRING(DEFAULT_TIMEOUT) \")\");\n+\t__stringify(DEFAULT_TIMEOUT) \")\");\n \n static unsigned int pretimeout = DEFAULT_PRETIMEOUT;\n module_param(pretimeout, uint, 0);\n MODULE_PARM_DESC(pretimeout,\n \t\"Watchdog pretimeout in seconds. (\u003e=0, default=\"\n-\t__MODULE_STRING(DEFAULT_PRETIMEOUT) \")\");\n+\t__stringify(DEFAULT_PRETIMEOUT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\"Watchdog cannot be stopped once started (default=\"\n-\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static int kempld_wdt_set_stage_action(struct kempld_wdt_data wdt_data,\n \t\t\t\t\tstruct kempld_wdt_stage stage,\ndiff --git a/drivers/watchdog/lenovo_se10_wdt.c b/drivers/watchdog/lenovo_se10_wdt.c\nindex 503e220263f95..1eaf86c85cc0e 100644\n--- a/drivers/watchdog/lenovo_se10_wdt.c\n+++ b/drivers/watchdog/lenovo_se10_wdt.c\n@@ -10,6 +10,7 @@\n #include \u003clinux/moduleparam.h\u003e\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/string.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/types.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n@@ -48,13 +49,13 @@ static int timeout; /* in seconds /\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout,\n \t\t \"Watchdog timeout in seconds. 1 \u003c= timeout \u003c= 255, default=\"\n-\t\t __MODULE_STRING(WATCHDOG_TIMEOUT) \".\");\n+\t\t __stringify(WATCHDOG_TIMEOUT) \".\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n struct se10_wdt {\n \tstruct watchdog_device wdd;\ndiff --git a/drivers/watchdog/lenovo_se30_wdt.c b/drivers/watchdog/lenovo_se30_wdt.c\nindex 1c73bb7eeeeed..127ea9a1933ff 100644\n--- a/drivers/watchdog/lenovo_se30_wdt.c\n+++ b/drivers/watchdog/lenovo_se30_wdt.c\n@@ -13,6 +13,7 @@\n #include \u003clinux/module.h\u003e\n #include \u003clinux/moduleparam.h\u003e\n #include \u003clinux/platform_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n #define IOREGION_OFFSET\t4 / Use EC port 1 /\n@@ -28,13 +29,13 @@ static int timeout; / in seconds /\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout,\n \t\t \"Watchdog timeout in seconds. 1 \u003c= timeout \u003c= 255, default=\"\n-\t\t __MODULE_STRING(WATCHDOG_TIMEOUT) \".\");\n+\t\t __stringify(WATCHDOG_TIMEOUT) \".\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n #define LNV_SE30_NAME\t\"lenovo-se30-wdt\"\n #define LNV_SE30_ID\t0x0110\ndiff --git a/drivers/watchdog/lenovo_se30g2_se60_wdt.c b/drivers/watchdog/lenovo_se30g2_se60_wdt.c\nindex f31ecdb82ad05..c87abdb1a1b2d 100644\n--- a/drivers/watchdog/lenovo_se30g2_se60_wdt.c\n+++ b/drivers/watchdog/lenovo_se30g2_se60_wdt.c\n@@ -10,6 +10,7 @@\n #include \u003clinux/moduleparam.h\u003e\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/string.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/types.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n@@ -37,13 +38,13 @@ static int timeout; / in seconds /\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout,\n \t\t \"Watchdog timeout in seconds. 1 \u003c= timeout \u003c= 255, default=\"\n-\t\t __MODULE_STRING(WATCHDOG_TIMEOUT) \".\");\n+\t\t __stringify(WATCHDOG_TIMEOUT) \".\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n struct se_30g2_60_wdt {\n \tstruct watchdog_device wdd;\ndiff --git a/drivers/watchdog/loongson1_wdt.c b/drivers/watchdog/loongson1_wdt.c\nindex 2417519717cc4..7f8de11f1b4ab 100644\n--- a/drivers/watchdog/loongson1_wdt.c\n+++ b/drivers/watchdog/loongson1_wdt.c\n@@ -9,6 +9,7 @@\n #include \u003clinux/module.h\u003e\n #include \u003clinux/of.h\u003e\n #include \u003clinux/platform_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n / Loongson Watchdog Register Definitions /\n@@ -19,12 +20,12 @@\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static unsigned int heartbeat;\n module_param(heartbeat, uint, 0);\n MODULE_PARM_DESC(heartbeat, \"Watchdog heartbeat in seconds. (default=\"\n-\t\t __MODULE_STRING(DEFAULT_HEARTBEAT) \")\");\n+\t\t __stringify(DEFAULT_HEARTBEAT) \")\");\n \n struct ls1x_wdt_pdata {\n \tu32 timer_offset;\ndiff --git a/drivers/watchdog/lpc18xx_wdt.c b/drivers/watchdog/lpc18xx_wdt.c\nindex 3e8e80bbcb93b..633119e4b126d 100644\n--- a/drivers/watchdog/lpc18xx_wdt.c\n+++ b/drivers/watchdog/lpc18xx_wdt.c\n@@ -15,6 +15,7 @@\n #include \u003clinux/module.h\u003e\n #include \u003clinux/of.h\u003e\n #include \u003clinux/platform_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n / Registers /\n@@ -41,12 +42,12 @@\n static int heartbeat;\n module_param(heartbeat, int, 0);\n MODULE_PARM_DESC(heartbeat, \"Watchdog heartbeats in seconds (default=\"\n-\t\t __MODULE_STRING(LPC18XX_WDT_DEF_TIMEOUT) \")\");\n+\t\t __stringify(LPC18XX_WDT_DEF_TIMEOUT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n struct lpc18xx_wdt_dev {\n \tstruct watchdog_device\twdt_dev;\ndiff --git a/drivers/watchdog/ma35d1_wdt.c b/drivers/watchdog/ma35d1_wdt.c\nindex 119d58f338bf0..ede4bee594f1f 100644\n--- a/drivers/watchdog/ma35d1_wdt.c\n+++ b/drivers/watchdog/ma35d1_wdt.c\n@@ -20,6 +20,7 @@\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/pm_wakeirq.h\u003e\n #include \u003clinux/property.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/types.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n@@ -355,7 +356,7 @@ MODULE_PARM_DESC(timeout, \"Watchdog heartbeat in seconds\");\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(\n \tnowayout,\n-\t\"Watchdog cannot be stopped once started (default=\" __MODULE_STRING(\n+\t\"Watchdog cannot be stopped once started (default=\" __stringify(\n \t\tWATCHDOG_NOWAYOUT) \")\");\n \n MODULE_AUTHOR(\"Zi-Yu Chen \u003czychennvt@gmail.com\u003e\");\ndiff --git a/drivers/watchdog/max63xx_wdt.c b/drivers/watchdog/max63xx_wdt.c\nindex e9073df1a7de3..aefda26bbcec9 100644\n--- a/drivers/watchdog/max63xx_wdt.c\n+++ b/drivers/watchdog/max63xx_wdt.c\n@@ -23,6 +23,7 @@\n #include \u003clinux/io.h\u003e\n #include \u003clinux/slab.h\u003e\n #include \u003clinux/property.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define DEFAULT_HEARTBEAT 60\n #define MAX_HEARTBEAT 60\n@@ -283,12 +284,12 @@ MODULE_DESCRIPTION(\"max63xx Watchdog Driver\");\n module_param(heartbeat, int, 0);\n MODULE_PARM_DESC(heartbeat,\n \t\t \"Watchdog heartbeat period in seconds from 1 to \"\n-\t\t __MODULE_STRING(MAX_HEARTBEAT) \", default \"\n-\t\t __MODULE_STRING(DEFAULT_HEARTBEAT));\n+\t\t __stringify(MAX_HEARTBEAT) \", default \"\n+\t\t __stringify(DEFAULT_HEARTBEAT));\n \n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n module_param(nodelay, int, 0);\n MODULE_PARM_DESC(nodelay,\ndiff --git a/drivers/watchdog/max77620_wdt.c b/drivers/watchdog/max77620_wdt.c\nindex ed5a98cea525d..79148cbad4f26 100644\n--- a/drivers/watchdog/max77620_wdt.c\n+++ b/drivers/watchdog/max77620_wdt.c\n@@ -18,6 +18,7 @@\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/regmap.h\u003e\n #include \u003clinux/slab.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n@@ -255,7 +256,7 @@ MODULE_DESCRIPTION(\"Max77620 watchdog timer driver\");\n \n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started \"\n-\t\"(default=\" __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\"(default=\" __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n MODULE_AUTHOR(\"Laxman Dewangan \u003cldewangan@nvidia.com\u003e\");\n MODULE_AUTHOR(\"Luca Ceresoli \u003cluca.ceresoli@bootlin.com\u003e\");\ndiff --git a/drivers/watchdog/mena21_wdt.c b/drivers/watchdog/mena21_wdt.c\nindex 99d2359d5a8a7..a762462c25c54 100644\n--- a/drivers/watchdog/mena21_wdt.c\n+++ b/drivers/watchdog/mena21_wdt.c\n@@ -17,6 +17,7 @@\n #include \u003clinux/delay.h\u003e\n #include \u003clinux/bitops.h\u003e\n #include \u003clinux/of.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define NUM_GPIOS 6\n \n@@ -37,7 +38,7 @@ struct a21_wdt_drv {\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static unsigned int a21_wdt_get_bootstatus(struct a21_wdt_drv drv)\n {\ndiff --git a/drivers/watchdog/menf21bmc_wdt.c b/drivers/watchdog/menf21bmc_wdt.c\nindex 81ebdfc371f4d..bb8eda18fbad6 100644\n--- a/drivers/watchdog/menf21bmc_wdt.c\n+++ b/drivers/watchdog/menf21bmc_wdt.c\n@@ -11,6 +11,7 @@\n #include \u003clinux/watchdog.h\u003e\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/i2c.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define DEVNAME \"menf21bmc_wdt\"\n \n@@ -28,7 +29,7 @@\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n struct menf21bmc_wdt {\n \tstruct watchdog_device wdt;\ndiff --git a/drivers/watchdog/menz69_wdt.c b/drivers/watchdog/menz69_wdt.c\nindex 3fe23451135d7..962c6867bc073 100644\n--- a/drivers/watchdog/menz69_wdt.c\n+++ b/drivers/watchdog/menz69_wdt.c\n@@ -8,6 +8,7 @@\n #include \u003clinux/kernel.h\u003e\n #include \u003clinux/mcb.h\u003e\n #include \u003clinux/module.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n struct men_z069_drv {\n@@ -29,7 +30,7 @@ struct men_z069_drv {\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static int men_z069_wdt_start(struct watchdog_device wdt)\n {\ndiff --git a/drivers/watchdog/meson_gxbb_wdt.c b/drivers/watchdog/meson_gxbb_wdt.c\nindex a48622d11ad72..fb276060e8314 100644\n--- a/drivers/watchdog/meson_gxbb_wdt.c\n+++ b/drivers/watchdog/meson_gxbb_wdt.c\n@@ -11,6 +11,7 @@\n #include \u003clinux/of.h\u003e\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/slab.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/types.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n@@ -31,12 +32,12 @@\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static unsigned int timeout;\n module_param(timeout, uint, 0);\n MODULE_PARM_DESC(timeout, \"Watchdog heartbeat in seconds=\"\n-\t\t __MODULE_STRING(DEFAULT_TIMEOUT) \")\");\n+\t\t __stringify(DEFAULT_TIMEOUT) \")\");\n \n struct meson_gxbb_wdt {\n \tvoid __iomem reg_base;\ndiff --git a/drivers/watchdog/meson_wdt.c b/drivers/watchdog/meson_wdt.c\nindex 44db4ebc8599f..80a4f87713359 100644\n--- a/drivers/watchdog/meson_wdt.c\n+++ b/drivers/watchdog/meson_wdt.c\n@@ -15,6 +15,7 @@\n #include \u003clinux/moduleparam.h\u003e\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/property.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/types.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n@@ -218,7 +219,7 @@ MODULE_PARM_DESC(timeout, \"Watchdog heartbeat in seconds\");\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n MODULE_LICENSE(\"GPL\");\n MODULE_AUTHOR(\"Carlo Caione \u003ccarlo@caione.org\u003e\");\ndiff --git a/drivers/watchdog/mixcomwd.c b/drivers/watchdog/mixcomwd.c\nindex 1ecd5c48a005a..db358df2f2228 100644\n--- a/drivers/watchdog/mixcomwd.c\n+++ b/drivers/watchdog/mixcomwd.c\n@@ -52,6 +52,7 @@\n #include \u003clinux/timer.h\u003e\n #include \u003clinux/uaccess.h\u003e\n #include \u003clinux/io.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n /\n We have two types of cards that can be probed:\n@@ -107,7 +108,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static void mixcomwd_ping(void)\n {\ndiff --git a/drivers/watchdog/mpc8xxx_wdt.c b/drivers/watchdog/mpc8xxx_wdt.c\nindex a4b497ecfa205..0d5a360b56292 100644\n--- a/drivers/watchdog/mpc8xxx_wdt.c\n+++ b/drivers/watchdog/mpc8xxx_wdt.c\n@@ -22,6 +22,7 @@\n #include \u003clinux/watchdog.h\u003e\n #include \u003clinux/io.h\u003e\n #include \u003clinux/uaccess.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003csysdev/fsl_soc.h\u003e\n \n #define WATCHDOG_TIMEOUT 10\n@@ -57,7 +58,7 @@ static u16 timeout;\n module_param(timeout, ushort, 0);\n MODULE_PARM_DESC(timeout,\n \t\"Watchdog timeout in seconds. (1\u003ctimeout\u003c65535, default=\"\n-\t__MODULE_STRING(WATCHDOG_TIMEOUT) \")\");\n+\t__stringify(WATCHDOG_TIMEOUT) \")\");\n \n static bool reset = 1;\n module_param(reset, bool, 0);\n@@ -67,7 +68,7 @@ MODULE_PARM_DESC(reset,\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started \"\n-\t\t \"(default=\" __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t \"(default=\" __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static void mpc8xxx_wdt_keepalive(struct mpc8xxx_wdt_ddata ddata)\n {\ndiff --git a/drivers/watchdog/mt7621_wdt.c b/drivers/watchdog/mt7621_wdt.c\nindex db47b131f7806..9e0ebec43c888 100644\n--- a/drivers/watchdog/mt7621_wdt.c\n+++ b/drivers/watchdog/mt7621_wdt.c\n@@ -16,6 +16,7 @@\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/mfd/syscon.h\u003e\n #include \u003clinux/regmap.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define SYSC_RSTSTAT\t\t\t0x38\n #define WDT_RST_CAUSE\t\t\tBIT(1)\n@@ -41,7 +42,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static inline void rt_wdt_w32(void __iomem base, unsigned int reg, u32 val)\n {\ndiff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c\nindex d9c30e4c80e3f..46a83660f0988 100644\n--- a/drivers/watchdog/mtk_wdt.c\n+++ b/drivers/watchdog/mtk_wdt.c\n@@ -31,6 +31,7 @@\n #include \u003clinux/types.h\u003e\n #include \u003clinux/watchdog.h\u003e\n #include \u003clinux/interrupt.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define WDT_MAX_TIMEOUT\t\t31\n #define WDT_MIN_TIMEOUT\t\t2\n@@ -526,7 +527,7 @@ MODULE_PARM_DESC(timeout, \"Watchdog heartbeat in seconds\");\n \n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n MODULE_LICENSE(\"GPL\");\n MODULE_AUTHOR(\"Matthias Brugger \u003cmatthias.bgg@gmail.com\u003e\");\ndiff --git a/drivers/watchdog/nct6694_wdt.c b/drivers/watchdog/nct6694_wdt.c\nindex bc3689bd4b6bb..169a6736e9ea0 100644\n--- a/drivers/watchdog/nct6694_wdt.c\n+++ b/drivers/watchdog/nct6694_wdt.c\n@@ -11,6 +11,7 @@\n #include \u003clinux/module.h\u003e\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/slab.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n #define DEVICE_NAME \"nct6694-wdt\"\n@@ -50,7 +51,7 @@ MODULE_PARM_DESC(pretimeout, \"Watchdog pre-timeout in seconds\");\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n enum {\n \tNCT6694_ACTION_NONE = 0,\ndiff --git a/drivers/watchdog/ni903x_wdt.c b/drivers/watchdog/ni903x_wdt.c\nindex c72a9ee9cb8e1..68b7c485726b2 100644\n--- a/drivers/watchdog/ni903x_wdt.c\n+++ b/drivers/watchdog/ni903x_wdt.c\n@@ -9,6 +9,7 @@\n #include \u003clinux/io.h\u003e\n #include \u003clinux/module.h\u003e\n #include \u003clinux/platform_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n #define NIWD_CONTROL\t0x01\n@@ -46,13 +47,13 @@ static unsigned int timeout;\n module_param(timeout, uint, 0);\n MODULE_PARM_DESC(timeout,\n \t\t \"Watchdog timeout in seconds. (default=\"\n-\t\t __MODULE_STRING(NIWD_DEFAULT_TIMEOUT) \")\");\n+\t\t __stringify(NIWD_DEFAULT_TIMEOUT) \")\");\n \n static int nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, int, S_IRUGO);\n MODULE_PARM_DESC(nowayout,\n \t\t \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static void ni903x_start(struct ni903x_wdt wdt)\n {\ndiff --git a/drivers/watchdog/nic7018_wdt.c b/drivers/watchdog/nic7018_wdt.c\nindex 8169423801f06..2b122ba8733a5 100644\n--- a/drivers/watchdog/nic7018_wdt.c\n+++ b/drivers/watchdog/nic7018_wdt.c\n@@ -8,6 +8,7 @@\n #include \u003clinux/io.h\u003e\n #include \u003clinux/module.h\u003e\n #include \u003clinux/platform_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/types.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n@@ -34,13 +35,13 @@ static unsigned int timeout;\n module_param(timeout, uint, 0);\n MODULE_PARM_DESC(timeout,\n \t\t \"Watchdog timeout in seconds. (default=\"\n-\t\t __MODULE_STRING(WDT_DEFAULT_TIMEOUT) \")\");\n+\t\t __stringify(WDT_DEFAULT_TIMEOUT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t \"Watchdog cannot be stopped once started. (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n struct nic7018_wdt {\n \tu16 io_base;\ndiff --git a/drivers/watchdog/nv_tco.c b/drivers/watchdog/nv_tco.c\nindex f16cee5173d50..0d671b8bb3914 100644\n--- a/drivers/watchdog/nv_tco.c\n+++ b/drivers/watchdog/nv_tco.c\n@@ -32,6 +32,7 @@\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/uaccess.h\u003e\n #include \u003clinux/io.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #include \"nv_tco.h\"\n \n@@ -55,12 +56,12 @@ static struct platform_device nv_tco_platform_device;\n static int heartbeat = WATCHDOG_HEARTBEAT; /* in seconds /\n module_param(heartbeat, int, 0);\n MODULE_PARM_DESC(heartbeat, \"Watchdog heartbeat in seconds. (2\u003cheartbeat\u003c39, \"\n-\t\t\t \"default=\" __MODULE_STRING(WATCHDOG_HEARTBEAT) \")\");\n+\t\t\t \"default=\" __stringify(WATCHDOG_HEARTBEAT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started\"\n-\t\t\" (default=\" __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\" (default=\" __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n /\n * Some TCO specific functions\ndiff --git a/drivers/watchdog/octeon-wdt-main.c b/drivers/watchdog/octeon-wdt-main.c\nindex 0615bb8160821..171b46d780e6f 100644\n--- a/drivers/watchdog/octeon-wdt-main.c\n+++ b/drivers/watchdog/octeon-wdt-main.c\n@@ -55,6 +55,7 @@\n #include \u003clinux/cpu.h\u003e\n #include \u003clinux/irq.h\u003e\n #include \u003clinux/irqdomain.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #include \u003casm/mipsregs.h\u003e\n #include \u003casm/uasm.h\u003e\n@@ -93,13 +94,13 @@ static int heartbeat = WD_TIMO;\n module_param(heartbeat, int, 0444);\n MODULE_PARM_DESC(heartbeat,\n \t\"Watchdog heartbeat in seconds. (0 \u003c heartbeat, default=\"\n-\t\t\t\t__MODULE_STRING(WD_TIMO) \")\");\n+\t\t\t\t__stringify(WD_TIMO) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0444);\n MODULE_PARM_DESC(nowayout,\n \t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static int disable;\n module_param(disable, int, 0444);\ndiff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c\nindex 95c7e44b7baac..2a6de73e6f0b3 100644\n--- a/drivers/watchdog/omap_wdt.c\n+++ b/drivers/watchdog/omap_wdt.c\n@@ -38,6 +38,7 @@\n #include \u003clinux/io.h\u003e\n #include \u003clinux/slab.h\u003e\n #include \u003clinux/pm_runtime.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/platform_data/omap-wd-timer.h\u003e\n \n #include \"omap_wdt.h\"\n@@ -45,7 +46,7 @@\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started \"\n-\t\"(default=\" __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\"(default=\" __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static unsigned timer_margin;\n module_param(timer_margin, uint, 0);\ndiff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c\nindex 0ea946823b0a7..5d56e93f04064 100644\n--- a/drivers/watchdog/orion_wdt.c\n+++ b/drivers/watchdog/orion_wdt.c\n@@ -22,6 +22,7 @@\n #include \u003clinux/err.h\u003e\n #include \u003clinux/of.h\u003e\n #include \u003clinux/of_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n /* RSTOUT mask register physical address for Orion5x, Kirkwood and Dove /\n #define ORION_RSTOUT_MASK_OFFSET\t0x20108\n@@ -687,7 +688,7 @@ MODULE_PARM_DESC(heartbeat, \"Initial watchdog heartbeat in seconds\");\n \n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n MODULE_LICENSE(\"GPL v2\");\n MODULE_ALIAS(\"platform:orion_wdt\");\ndiff --git a/drivers/watchdog/pc87413_wdt.c b/drivers/watchdog/pc87413_wdt.c\nindex fbf835d112b84..29dab0e669bfb 100644\n--- a/drivers/watchdog/pc87413_wdt.c\n+++ b/drivers/watchdog/pc87413_wdt.c\n@@ -30,6 +30,7 @@\n #include \u003clinux/moduleparam.h\u003e\n #include \u003clinux/io.h\u003e\n #include \u003clinux/uaccess.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n \n / #define DEBUG 1 /\n@@ -577,15 +578,15 @@ MODULE_LICENSE(\"GPL\");\n \n module_param_hw(io, int, ioport, 0);\n MODULE_PARM_DESC(io, MODNAME \" I/O port (default: \"\n-\t\t\t\t\t__MODULE_STRING(IO_DEFAULT) \").\");\n+\t\t\t\t\t__stringify(IO_DEFAULT) \").\");\n \n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout,\n \t\t\"Watchdog timeout in minutes (default=\"\n-\t\t\t\t__MODULE_STRING(DEFAULT_TIMEOUT) \").\");\n+\t\t\t\t__stringify(DEFAULT_TIMEOUT) \").\");\n \n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \ndiff --git a/drivers/watchdog/pcwd.c b/drivers/watchdog/pcwd.c\nindex d4ea7d6ccd6a7..3370a91552766 100644\n--- a/drivers/watchdog/pcwd.c\n+++ b/drivers/watchdog/pcwd.c\n@@ -72,6 +72,7 @@\n #include \u003clinux/spinlock.h\u003e\t/ For spin_lock/spin_unlock/... /\n #include \u003clinux/uaccess.h\u003e\t/ For copy_to_user/put_user/... /\n #include \u003clinux/io.h\u003e\t\t/ For inb/outb/... /\n+#include \u003clinux/stringify.h\u003e\t/ For __stringify /\n \n / Module and version information /\n #define WATCHDOG_VERSION \"1.20\"\n@@ -203,13 +204,13 @@ static int heartbeat = WATCHDOG_HEARTBEAT;\n module_param(heartbeat, int, 0);\n MODULE_PARM_DESC(heartbeat, \"Watchdog heartbeat in seconds. \"\n \t\"(2 \u003c= heartbeat \u003c= 7200 or 0=delay-time from dip-switches, default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_HEARTBEAT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_HEARTBEAT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n /\n \tInternal functions\ndiff --git a/drivers/watchdog/pcwd_pci.c b/drivers/watchdog/pcwd_pci.c\nindex a489b426f2ba6..377e5a61faef8 100644\n--- a/drivers/watchdog/pcwd_pci.c\n+++ b/drivers/watchdog/pcwd_pci.c\n@@ -47,6 +47,7 @@\n #include \u003clinux/spinlock.h\u003e\t/ For spin_lock/spin_unlock/... /\n #include \u003clinux/uaccess.h\u003e\t/ For copy_to_user/put_user/... /\n #include \u003clinux/io.h\u003e\t\t/ For inb/outb/... /\n+#include \u003clinux/stringify.h\u003e\t/ For __stringify /\n \n / Module and version information /\n #define WATCHDOG_VERSION \"1.03\"\n@@ -140,12 +141,12 @@ static int heartbeat = WATCHDOG_HEARTBEAT;\n module_param(heartbeat, int, 0);\n MODULE_PARM_DESC(heartbeat, \"Watchdog heartbeat in seconds. \"\n \t\"(0\u003cheartbeat\u003c65536 or 0=delay-time from dip-switches, default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_HEARTBEAT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_HEARTBEAT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n /\n \tInternal functions\ndiff --git a/drivers/watchdog/pcwd_usb.c b/drivers/watchdog/pcwd_usb.c\nindex d7c18c990649a..15511c816add4 100644\n--- a/drivers/watchdog/pcwd_usb.c\n+++ b/drivers/watchdog/pcwd_usb.c\n@@ -39,6 +39,7 @@\n #include \u003clinux/mutex.h\u003e\t/ For mutex locking /\n #include \u003clinux/hid.h\u003e\t\t/ For HID_REQ_SET_REPORT \u0026 HID_DT_REPORT /\n #include \u003clinux/uaccess.h\u003e\t/ For copy_to_user/put_user/... /\n+#include \u003clinux/stringify.h\u003e\t/ For __stringify /\n \n \n / Module and Version Information /\n@@ -57,12 +58,12 @@ static int heartbeat = WATCHDOG_HEARTBEAT;\n module_param(heartbeat, int, 0);\n MODULE_PARM_DESC(heartbeat, \"Watchdog heartbeat in seconds. \"\n \t\"(0\u003cheartbeat\u003c65536 or 0=delay-time from dip-switches, default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_HEARTBEAT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_HEARTBEAT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n / The vendor and product id's for the USB-PC Watchdog card /\n #define USB_PCWD_VENDOR_ID\t0x0c98\ndiff --git a/drivers/watchdog/pika_wdt.c b/drivers/watchdog/pika_wdt.c\nindex 87b8988d25206..09fc76aaa0513 100644\n--- a/drivers/watchdog/pika_wdt.c\n+++ b/drivers/watchdog/pika_wdt.c\n@@ -25,6 +25,7 @@\n #include \u003clinux/io.h\u003e\n #include \u003clinux/of.h\u003e\n #include \u003clinux/of_address.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define DRV_NAME \"PIKA-WDT\"\n \n@@ -39,12 +40,12 @@\n static int heartbeat = WDT_HEARTBEAT;\n module_param(heartbeat, int, 0);\n MODULE_PARM_DESC(heartbeat, \"Watchdog heartbeats in seconds. \"\n-\t\"(default = \" __MODULE_STRING(WDT_HEARTBEAT) \")\");\n+\t\"(default = \" __stringify(WDT_HEARTBEAT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started \"\n-\t\"(default=\" __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\"(default=\" __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static struct {\n \tvoid __iomem fpga;\ndiff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c\nindex 87a44a5675a14..a7c39849cbfdc 100644\n--- a/drivers/watchdog/pnx4008_wdt.c\n+++ b/drivers/watchdog/pnx4008_wdt.c\n@@ -30,6 +30,7 @@\n #include \u003clinux/of.h\u003e\n #include \u003clinux/delay.h\u003e\n #include \u003clinux/reboot.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n /* WatchDog Timer - Chapter 23 Page 207 /\n \n@@ -237,8 +238,8 @@ MODULE_DESCRIPTION(\"PNX4008 Watchdog Driver\");\n module_param(heartbeat, uint, 0);\n MODULE_PARM_DESC(heartbeat,\n \t\t \"Watchdog heartbeat period in seconds from 1 to \"\n-\t\t __MODULE_STRING(MAX_HEARTBEAT) \", default \"\n-\t\t __MODULE_STRING(DEFAULT_HEARTBEAT));\n+\t\t __stringify(MAX_HEARTBEAT) \", default \"\n+\t\t __stringify(DEFAULT_HEARTBEAT));\n \n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\ndiff --git a/drivers/watchdog/pseries-wdt.c b/drivers/watchdog/pseries-wdt.c\nindex e97b943e1d3c5..5f531a03a0fc6 100644\n--- a/drivers/watchdog/pseries-wdt.c\n+++ b/drivers/watchdog/pseries-wdt.c\n@@ -10,6 +10,7 @@\n #include \u003clinux/module.h\u003e\n #include \u003clinux/moduleparam.h\u003e\n #include \u003clinux/platform_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/time64.h\u003e\n #include \u003clinux/watchdog.h\u003e\n #include \u003casm/papr-watchdog.h\u003e\n@@ -26,18 +27,18 @@ static const unsigned long pseries_wdt_action[] = {\n static unsigned int action = WATCHDOG_ACTION;\n module_param(action, uint, 0444);\n MODULE_PARM_DESC(action, \"Action taken when watchdog expires (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_ACTION) \")\");\n+\t\t __stringify(WATCHDOG_ACTION) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0444);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n #define WATCHDOG_TIMEOUT 60\n static unsigned int timeout = WATCHDOG_TIMEOUT;\n module_param(timeout, uint, 0444);\n MODULE_PARM_DESC(timeout, \"Initial watchdog timeout in seconds (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_TIMEOUT) \")\");\n+\t\t __stringify(WATCHDOG_TIMEOUT) \")\");\n \n struct pseries_wdt {\n \tstruct watchdog_device wd;\ndiff --git a/drivers/watchdog/rc32434_wdt.c b/drivers/watchdog/rc32434_wdt.c\nindex 0e5c5c96af58d..5301a93abf55f 100644\n--- a/drivers/watchdog/rc32434_wdt.c\n+++ b/drivers/watchdog/rc32434_wdt.c\n@@ -27,6 +27,7 @@\n #include \u003clinux/spinlock.h\u003e\t\t/ For spin_lock/spin_unlock/... /\n #include \u003clinux/uaccess.h\u003e\t\t/ For copy_to_user/put_user/... /\n #include \u003clinux/io.h\u003e\t\t\t/ For devm_ioremap /\n+#include \u003clinux/stringify.h\u003e\t\t/ For __stringify /\n \n #include \u003casm/mach-rc32434/integ.h\u003e\t/ For the Watchdog registers /\n \n@@ -57,12 +58,12 @@ extern unsigned int idt_cpu_freq;\n static int timeout = WATCHDOG_TIMEOUT;\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout, \"Watchdog timeout value, in seconds (default=\"\n-\t\t__MODULE_STRING(WATCHDOG_TIMEOUT) \")\");\n+\t\t__stringify(WATCHDOG_TIMEOUT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n / apply or and nand masks to data read from addr and write back /\n #define SET_BITS(addr, or, nand) \\\ndiff --git a/drivers/watchdog/renesas_wdt.c b/drivers/watchdog/renesas_wdt.c\nindex 97bcd32bade52..8c0041ce55521 100644\n--- a/drivers/watchdog/renesas_wdt.c\n+++ b/drivers/watchdog/renesas_wdt.c\n@@ -16,6 +16,7 @@\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/pm_runtime.h\u003e\n #include \u003clinux/smp.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/sys_soc.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n@@ -44,7 +45,7 @@ static const unsigned int clk_divs[] = { 1, 4, 16, 32, 64, 128, 1024, 4096 };\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n struct rwdt_priv {\n \tvoid __iomem base;\ndiff --git a/drivers/watchdog/rn5t618_wdt.c b/drivers/watchdog/rn5t618_wdt.c\nindex 87d06d210ac9e..14056af36445c 100644\n--- a/drivers/watchdog/rn5t618_wdt.c\n+++ b/drivers/watchdog/rn5t618_wdt.c\n@@ -9,6 +9,7 @@\n #include \u003clinux/mfd/rn5t618.h\u003e\n #include \u003clinux/module.h\u003e\n #include \u003clinux/platform_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n #define DRIVER_NAME \"rn5t618-wdt\"\n@@ -21,7 +22,7 @@ MODULE_PARM_DESC(timeout, \"Initial watchdog timeout in seconds\");\n \n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n struct rn5t618_wdt {\n \tstruct watchdog_device wdt_dev;\ndiff --git a/drivers/watchdog/rt2880_wdt.c b/drivers/watchdog/rt2880_wdt.c\nindex c8edd83bb502e..38f31d302a4b3 100644\n--- a/drivers/watchdog/rt2880_wdt.c\n+++ b/drivers/watchdog/rt2880_wdt.c\n@@ -15,6 +15,7 @@\n #include \u003clinux/watchdog.h\u003e\n #include \u003clinux/moduleparam.h\u003e\n #include \u003clinux/platform_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #include \u003casm/mach-ralink/ralink_regs.h\u003e\n \n@@ -51,7 +52,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t\"Watchdog cannot be stopped once started (default=\"\n-\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static inline void rt_wdt_w32(void __iomem base, unsigned int reg, u32 val)\n {\ndiff --git a/drivers/watchdog/rti_wdt.c b/drivers/watchdog/rti_wdt.c\nindex 7c1bd83b056a8..6a64adbe1a8ea 100644\n--- a/drivers/watchdog/rti_wdt.c\n+++ b/drivers/watchdog/rti_wdt.c\n@@ -17,6 +17,7 @@\n #include \u003clinux/of_reserved_mem.h\u003e\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/pm_runtime.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/types.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n@@ -414,8 +415,8 @@ MODULE_DESCRIPTION(\"K3 RTI Watchdog Driver\");\n module_param(heartbeat, int, 0);\n MODULE_PARM_DESC(heartbeat,\n \t\t \"Watchdog heartbeat period in seconds from 1 to \"\n-\t\t __MODULE_STRING(MAX_HEARTBEAT) \", default \"\n-\t\t __MODULE_STRING(DEFAULT_HEARTBEAT));\n+\t\t __stringify(MAX_HEARTBEAT) \", default \"\n+\t\t __stringify(DEFAULT_HEARTBEAT));\n \n MODULE_LICENSE(\"GPL\");\n MODULE_ALIAS(\"platform:rti-wdt\");\ndiff --git a/drivers/watchdog/rzg2l_wdt.c b/drivers/watchdog/rzg2l_wdt.c\nindex 509f9dffdacde..592ea7ce6d69a 100644\n--- a/drivers/watchdog/rzg2l_wdt.c\n+++ b/drivers/watchdog/rzg2l_wdt.c\n@@ -14,6 +14,7 @@\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/pm_domain.h\u003e\n #include \u003clinux/pm_runtime.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/reset.h\u003e\n #include \u003clinux/units.h\u003e\n #include \u003clinux/watchdog.h\u003e\n@@ -41,7 +42,7 @@\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n enum rz_wdt_type {\n \tWDT_RZG2L,\ndiff --git a/drivers/watchdog/rzv2h_wdt.c b/drivers/watchdog/rzv2h_wdt.c\nindex 83540dd9a37b6..a8db85e85c73a 100644\n--- a/drivers/watchdog/rzv2h_wdt.c\n+++ b/drivers/watchdog/rzv2h_wdt.c\n@@ -13,6 +13,7 @@\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/pm_runtime.h\u003e\n #include \u003clinux/reset.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/units.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n@@ -48,7 +49,7 @@\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n enum rzv2h_wdt_count_source {\n \tCOUNT_SOURCE_LOCO,\ndiff --git a/drivers/watchdog/s32g_wdt.c b/drivers/watchdog/s32g_wdt.c\nindex 6422a694fc65f..bd8740153c17f 100644\n--- a/drivers/watchdog/s32g_wdt.c\n+++ b/drivers/watchdog/s32g_wdt.c\n@@ -13,6 +13,7 @@\n #include \u003clinux/moduleparam.h\u003e\n #include \u003clinux/of.h\u003e\n #include \u003clinux/platform_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n #define DRIVER_NAME \"s32g-swt\"\n@@ -42,12 +43,12 @@ struct s32g_wdt_device {\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static unsigned int timeout_param = S32G_WDT_DEFAULT_TIMEOUT;\n module_param(timeout_param, uint, 0);\n MODULE_PARM_DESC(timeout_param, \"Watchdog timeout in seconds (default=\"\n-\t\t __MODULE_STRING(S32G_WDT_DEFAULT_TIMEOUT) \")\");\n+\t\t __stringify(S32G_WDT_DEFAULT_TIMEOUT) \")\");\n \n static bool early_enable;\n module_param(early_enable, bool, 0);\ndiff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c\nindex e31f93db05096..8ae60b919c120 100644\n--- a/drivers/watchdog/s3c2410_wdt.c\n+++ b/drivers/watchdog/s3c2410_wdt.c\n@@ -28,6 +28,7 @@\n #include \u003clinux/regmap.h\u003e\n #include \u003clinux/delay.h\u003e\n #include \u003clinux/math64.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define S3C2410_WTCON\t\t0x00\n #define S3C2410_WTDAT\t\t0x04\n@@ -154,12 +155,12 @@ module_param(nowayout, bool, 0);\n module_param(soft_noboot, int, 0);\n \n MODULE_PARM_DESC(tmr_margin, \"Watchdog tmr_margin in seconds. (default=\"\n-\t\t__MODULE_STRING(S3C2410_WATCHDOG_DEFAULT_TIME) \")\");\n+\t\t__stringify(S3C2410_WATCHDOG_DEFAULT_TIME) \")\");\n MODULE_PARM_DESC(tmr_atboot,\n \t\t\"Watchdog is started at boot time if set to 1, default=\"\n-\t\t\t__MODULE_STRING(S3C2410_WATCHDOG_ATBOOT));\n+\t\t\t__stringify(S3C2410_WATCHDOG_ATBOOT));\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n MODULE_PARM_DESC(soft_noboot, \"Watchdog action, set to 1 to ignore reboots, 0 to reboot (default 0)\");\n \n /\ndiff --git a/drivers/watchdog/sama5d4_wdt.c b/drivers/watchdog/sama5d4_wdt.c\nindex ecdd9aeab79cc..85efe4db40f0b 100644\n--- a/drivers/watchdog/sama5d4_wdt.c\n+++ b/drivers/watchdog/sama5d4_wdt.c\n@@ -14,6 +14,7 @@\n #include \u003clinux/of_irq.h\u003e\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/reboot.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n #include \"at91sam9_wdt.h\"\n@@ -42,12 +43,12 @@ static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(wdt_timeout, int, 0);\n MODULE_PARM_DESC(wdt_timeout,\n \t\"Watchdog timeout in seconds. (default = \"\n-\t__MODULE_STRING(WDT_DEFAULT_TIMEOUT) \")\");\n+\t__stringify(WDT_DEFAULT_TIMEOUT) \")\");\n \n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\"Watchdog cannot be stopped once started (default=\"\n-\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static inline bool wdt_enabled(struct sama5d4_wdt wdt)\n {\ndiff --git a/drivers/watchdog/sbc60xxwdt.c b/drivers/watchdog/sbc60xxwdt.c\nindex 03eaf48c8f0f1..fffe58dcbf934 100644\n--- a/drivers/watchdog/sbc60xxwdt.c\n+++ b/drivers/watchdog/sbc60xxwdt.c\n@@ -58,6 +58,7 @@\n #include \u003clinux/init.h\u003e\n #include \u003clinux/io.h\u003e\n #include \u003clinux/uaccess.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n \n #define OUR_NAME \"sbc60xxwdt\"\n@@ -98,13 +99,13 @@ static int timeout = WATCHDOG_TIMEOUT;\t/* in seconds, multiplied by HZ to\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout,\n \t\"Watchdog timeout in seconds. (1\u003c=timeout\u003c=3600, default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_TIMEOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_TIMEOUT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static void wdt_timer_ping(struct timer_list );\n static DEFINE_TIMER(timer, wdt_timer_ping);\ndiff --git a/drivers/watchdog/sbc7240_wdt.c b/drivers/watchdog/sbc7240_wdt.c\nindex 21a1f0b32070b..077abbdbf5828 100644\n--- a/drivers/watchdog/sbc7240_wdt.c\n+++ b/drivers/watchdog/sbc7240_wdt.c\n@@ -23,6 +23,7 @@\n #include \u003clinux/io.h\u003e\n #include \u003clinux/uaccess.h\u003e\n #include \u003clinux/atomic.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define SBC7240_ENABLE_PORT\t\t0x443\n #define SBC7240_DISABLE_PORT\t\t0x043\n@@ -34,8 +35,8 @@\n static int timeout = SBC7240_TIMEOUT;\t/ in seconds /\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout, \"Watchdog timeout in seconds. (1\u003c=timeout\u003c=\"\n-\t\t __MODULE_STRING(SBC7240_MAX_TIMEOUT) \", default=\"\n-\t\t __MODULE_STRING(SBC7240_TIMEOUT) \")\");\n+\t\t __stringify(SBC7240_MAX_TIMEOUT) \", default=\"\n+\t\t __stringify(SBC7240_TIMEOUT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\ndiff --git a/drivers/watchdog/sbc8360.c b/drivers/watchdog/sbc8360.c\nindex a9fd1615b4c38..dafef1df97191 100644\n--- a/drivers/watchdog/sbc8360.c\n+++ b/drivers/watchdog/sbc8360.c\n@@ -48,6 +48,7 @@\n #include \u003clinux/moduleparam.h\u003e\n #include \u003clinux/io.h\u003e\n #include \u003clinux/uaccess.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n \n static unsigned long sbc8360_is_open;\n@@ -199,7 +200,7 @@ MODULE_PARM_DESC(timeout, \"Index into timeout table (0-63) (default=27 (60s))\");\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t \"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n /\n \tKernel methods.\ndiff --git a/drivers/watchdog/sbc_epx_c3.c b/drivers/watchdog/sbc_epx_c3.c\nindex 1d291dc0a4a69..b17bd1db7b103 100644\n--- a/drivers/watchdog/sbc_epx_c3.c\n+++ b/drivers/watchdog/sbc_epx_c3.c\n@@ -25,6 +25,7 @@\n #include \u003clinux/ioport.h\u003e\n #include \u003clinux/uaccess.h\u003e\n #include \u003clinux/io.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n static int epx_c3_alive;\n \n@@ -33,7 +34,7 @@ static int epx_c3_alive;\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n #define EPXC3_WATCHDOG_CTL_REG 0x1ee / write 1 to enable, 0 to disable /\n #define EPXC3_WATCHDOG_PET_REG 0x1ef / write anything to pet once enabled /\ndiff --git a/drivers/watchdog/sbsa_gwdt.c b/drivers/watchdog/sbsa_gwdt.c\nindex e04d42cc7774d..3d271b1efb560 100644\n--- a/drivers/watchdog/sbsa_gwdt.c\n+++ b/drivers/watchdog/sbsa_gwdt.c\n@@ -46,6 +46,7 @@\n #include \u003clinux/module.h\u003e\n #include \u003clinux/moduleparam.h\u003e\n #include \u003clinux/platform_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/uaccess.h\u003e\n #include \u003clinux/watchdog.h\u003e\n #include \u003casm/arch_timer.h\u003e\n@@ -103,7 +104,7 @@ static unsigned int timeout;\n module_param(timeout, uint, 0);\n MODULE_PARM_DESC(timeout,\n \t\t \"Watchdog timeout in seconds. (\u003e=0, default=\"\n-\t\t __MODULE_STRING(DEFAULT_TIMEOUT) \")\");\n+\t\t __stringify(DEFAULT_TIMEOUT) \")\");\n \n /\n * action refers to action taken when watchdog gets WS0\n@@ -120,7 +121,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, S_IRUGO);\n MODULE_PARM_DESC(nowayout,\n \t\t \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n /\n Arm Base System Architecture 1.0 introduces watchdog v1 which\ndiff --git a/drivers/watchdog/sc1200wdt.c b/drivers/watchdog/sc1200wdt.c\nindex 1d3300c98d43e..34cd57420c86d 100644\n--- a/drivers/watchdog/sc1200wdt.c\n+++ b/drivers/watchdog/sc1200wdt.c\n@@ -42,6 +42,7 @@\n #include \u003clinux/semaphore.h\u003e\n #include \u003clinux/io.h\u003e\n #include \u003clinux/uaccess.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define SC1200_MODULE_VER\t\"build 20020303\"\n #define SC1200_MODULE_NAME\t\"sc1200wdt\"\n@@ -92,7 +93,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n \n \ndiff --git a/drivers/watchdog/sch311x_wdt.c b/drivers/watchdog/sch311x_wdt.c\nindex 9670a1ea57cbd..a2a0b5c2b55b7 100644\n--- a/drivers/watchdog/sch311x_wdt.c\n+++ b/drivers/watchdog/sch311x_wdt.c\n@@ -31,6 +31,7 @@\n #include \u003clinux/spinlock.h\u003e\t\t/* For spin_lock/spin_unlock/... /\n #include \u003clinux/uaccess.h\u003e\t\t/ For copy_to_user/put_user/... /\n #include \u003clinux/io.h\u003e\t\t\t/ For inb/outb/... /\n+#include \u003clinux/stringify.h\u003e\t\t/ For __stringify /\n \n / Module and version information /\n #define DRV_NAME\t\"sch311x_wdt\"\n@@ -68,13 +69,13 @@ static int timeout = WATCHDOG_TIMEOUT;\t/ in seconds /\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout,\n \t\"Watchdog timeout in seconds. 1\u003c= timeout \u003c=15300, default=\"\n-\t\t__MODULE_STRING(WATCHDOG_TIMEOUT) \".\");\n+\t\t__stringify(WATCHDOG_TIMEOUT) \".\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\"Watchdog cannot be stopped once started (default=\"\n-\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n /\n \tSuper-IO functions\ndiff --git a/drivers/watchdog/shwdt.c b/drivers/watchdog/shwdt.c\nindex 719f100aae60d..8adecf54b9bc8 100644\n--- a/drivers/watchdog/shwdt.c\n+++ b/drivers/watchdog/shwdt.c\n@@ -30,6 +30,7 @@\n #include \u003clinux/io.h\u003e\n #include \u003clinux/clk.h\u003e\n #include \u003clinux/err.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003casm/watchdog.h\u003e\n \n #define DRV_NAME \"sh-wdt\"\n@@ -329,14 +330,14 @@ MODULE_ALIAS(\"platform:\" DRV_NAME);\n module_param(clock_division_ratio, int, 0);\n MODULE_PARM_DESC(clock_division_ratio,\n \t\"Clock division ratio. Valid ranges are from 0x5 (1.31ms) \"\n-\t\"to 0x7 (5.25ms). (default=\" __MODULE_STRING(WTCSR_CKS_4096) \")\");\n+\t\"to 0x7 (5.25ms). (default=\" __stringify(WTCSR_CKS_4096) \")\");\n \n module_param(heartbeat, int, 0);\n MODULE_PARM_DESC(heartbeat,\n \t\"Watchdog heartbeat in seconds. (1 \u003c= heartbeat \u003c= 3600, default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_HEARTBEAT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_HEARTBEAT) \")\");\n \n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\ndiff --git a/drivers/watchdog/simatic-ipc-wdt.c b/drivers/watchdog/simatic-ipc-wdt.c\nindex 1e91f0a560ffc..addeecccf2e9b 100644\n--- a/drivers/watchdog/simatic-ipc-wdt.c\n+++ b/drivers/watchdog/simatic-ipc-wdt.c\n@@ -22,6 +22,7 @@\n #include \u003clinux/sizes.h\u003e\n #include \u003clinux/util_macros.h\u003e\n #include \u003clinux/watchdog.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define WD_ENABLE_IOADR\t\t\t0x62\n #define WD_TRIGGER_IOADR\t\t0x66\n@@ -42,7 +43,7 @@\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0000);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static struct resource gp_status_reg_227e_res =\n \tDEFINE_RES_IO_NAMED(GP_STATUS_REG_227E, SZ_1, KBUILD_MODNAME);\ndiff --git a/drivers/watchdog/sl28cpld_wdt.c b/drivers/watchdog/sl28cpld_wdt.c\nindex c0b5e5fff5d7a..e32b757372eb6 100644\n--- a/drivers/watchdog/sl28cpld_wdt.c\n+++ b/drivers/watchdog/sl28cpld_wdt.c\n@@ -10,6 +10,7 @@\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/property.h\u003e\n #include \u003clinux/regmap.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n /\n@@ -30,7 +31,7 @@\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static int timeout;\n module_param(timeout, int, 0);\ndiff --git a/drivers/watchdog/smsc37b787_wdt.c b/drivers/watchdog/smsc37b787_wdt.c\nindex 9f2c2ab4e2f15..0ee36ae3113e0 100644\n--- a/drivers/watchdog/smsc37b787_wdt.c\n+++ b/drivers/watchdog/smsc37b787_wdt.c\n@@ -55,6 +55,7 @@\n #include \u003clinux/spinlock.h\u003e\n #include \u003clinux/io.h\u003e\n #include \u003clinux/uaccess.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n \n /* enable support for minutes as units? /\n@@ -611,4 +612,4 @@ MODULE_PARM_DESC(timeout, \"range is 1-255 units, default is 60\");\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\ndiff --git a/drivers/watchdog/softdog.c b/drivers/watchdog/softdog.c\nindex 0820e35ad2e3c..0ff125958b8a2 100644\n--- a/drivers/watchdog/softdog.c\n+++ b/drivers/watchdog/softdog.c\n@@ -24,6 +24,7 @@\n #include \u003clinux/module.h\u003e\n #include \u003clinux/moduleparam.h\u003e\n #include \u003clinux/reboot.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/types.h\u003e\n #include \u003clinux/watchdog.h\u003e\n #include \u003clinux/workqueue.h\u003e\n@@ -33,13 +34,13 @@ static unsigned int soft_margin = TIMER_MARGIN;\t/ in seconds /\n module_param(soft_margin, uint, 0);\n MODULE_PARM_DESC(soft_margin,\n \t\"Watchdog soft_margin in seconds. (0 \u003c soft_margin \u003c 65536, default=\"\n-\t\t\t\t\t__MODULE_STRING(TIMER_MARGIN) \")\");\n+\t\t\t\t\t__stringify(TIMER_MARGIN) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static int soft_noboot;\n module_param(soft_noboot, int, 0);\ndiff --git a/drivers/watchdog/sp5100_tco.c b/drivers/watchdog/sp5100_tco.c\nindex 72ad59649ccc4..c4809858a6fe3 100644\n--- a/drivers/watchdog/sp5100_tco.c\n+++ b/drivers/watchdog/sp5100_tco.c\n@@ -39,6 +39,7 @@\n #include \u003clinux/moduleparam.h\u003e\n #include \u003clinux/pci.h\u003e\n #include \u003clinux/platform_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/types.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n@@ -69,18 +70,18 @@ static struct pci_dev sp5100_tco_pci;\n static bool action = WATCHDOG_ACTION;\n module_param(action, bool, 0);\n MODULE_PARM_DESC(action, \"Action taken when watchdog expires, 0 to reset, 1 to poweroff (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_ACTION) \")\");\n+\t\t __stringify(WATCHDOG_ACTION) \")\");\n \n #define WATCHDOG_HEARTBEAT 60\t/* 60 sec default heartbeat. /\n static int heartbeat = WATCHDOG_HEARTBEAT; / in seconds /\n module_param(heartbeat, int, 0);\n MODULE_PARM_DESC(heartbeat, \"Watchdog heartbeat in seconds. (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_HEARTBEAT) \")\");\n+\t\t __stringify(WATCHDOG_HEARTBEAT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started.\"\n-\t\t\" (default=\" __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\" (default=\" __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n /\n * Some TCO specific functions\ndiff --git a/drivers/watchdog/starfive-wdt.c b/drivers/watchdog/starfive-wdt.c\nindex 5a3254c83d3bb..044b4fdb73505 100644\n--- a/drivers/watchdog/starfive-wdt.c\n+++ b/drivers/watchdog/starfive-wdt.c\n@@ -12,6 +12,7 @@\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/pm_runtime.h\u003e\n #include \u003clinux/reset.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n /* JH7100 Watchdog register define /\n@@ -72,12 +73,12 @@ module_param(early_enable, bool, 0);\n module_param(nowayout, bool, 0);\n \n MODULE_PARM_DESC(heartbeat, \"Watchdog heartbeat in seconds. (default=\"\n-\t\t __MODULE_STRING(STARFIVE_WDT_DEFAULT_TIME) \")\");\n+\t\t __stringify(STARFIVE_WDT_DEFAULT_TIME) \")\");\n MODULE_PARM_DESC(early_enable,\n \t\t \"Watchdog is started at boot time if set to 1, default=\"\n-\t\t __MODULE_STRING(STARFIVE_WDT_EARLY_ENA));\n+\t\t __stringify(STARFIVE_WDT_EARLY_ENA));\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n struct starfive_wdt_variant {\n \tunsigned int control;\t\t/ Watchdog Control Register for reset enable /\ndiff --git a/drivers/watchdog/stmp3xxx_rtc_wdt.c b/drivers/watchdog/stmp3xxx_rtc_wdt.c\nindex 060447101f486..c9cbf9728a2ae 100644\n--- a/drivers/watchdog/stmp3xxx_rtc_wdt.c\n+++ b/drivers/watchdog/stmp3xxx_rtc_wdt.c\n@@ -13,6 +13,7 @@\n #include \u003clinux/stmp3xxx_rtc_wdt.h\u003e\n #include \u003clinux/notifier.h\u003e\n #include \u003clinux/reboot.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define WDOG_TICK_RATE 1000 / 1 kHz clock /\n #define STMP3XXX_DEFAULT_TIMEOUT 19\n@@ -21,8 +22,8 @@\n static int heartbeat = STMP3XXX_DEFAULT_TIMEOUT;\n module_param(heartbeat, uint, 0);\n MODULE_PARM_DESC(heartbeat, \"Watchdog heartbeat period in seconds from 1 to \"\n-\t\t __MODULE_STRING(STMP3XXX_MAX_TIMEOUT) \", default \"\n-\t\t __MODULE_STRING(STMP3XXX_DEFAULT_TIMEOUT));\n+\t\t __stringify(STMP3XXX_MAX_TIMEOUT) \", default \"\n+\t\t __stringify(STMP3XXX_DEFAULT_TIMEOUT));\n \n static int wdt_start(struct watchdog_device wdd)\n {\ndiff --git a/drivers/watchdog/stpmic1_wdt.c b/drivers/watchdog/stpmic1_wdt.c\nindex 45d0c543466fd..17f0cdecd22c3 100644\n--- a/drivers/watchdog/stpmic1_wdt.c\n+++ b/drivers/watchdog/stpmic1_wdt.c\n@@ -9,6 +9,7 @@\n #include \u003clinux/of.h\u003e\n #include \u003clinux/regmap.h\u003e\n #include \u003clinux/slab.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n /* WATCHDOG CONTROL REGISTER bit /\n@@ -25,7 +26,7 @@\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n struct stpmic1_wdt {\n \tstruct stpmic1 pmic;\ndiff --git a/drivers/watchdog/sun4v_wdt.c b/drivers/watchdog/sun4v_wdt.c\nindex 8db86ad5ee3df..ad56d778776e7 100644\n--- a/drivers/watchdog/sun4v_wdt.c\n+++ b/drivers/watchdog/sun4v_wdt.c\n@@ -15,6 +15,7 @@\n #include \u003clinux/kernel.h\u003e\n #include \u003clinux/module.h\u003e\n #include \u003clinux/moduleparam.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n #include \u003casm/hypervisor.h\u003e\n #include \u003casm/mdesc.h\u003e\n@@ -27,12 +28,12 @@\n static unsigned int timeout;\n module_param(timeout, uint, 0);\n MODULE_PARM_DESC(timeout, \"Watchdog timeout in seconds (default=\"\n-\t__MODULE_STRING(WDT_TIMEOUT) \")\");\n+\t__stringify(WDT_TIMEOUT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, S_IRUGO);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static int sun4v_wdt_stop(struct watchdog_device wdd)\n {\ndiff --git a/drivers/watchdog/sunplus_wdt.c b/drivers/watchdog/sunplus_wdt.c\nindex ae0c11a15a051..f2e45907d882c 100644\n--- a/drivers/watchdog/sunplus_wdt.c\n+++ b/drivers/watchdog/sunplus_wdt.c\n@@ -11,6 +11,7 @@\n #include \u003clinux/module.h\u003e\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/reset.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n #define WDT_CTRL\t\t0x00\n@@ -38,7 +39,7 @@ MODULE_PARM_DESC(timeout, \"Watchdog timeout in seconds\");\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n struct sp_wdt_priv {\n \tstruct watchdog_device wdev;\ndiff --git a/drivers/watchdog/sunxi_wdt.c b/drivers/watchdog/sunxi_wdt.c\nindex 3db34524ed13b..1e55c5fd43b8a 100644\n--- a/drivers/watchdog/sunxi_wdt.c\n+++ b/drivers/watchdog/sunxi_wdt.c\n@@ -20,6 +20,7 @@\n #include \u003clinux/of.h\u003e\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/types.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n #define WDT_MAX_TIMEOUT 16\n@@ -357,7 +358,7 @@ MODULE_PARM_DESC(timeout, \"Watchdog heartbeat in seconds\");\n \n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started \"\n-\t\t\"(default=\" __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\"(default=\" __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n MODULE_LICENSE(\"GPL\");\n MODULE_AUTHOR(\"Carlo Caione \u003ccarlo.caione@gmail.com\u003e\");\ndiff --git a/drivers/watchdog/tegra_wdt.c b/drivers/watchdog/tegra_wdt.c\nindex d5de6c0657a55..6b3f65c4d593b 100644\n--- a/drivers/watchdog/tegra_wdt.c\n+++ b/drivers/watchdog/tegra_wdt.c\n@@ -9,6 +9,7 @@\n #include \u003clinux/io.h\u003e\n #include \u003clinux/of.h\u003e\n #include \u003clinux/platform_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n / minimum and maximum watchdog trigger timeout, in seconds /\n@@ -67,13 +68,13 @@ static int heartbeat = WDT_HEARTBEAT;\n module_param(heartbeat, int, 0);\n MODULE_PARM_DESC(heartbeat,\n \t\"Watchdog heartbeats in seconds. (default = \"\n-\t__MODULE_STRING(WDT_HEARTBEAT) \")\");\n+\t__stringify(WDT_HEARTBEAT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\"Watchdog cannot be stopped once started (default=\"\n-\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static int tegra_wdt_start(struct watchdog_device wdd)\n {\ndiff --git a/drivers/watchdog/tqmx86_wdt.c b/drivers/watchdog/tqmx86_wdt.c\nindex 83860e94ce9d7..1da45a3f8cf3f 100644\n--- a/drivers/watchdog/tqmx86_wdt.c\n+++ b/drivers/watchdog/tqmx86_wdt.c\n@@ -14,6 +14,7 @@\n #include \u003clinux/module.h\u003e\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/timer.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n /* default timeout (secs) /\n@@ -23,7 +24,7 @@ static unsigned int timeout;\n module_param(timeout, uint, 0);\n MODULE_PARM_DESC(timeout,\n \t\"Watchdog timeout in seconds. (1\u003c=timeout\u003c=4096, default=\"\n-\t\t\t\t__MODULE_STRING(WDT_TIMEOUT) \")\");\n+\t\t\t\t__stringify(WDT_TIMEOUT) \")\");\n struct tqmx86_wdt {\n \tstruct watchdog_device wdd;\n \tvoid __iomem io_base;\ndiff --git a/drivers/watchdog/ts4800_wdt.c b/drivers/watchdog/ts4800_wdt.c\nindex 24b1ad52102e8..1bfc8db323c6a 100644\n--- a/drivers/watchdog/ts4800_wdt.c\n+++ b/drivers/watchdog/ts4800_wdt.c\n@@ -12,13 +12,14 @@\n #include \u003clinux/of.h\u003e\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/regmap.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\"Watchdog cannot be stopped once started (default=\"\n-\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n /* possible feed values /\n #define TS4800_WDT_FEED_2S 0x1\ndiff --git a/drivers/watchdog/twl4030_wdt.c b/drivers/watchdog/twl4030_wdt.c\nindex 69a622646d75c..d5e06dcf74d9a 100644\n--- a/drivers/watchdog/twl4030_wdt.c\n+++ b/drivers/watchdog/twl4030_wdt.c\n@@ -12,13 +12,14 @@\n #include \u003clinux/watchdog.h\u003e\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/mfd/twl.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define TWL4030_WATCHDOG_CFG_REG_OFFS\t0x3\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started \"\n-\t\"(default=\" __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\"(default=\" __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static int twl4030_wdt_write(unsigned char val)\n {\ndiff --git a/drivers/watchdog/txx9wdt.c b/drivers/watchdog/txx9wdt.c\nindex 305349844b4f1..161a779dc74d8 100644\n--- a/drivers/watchdog/txx9wdt.c\n+++ b/drivers/watchdog/txx9wdt.c\n@@ -16,6 +16,7 @@\n #include \u003clinux/clk.h\u003e\n #include \u003clinux/err.h\u003e\n #include \u003clinux/io.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003casm/txx9tmr.h\u003e\n \n #define WD_TIMER_CCD\t7\t\t/ 1/256 /\n@@ -27,14 +28,14 @@ static unsigned int timeout = TIMER_MARGIN;\t/ in seconds /\n module_param(timeout, uint, 0);\n MODULE_PARM_DESC(timeout,\n \t\"Watchdog timeout in seconds. \"\n-\t\"(0\u003ctimeout\u003c((2^\" __MODULE_STRING(TXX9_TIMER_BITS) \")/(IMCLK/256)), \"\n-\t\"default=\" __MODULE_STRING(TIMER_MARGIN) \")\");\n+\t\"(0\u003ctimeout\u003c((2^\" __stringify(TXX9_TIMER_BITS) \")/(IMCLK/256)), \"\n+\t\"default=\" __stringify(TIMER_MARGIN) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\"Watchdog cannot be stopped once started \"\n-\t\"(default=\" __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\"(default=\" __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static struct txx9_tmr_reg __iomem txx9wdt_reg;\n static struct clk txx9_imclk;\ndiff --git a/drivers/watchdog/uniphier_wdt.c b/drivers/watchdog/uniphier_wdt.c\nindex 8e9242c230222..d09fb2acfdde3 100644\n--- a/drivers/watchdog/uniphier_wdt.c\n+++ b/drivers/watchdog/uniphier_wdt.c\n@@ -13,6 +13,7 @@\n #include \u003clinux/of.h\u003e\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/regmap.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n / WDT timer setting register /\n@@ -245,12 +246,12 @@ module_platform_driver(uniphier_wdt_driver);\n module_param(timeout, uint, 0000);\n MODULE_PARM_DESC(timeout,\n \t\"Watchdog timeout seconds in power of 2. (0 \u003c timeout \u003c 128, default=\"\n-\t\t\t\t__MODULE_STRING(WDT_DEFAULT_TIMEOUT) \")\");\n+\t\t\t\t__stringify(WDT_DEFAULT_TIMEOUT) \")\");\n \n module_param(nowayout, bool, 0000);\n MODULE_PARM_DESC(nowayout,\n \t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n MODULE_AUTHOR(\"Keiji Hayashibara \u003chayashibara.keiji@socionext.com\u003e\");\n MODULE_DESCRIPTION(\"UniPhier Watchdog Device Driver\");\ndiff --git a/drivers/watchdog/via_wdt.c b/drivers/watchdog/via_wdt.c\nindex be4ca619da65a..effa9bc8d354d 100644\n--- a/drivers/watchdog/via_wdt.c\n+++ b/drivers/watchdog/via_wdt.c\n@@ -18,6 +18,7 @@\n #include \u003clinux/jiffies.h\u003e\n #include \u003clinux/module.h\u003e\n #include \u003clinux/pci.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/timer.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n@@ -56,12 +57,12 @@\n static int timeout = WDT_TIMEOUT;\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout, \"Watchdog timeout in seconds, between 1 and 1023 \"\n-\t\"(default = \" __MODULE_STRING(WDT_TIMEOUT) \")\");\n+\t\"(default = \" __stringify(WDT_TIMEOUT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started \"\n-\t\"(default = \" __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\"(default = \" __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static struct watchdog_device wdt_dev;\n static struct resource wdt_res;\ndiff --git a/drivers/watchdog/visconti_wdt.c b/drivers/watchdog/visconti_wdt.c\nindex 7795e7fbf67e6..fc4f0d4d3d554 100644\n--- a/drivers/watchdog/visconti_wdt.c\n+++ b/drivers/watchdog/visconti_wdt.c\n@@ -11,6 +11,7 @@\n #include \u003clinux/module.h\u003e\n #include \u003clinux/of.h\u003e\n #include \u003clinux/platform_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n #define WDT_CNT\t\t\t0x00\n@@ -29,7 +30,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(\n \tnowayout,\n-\t\"Watchdog cannot be stopped once started (default=\" __MODULE_STRING(WATCHDOG_NOWAYOUT)\")\");\n+\t\"Watchdog cannot be stopped once started (default=\" __stringify(WATCHDOG_NOWAYOUT)\")\");\n \n struct visconti_wdt_priv {\n \tstruct watchdog_device wdev;\ndiff --git a/drivers/watchdog/w83627hf_wdt.c b/drivers/watchdog/w83627hf_wdt.c\nindex db77599e43a06..5aa4d9c0fc001 100644\n--- a/drivers/watchdog/w83627hf_wdt.c\n+++ b/drivers/watchdog/w83627hf_wdt.c\n@@ -35,6 +35,7 @@\n #include \u003clinux/init.h\u003e\n #include \u003clinux/io.h\u003e\n #include \u003clinux/dmi.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define WATCHDOG_NAME \"w83627hf/thf/hg/dhg WDT\"\n #define WATCHDOG_TIMEOUT 60\t\t/ 60 sec default timeout /\n@@ -55,13 +56,13 @@ static int timeout;\t\t\t/ in seconds /\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout,\n \t\t\"Watchdog timeout in seconds. 1 \u003c= timeout \u003c= 255, default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_TIMEOUT) \".\");\n+\t\t\t\t__stringify(WATCHDOG_TIMEOUT) \".\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static int early_disable;\n module_param(early_disable, int, 0);\ndiff --git a/drivers/watchdog/w83877f_wdt.c b/drivers/watchdog/w83877f_wdt.c\nindex 53db59ef774b8..3187ea9d1b574 100644\n--- a/drivers/watchdog/w83877f_wdt.c\n+++ b/drivers/watchdog/w83877f_wdt.c\n@@ -54,6 +54,7 @@\n #include \u003clinux/init.h\u003e\n #include \u003clinux/io.h\u003e\n #include \u003clinux/uaccess.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define OUR_NAME \"w83877f_wdt\"\n \n@@ -84,14 +85,14 @@ static int timeout = WATCHDOG_TIMEOUT;\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout,\n \t\"Watchdog timeout in seconds. (1\u003c=timeout\u003c=3600, default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_TIMEOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_TIMEOUT) \")\");\n \n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static void wdt_timer_ping(struct timer_list );\n static DEFINE_TIMER(timer, wdt_timer_ping);\ndiff --git a/drivers/watchdog/w83977f_wdt.c b/drivers/watchdog/w83977f_wdt.c\nindex 3776030fa7c62..019fbf65eeb45 100644\n--- a/drivers/watchdog/w83977f_wdt.c\n+++ b/drivers/watchdog/w83977f_wdt.c\n@@ -25,6 +25,7 @@\n #include \u003clinux/reboot.h\u003e\n #include \u003clinux/uaccess.h\u003e\n #include \u003clinux/io.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n \n #define WATCHDOG_VERSION \"1.00\"\n@@ -49,7 +50,7 @@ static\tDEFINE_SPINLOCK(spinlock);\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout,\n \t\t\"Watchdog timeout in seconds (15..7635), default=\"\n-\t\t\t\t__MODULE_STRING(DEFAULT_TIMEOUT) \")\");\n+\t\t\t\t__stringify(DEFAULT_TIMEOUT) \")\");\n module_param(testmode, int, 0);\n MODULE_PARM_DESC(testmode, \"Watchdog testmode (1 = no reboot), default=0\");\n \n@@ -57,7 +58,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n /\n Start the watchdog\ndiff --git a/drivers/watchdog/wafer5823wdt.c b/drivers/watchdog/wafer5823wdt.c\nindex 291109349e73a..c564d51fe5a5b 100644\n--- a/drivers/watchdog/wafer5823wdt.c\n+++ b/drivers/watchdog/wafer5823wdt.c\n@@ -36,6 +36,7 @@\n #include \u003clinux/spinlock.h\u003e\n #include \u003clinux/io.h\u003e\n #include \u003clinux/uaccess.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define WATCHDOG_NAME \"Wafer 5823 WDT\"\n #define PFX WATCHDOG_NAME \": \"\n@@ -61,13 +62,13 @@ static int timeout = WD_TIMO; /* in seconds /\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout,\n \t\t\"Watchdog timeout in seconds. 1 \u003c= timeout \u003c= 255, default=\"\n-\t\t\t\t__MODULE_STRING(WD_TIMO) \".\");\n+\t\t\t\t__stringify(WD_TIMO) \".\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static void wafwdt_ping(void)\n {\ndiff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c\nindex d7895009a2de3..1e1c3431b0076 100644\n--- a/drivers/watchdog/watchdog_dev.c\n+++ b/drivers/watchdog/watchdog_dev.c\n@@ -44,6 +44,7 @@\n #include \u003clinux/types.h\u003e\t/ For standard types (like size_t) /\n #include \u003clinux/watchdog.h\u003e\t/ For watchdog specific items /\n #include \u003clinux/uaccess.h\u003e\t/ For copy_to_user/put_user/... /\n+#include \u003clinux/stringify.h\u003e\t/ For __stringify /\n \n #include \"watchdog_core.h\"\n #include \"watchdog_pretimeout.h\"\n@@ -1314,9 +1315,9 @@ int watchdog_dev_resume(struct watchdog_device wdd)\n module_param(handle_boot_enabled, bool, 0444);\n MODULE_PARM_DESC(handle_boot_enabled,\n \t\"Watchdog core auto-updates boot enabled watchdogs before userspace takes over (default=\"\n-\t__MODULE_STRING(IS_ENABLED(CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED)) \")\");\n+\t__stringify(IS_ENABLED(CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED)) \")\");\n \n module_param(open_timeout, uint, 0644);\n MODULE_PARM_DESC(open_timeout,\n \t\"Maximum time (in seconds, 0 means infinity) for userspace to take over a running watchdog (default=\"\n-\t__MODULE_STRING(CONFIG_WATCHDOG_OPEN_TIMEOUT) \")\");\n+\t__stringify(CONFIG_WATCHDOG_OPEN_TIMEOUT) \")\");\ndiff --git a/drivers/watchdog/wdat_wdt.c b/drivers/watchdog/wdat_wdt.c\nindex 55ea16e73652f..a418da46bda2c 100644\n--- a/drivers/watchdog/wdat_wdt.c\n+++ b/drivers/watchdog/wdat_wdt.c\n@@ -13,6 +13,7 @@\n #include \u003clinux/module.h\u003e\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/pm.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n #define MAX_WDAT_ACTIONS ACPI_WDAT_ACTION_RESERVED\n@@ -54,14 +55,14 @@ struct wdat_wdt {\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n #define WDAT_DEFAULT_TIMEOUT\t30\n \n static int timeout = WDAT_DEFAULT_TIMEOUT;\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout, \"Watchdog timeout in seconds (default=\"\n-\t\t __MODULE_STRING(WDAT_DEFAULT_TIMEOUT) \")\");\n+\t\t __stringify(WDAT_DEFAULT_TIMEOUT) \")\");\n \n static int wdat_wdt_read(struct wdat_wdt wdat,\n \t const struct wdat_instruction instr, u32 value)\ndiff --git a/drivers/watchdog/wdt.c b/drivers/watchdog/wdt.c\nindex 3980d60bacd82..d8681ee547eea 100644\n--- a/drivers/watchdog/wdt.c\n+++ b/drivers/watchdog/wdt.c\n@@ -43,6 +43,7 @@\n #include \u003clinux/init.h\u003e\n #include \u003clinux/io.h\u003e\n #include \u003clinux/uaccess.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #include \"wd501p.h\"\n \n@@ -60,13 +61,13 @@ static int wd_heartbeat;\n module_param(heartbeat, int, 0);\n MODULE_PARM_DESC(heartbeat,\n \t\"Watchdog heartbeat in seconds. (0 \u003c heartbeat \u003c 65536, default=\"\n-\t\t\t\t__MODULE_STRING(WD_TIMO) \")\");\n+\t\t\t\t__stringify(WD_TIMO) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n / You must set these - there is no sane way to probe for this board. /\n static int io = 0x240;\ndiff --git a/drivers/watchdog/wdt977.c b/drivers/watchdog/wdt977.c\nindex 4f449ac4dda41..f0fb82dc3c93d 100644\n--- a/drivers/watchdog/wdt977.c\n+++ b/drivers/watchdog/wdt977.c\n@@ -34,6 +34,7 @@\n #include \u003clinux/reboot.h\u003e\n #include \u003clinux/io.h\u003e\n #include \u003clinux/uaccess.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #include \u003casm/mach-types.h\u003e\n \n@@ -59,7 +60,7 @@ static\tDEFINE_SPINLOCK(spinlock);\n \n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout, \"Watchdog timeout in seconds (60..15300, default=\"\n-\t\t\t\t__MODULE_STRING(DEFAULT_TIMEOUT) \")\");\n+\t\t\t\t__stringify(DEFAULT_TIMEOUT) \")\");\n module_param(testmode, int, 0);\n MODULE_PARM_DESC(testmode, \"Watchdog testmode (1 = no reboot), default=0\");\n \n@@ -67,7 +68,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n /\n * Start the watchdog\ndiff --git a/drivers/watchdog/wdt_pci.c b/drivers/watchdog/wdt_pci.c\nindex 3918a600f2a00..4b1ef22d0df28 100644\n--- a/drivers/watchdog/wdt_pci.c\n+++ b/drivers/watchdog/wdt_pci.c\n@@ -49,6 +49,7 @@\n #include \u003clinux/pci.h\u003e\n #include \u003clinux/io.h\u003e\n #include \u003clinux/uaccess.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n \n #define WDT_IS_PCI\n@@ -72,13 +73,13 @@ static int wd_heartbeat;\n module_param(heartbeat, int, 0);\n MODULE_PARM_DESC(heartbeat,\n \t\t\"Watchdog heartbeat in seconds. (0\u003cheartbeat\u003c65536, default=\"\n-\t\t\t\t__MODULE_STRING(WD_TIMO) \")\");\n+\t\t\t\t__stringify(WD_TIMO) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n /* Support for the Fan Tachometer on the PCI-WDT501 /\n static int tachometer;\ndiff --git a/drivers/watchdog/wm831x_wdt.c b/drivers/watchdog/wm831x_wdt.c\nindex d96ad8f38bd2e..1aeb532dfebae 100644\n--- a/drivers/watchdog/wm831x_wdt.c\n+++ b/drivers/watchdog/wm831x_wdt.c\n@@ -13,6 +13,7 @@\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/watchdog.h\u003e\n #include \u003clinux/uaccess.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #include \u003clinux/mfd/wm831x/core.h\u003e\n #include \u003clinux/mfd/wm831x/pdata.h\u003e\n@@ -22,7 +23,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n struct wm831x_wdt_drvdata {\n \tstruct watchdog_device wdt;\ndiff --git a/drivers/watchdog/wm8350_wdt.c b/drivers/watchdog/wm8350_wdt.c\nindex c82c1b77d91b5..5eca195eac188 100644\n--- a/drivers/watchdog/wm8350_wdt.c\n+++ b/drivers/watchdog/wm8350_wdt.c\n@@ -14,13 +14,14 @@\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/watchdog.h\u003e\n #include \u003clinux/uaccess.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/mfd/wm8350/core.h\u003e\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static DEFINE_MUTEX(wdt_mutex);\n \ndiff --git a/drivers/watchdog/xen_wdt.c b/drivers/watchdog/xen_wdt.c\nindex b343f421dc72c..3bc323d886d0b 100644\n--- a/drivers/watchdog/xen_wdt.c\n+++ b/drivers/watchdog/xen_wdt.c\n@@ -17,6 +17,7 @@\n #include \u003clinux/module.h\u003e\n #include \u003clinux/moduleparam.h\u003e\n #include \u003clinux/platform_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n #include \u003cxen/xen.h\u003e\n #include \u003casm/xen/hypercall.h\u003e\n@@ -30,12 +31,12 @@ static time64_t wdt_expires;\n static unsigned int timeout;\n module_param(timeout, uint, S_IRUGO);\n MODULE_PARM_DESC(timeout, \"Watchdog timeout in seconds \"\n-\t\"(default=\" __MODULE_STRING(WATCHDOG_TIMEOUT) \")\");\n+\t\"(default=\" __stringify(WATCHDOG_TIMEOUT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, S_IRUGO);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started \"\n-\t\"(default=\" __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\"(default=\" __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static inline time64_t set_timeout(struct watchdog_device wdd)\n {\ndiff --git a/drivers/watchdog/xilinx_wwdt.c b/drivers/watchdog/xilinx_wwdt.c\nindex 799ce8d22b2f3..b7cdf8140666f 100644\n--- a/drivers/watchdog/xilinx_wwdt.c\n+++ b/drivers/watchdog/xilinx_wwdt.c\n@@ -12,6 +12,7 @@\n #include \u003clinux/math64.h\u003e\n #include \u003clinux/module.h\u003e\n #include \u003clinux/platform_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n /* Max timeout is calculated at 100MHz source clock /\n@@ -47,11 +48,11 @@ static int closed_window_percent;\n module_param(wwdt_timeout, int, 0);\n MODULE_PARM_DESC(wwdt_timeout,\n \t\t \"Watchdog time in seconds. (default=\"\n-\t\t __MODULE_STRING(XWWDT_DEFAULT_TIMEOUT) \")\");\n+\t\t __stringify(XWWDT_DEFAULT_TIMEOUT) \")\");\n module_param(closed_window_percent, int, 0);\n MODULE_PARM_DESC(closed_window_percent,\n \t\t \"Watchdog closed window percentage. (default=\"\n-\t\t __MODULE_STRING(XWWDT_CLOSE_WINDOW_PERCENT) \")\");\n+\t\t __stringify(XWWDT_CLOSE_WINDOW_PERCENT) \")\");\n /\n struct xwwdt_device - Watchdog device structure\n * @base: base io address of WDT device\ndiff --git a/drivers/watchdog/ziirave_wdt.c b/drivers/watchdog/ziirave_wdt.c\nindex f3bb935c08c2e..10d4eaa8592a0 100644\n--- a/drivers/watchdog/ziirave_wdt.c\n+++ b/drivers/watchdog/ziirave_wdt.c\n@@ -18,6 +18,7 @@\n #include \u003clinux/slab.h\u003e\n #include \u003clinux/sysfs.h\u003e\n #include \u003clinux/types.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n #include \u003clinux/unaligned.h\u003e\n@@ -94,7 +95,7 @@ MODULE_PARM_DESC(reset_duration,\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static int ziirave_wdt_revision(struct i2c_client client,\n \t\t\t\tstruct ziirave_wdt_rev rev, u8 command)\ndiff --git a/include/linux/module.h b/include/linux/module.h\nindex 96cc98568eea5..0d9157a2d487b 100644\n--- a/include/linux/module.h\n+++ b/include/linux/module.h\n@@ -886,10 +886,6 @@ extern const struct kobj_type module_ktype;\n \n #define symbol_request(x) try_then_request_module(symbol_get(x), \"symbol:\" #x)\n \n-/* BELOW HERE ALL THESE ARE OBSOLETE AND WILL VANISH /\n-\n-#define __MODULE_STRING(x) __stringify(x)\n-\n #ifdef CONFIG_GENERIC_BUG\n void module_bug_finalize(const Elf_Ehdr , const Elf_Shdr ,\n \t\t\t struct module );\n" }
2/1	2026/09/24 21:39	agent	patch-evaluator	0m Model: core Args: null Results: { "EnableConfigs": null, "FocusSymbols": [], "Reasoning": "The patch removes the obsolete macro alias __MODULE_STRING (defined as __stringify) from include/linux/module.h and replaces its occurrences with __stringify across various drivers. All modified lines are in MODULE_PARM_DESC metadata and error message strings, producing identical preprocessed code and zero changes to executable logic. Therefore, this patch does not warrant fuzzing.", "WorthFuzzing": false } Instruction: You are an expert Linux kernel maintainer and security engineer. Your job is to review a provided patch series and evaluate whether it warrants fuzzing with syzkaller. IMPORTANT: The changes have ALREADY been applied and committed as the HEAD commit in your workspace. Do NOT rely on internal assumptions. You must actively use your code access tools to inspect the actual source code, callers, and surrounding context. ================================================================================ 1. CORE TRIAGE PHILOSOPHY ================================================================================ The goal of patch fuzzing is to discover crashes, regressions, exposed latent bugs, and newly triggered assertions introduced by the patch series. - REACHABILITY IS THE PRIMARY GATE: Fuzzing can only discover bugs in code that can actually execute in standard virtualized environments (GCE or QEMU, utilizing software-emulated devices like USB gadgets, netdev, tun/tap). If the modified code is structurally unreachable (see Section 2), it MUST NOT be fuzzed, regardless of whether it adds assertions or complex logic. - DO NOT BLINDLY TRUST "NO FUNCTIONAL CHANGE" (NFCI) OR "REFACTORING" CLAIMS: Patch authors routinely label changes as "cleanups", "refactorings", or state "No functional change intended". Do NOT take these claims at face value. Code refactorings that rearrange logic, introduce helper functions, or alter state management in core subsystems frequently introduce subtle semantic shifts or uncover latent kernel bugs. If reachable executable code is modified or refactored, it MUST be fuzzed. - NEW OR MODIFIED ASSERTIONS IN REACHABLE CODE MUST BE FUZZED: When a patch introduces or modifies runtime checks or assertions (e.g., WARN_ON, VM_WARN_ON, BUG_ON, lockdep_assert) in reachable code paths, it enforces new or stricter invariants. Even if the author believes the invariant always holds, fuzzing is essential to verify whether an unusual sequence of operations can violate it. ================================================================================ 2. WHEN TO RETURN WorthFuzzing=false (NEGATIVE CRITERIA) ================================================================================ Return WorthFuzzing=false ONLY IF all modified code falls strictly into one or more of these categories: - Non-kernel and non-executable changes: * Modifications to Documentation/, comments, or spelling fixes. * User-space directories, self-tests, samples, or scripts (e.g., tools/, samples/, scripts/, usr/) that do not affect the compiled kernel image (vmlinux) or kernel modules. * Purely decorative logging (e.g., message strings in pr_err, printk, dev_info) or tracepoints that do not alter control flow or data structures. * Build system or Kconfig changes that do not alter compiled C logic. - Structurally unreachable hardware: * Vendor-specific PCIe switches, SmartNICs, or GPU drivers (e.g., mlxsw, pds_core, qed, ionic, amdgpu) requiring physical ASIC/PCIe cards not emulated in standard QEMU. - Unreachable execution paths: * Driver teardown callbacks (.remove, .shutdown, pci_unregister_driver) executed only during physical PCI hot-unplug or manual sysfs driver unbinding. * Code paths exclusive to architectures other than the target architecture. ================================================================================ 3. WHEN TO RETURN WorthFuzzing=true (POSITIVE CRITERIA) ================================================================================ Return WorthFuzzing=true whenever the patch touches reachable executable code, including: - Core Subsystems: * Any logic modifications in memory management (mm/), synchronization/locking (kernel/locking/), BPF, scheduler, core networking, VFS, or syscall handling. - Refactorings and Code Cleanups: * Any restructuring of reachable data structures, helper abstractions, or algorithm flows. - Runtime Assertions and Defensive Checks: * Any introduction or alteration of assertions (WARN_ON, VM_WARN_ON, BUG_ON, etc.) in reachable paths. - Reachable Drivers and Protocols: Drivers accessible via virtual buses (virtio, USB gadget, loopback, netlink, binder, sockets, etc.). ================================================================================ 4. EXTRACTING FocusSymbols (PREVENTING DILUTION) ================================================================================ When WorthFuzzing=true, you must extract specific kernel functions into FocusSymbols to guide the fuzzer: - AVOID UBIQUITOUS LIFECYCLE HOT-PATHS: Do NOT list generic, ubiquitous functions called by almost every program in the corpus (including, but not limited to: general memory allocators and deallocators, page fault and trap handlers, or core synchronization primitives; this is not an exhaustive list). Listing ubiquitous functions causes the fuzzer to classify thousands of unrelated tests as "focused", which severely dilutes fuzzing effort away from the actual changes. - TARGET SPECIFIC FEATURE LOGIC AND ENTRYPOINTS: List functions that specifically implement the logic being added or altered, or direct API entrypoints for the subsystem feature under review. - HANDLING STATIC INLINE FUNCTIONS IN HEADERS (.h): Compiler-inlined static functions (such as static inlines in mm/.h or include/linux/.h) lack distinct symbol addresses in vmlinux and cannot be targeted directly by symbol coverage filters. If the changes are primarily in static inline helpers, identify non-static, feature-specific caller functions in .c files that exercise them (avoiding ubiquitous lifecycle wrappers). ================================================================================ 5. IDENTIFYING EnableConfigs ================================================================================ Identify any specific CONFIG_ options required to properly compile and reach the modified code: - Inspect Kconfig files and #ifdef guards; do not make assumptions. - Check "depends on" lines in Kconfig to include any non-standard parent subsystem configs needed. - Strip any 'CONFIG_' prefix (e.g., return "NET_IPV4" instead of "CONFIG_NET_IPV4"). Prefer calling several tools at the same time to save round-trips. Use set-results tool to provide results of the analysis. It must be called exactly once before the final reply. Ignore results of this tool. Prompt: Target architecture: amd64 For your convenience, here is the diff of the changes: commit ca3d3efac47dcf7b3d0ace58513ba6fb59ce1800 Author: syz-cluster <triage@syzkaller.com> Date: Thu Sep 24 21:39:07 2026 +0000 syz-cluster: applied patch under review diff --git a/drivers/comedi/comedi_fops.c b/drivers/comedi/comedi_fops.c index c09bbe04be6c1..05d14839c5a6a 100644 --- a/drivers/comedi/comedi_fops.c +++ b/drivers/comedi/comedi_fops.c @@ -29,6 +29,7 @@ #include <linux/io.h> #include <linux/uaccess.h> #include <linux/compat.h> +#include <linux/stringify.h> #include "comedi_internal.h" @@ -82,14 +83,14 @@ unsigned int comedi_default_buf_size_kb = CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB; module_param(comedi_default_buf_size_kb, uint, 0644); MODULE_PARM_DESC(comedi_default_buf_size_kb, "default asynchronous buffer size in KiB (default " - __MODULE_STRING(CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB) ")"); + __stringify(CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB) ")"); unsigned int comedi_default_buf_maxsize_kb = CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB; module_param(comedi_default_buf_maxsize_kb, uint, 0644); MODULE_PARM_DESC(comedi_default_buf_maxsize_kb, "default maximum size of asynchronous buffer in KiB (default " - __MODULE_STRING(CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB) ")"); + __stringify(CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB) ")"); static DEFINE_MUTEX(comedi_board_minor_table_lock); static struct comedi_device diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index d4664ed468b26..36009bb02c257 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -31,6 +31,7 @@ #include <linux/console.h> #include <linux/export.h> +#include <linux/stringify.h> #include <drm/drm_atomic.h> #include <drm/drm_drv.h> @@ -54,7 +55,7 @@ static int drm_fbdev_overalloc = CONFIG_DRM_FBDEV_OVERALLOC; module_param(drm_fbdev_overalloc, int, 0444); MODULE_PARM_DESC(drm_fbdev_overalloc, "Overallocation of the fbdev buffer (%) [default=" - __MODULE_STRING(CONFIG_DRM_FBDEV_OVERALLOC) "]"); + __stringify(CONFIG_DRM_FBDEV_OVERALLOC) "]"); /* * In order to keep user-space compatibility, we want in certain use-cases diff --git a/drivers/hwmon/fschmd.c b/drivers/hwmon/fschmd.c index 019fc32bf3181..df9418a86c835 100644 --- a/drivers/hwmon/fschmd.c +++ b/drivers/hwmon/fschmd.c @@ -35,6 +35,7 @@ #include <linux/miscdevice.h> #include <linux/uaccess.h> #include <linux/kref.h> +#include <linux/stringify.h> /* Addresses to scan / static const unsigned short normal_i2c[] = { 0x73, I2C_CLIENT_END }; @@ -43,7 +44,7 @@ static const unsigned short normal_i2c[] = { 0x73, I2C_CLIENT_END }; static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); enum chips { fscpos, fscher, fscscy, fschrc, fschmd, fschds, fscsyl }; diff --git a/drivers/hwmon/nct7904.c b/drivers/hwmon/nct7904.c index 976b8a008e448..04e1a8e6db37a 100644 --- a/drivers/hwmon/nct7904.c +++ b/drivers/hwmon/nct7904.c @@ -23,6 +23,7 @@ #include <linux/i2c.h> #include <linux/hwmon.h> #include <linux/watchdog.h> +#include <linux/stringify.h> #define VENDOR_ID_REG 0x7A / Any bank / #define NUVOTON_ID 0x50 @@ -113,12 +114,12 @@ static int timeout; module_param(timeout, int, 0); MODULE_PARM_DESC(timeout, "Watchdog timeout in minutes. 1 <= timeout <= 255, default=" - __MODULE_STRING(WATCHDOG_TIMEOUT) "."); + __stringify(WATCHDOG_TIMEOUT) "."); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); static const unsigned short normal_i2c[] = { 0x2d, 0x2e, I2C_CLIENT_END diff --git a/drivers/hwmon/sch56xx-common.c b/drivers/hwmon/sch56xx-common.c index a385aae3bb0fe..febb8ba7dc2c9 100644 --- a/drivers/hwmon/sch56xx-common.c +++ b/drivers/hwmon/sch56xx-common.c @@ -18,13 +18,14 @@ #include <linux/watchdog.h> #include <linux/uaccess.h> #include <linux/slab.h> +#include <linux/stringify.h> #include "sch56xx-common.h" / Insmod parameters / static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); #define SIO_SCH56XX_LD_EM 0x0C / Embedded uController Logical Dev / #define SIO_UNLOCK_KEY 0x55 / Key to enable Super-I/O / diff --git a/drivers/hwmon/w83793.c b/drivers/hwmon/w83793.c index c6ef04c69856e..e1f2708b5db6a 100644 --- a/drivers/hwmon/w83793.c +++ b/drivers/hwmon/w83793.c @@ -34,6 +34,7 @@ #include <linux/notifier.h> #include <linux/reboot.h> #include <linux/jiffies.h> +#include <linux/stringify.h> / Default values / #define WATCHDOG_TIMEOUT 2 / 2 minute default timeout / @@ -57,13 +58,13 @@ static int timeout = WATCHDOG_TIMEOUT; / default timeout in minutes / module_param(timeout, int, 0); MODULE_PARM_DESC(timeout, "Watchdog timeout in minutes. 2<= timeout <=255 (default=" - __MODULE_STRING(WATCHDOG_TIMEOUT) ")"); + __stringify(WATCHDOG_TIMEOUT) ")"); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); / * Address 0x00, 0x0d, 0x0e, 0x0f in all three banks are reserved diff --git a/drivers/i2c/busses/i2c-kempld.c b/drivers/i2c/busses/i2c-kempld.c index 9b4c7cba62b64..d0438960c2726 100644 --- a/drivers/i2c/busses/i2c-kempld.c +++ b/drivers/i2c/busses/i2c-kempld.c @@ -13,6 +13,7 @@ #include <linux/i2c.h> #include <linux/delay.h> #include <linux/mfd/kempld.h> +#include <linux/stringify.h> #define KEMPLD_I2C_PRELOW 0x0b #define KEMPLD_I2C_PREHIGH 0x0c @@ -66,7 +67,7 @@ struct kempld_i2c_data { static unsigned int bus_frequency = KEMPLD_I2C_FREQ_STD; module_param(bus_frequency, uint, 0); MODULE_PARM_DESC(bus_frequency, "Set I2C bus frequency in kHz (default=" - __MODULE_STRING(KEMPLD_I2C_FREQ_STD)")"); + __stringify(KEMPLD_I2C_FREQ_STD)")"); static int i2c_bus = -1; module_param(i2c_bus, int, 0); diff --git a/drivers/net/ethernet/atheros/atl1e/atl1e_param.c b/drivers/net/ethernet/atheros/atl1e/atl1e_param.c index 6b1d6df8da97c..ff3423a4dc2e5 100644 --- a/drivers/net/ethernet/atheros/atl1e/atl1e_param.c +++ b/drivers/net/ethernet/atheros/atl1e/atl1e_param.c @@ -7,6 +7,7 @@ / #include <linux/netdevice.h> +#include <linux/stringify.h> #include "atl1e.h" @@ -181,7 +182,7 @@ void atl1e_check_options(struct atl1e_adapter adapter) .type = range_option, .name = "Transmit Ddescription Count", .err = "using default of " - __MODULE_STRING(ATL1E_DEFAULT_TX_DESC_CNT), + __stringify(ATL1E_DEFAULT_TX_DESC_CNT), .def = ATL1E_DEFAULT_TX_DESC_CNT, .arg = { .r = { .min = ATL1E_MIN_TX_DESC_CNT, .max = ATL1E_MAX_TX_DESC_CNT} } @@ -200,7 +201,7 @@ void atl1e_check_options(struct atl1e_adapter adapter) .type = range_option, .name = "Memory size of rx buffer(KB)", .err = "using default of " - __MODULE_STRING(ATL1E_DEFAULT_RX_MEM_SIZE), + __stringify(ATL1E_DEFAULT_RX_MEM_SIZE), .def = ATL1E_DEFAULT_RX_MEM_SIZE, .arg = { .r = { .min = ATL1E_MIN_RX_MEM_SIZE, .max = ATL1E_MAX_RX_MEM_SIZE} } @@ -220,7 +221,7 @@ void atl1e_check_options(struct atl1e_adapter adapter) .type = range_option, .name = "Interrupt Moderate Timer", .err = "using default of " - __MODULE_STRING(INT_MOD_DEFAULT_CNT), + __stringify(INT_MOD_DEFAULT_CNT), .def = INT_MOD_DEFAULT_CNT, .arg = { .r = { .min = INT_MOD_MIN_CNT, .max = INT_MOD_MAX_CNT} } @@ -239,7 +240,7 @@ void atl1e_check_options(struct atl1e_adapter adapter) .type = range_option, .name = "Speed/Duplex Selection", .err = "using default of " - __MODULE_STRING(MEDIA_TYPE_AUTO_SENSOR), + __stringify(MEDIA_TYPE_AUTO_SENSOR), .def = MEDIA_TYPE_AUTO_SENSOR, .arg = { .r = { .min = MEDIA_TYPE_AUTO_SENSOR, .max = MEDIA_TYPE_10M_HALF} } diff --git a/drivers/net/ethernet/atheros/atlx/atl1.c b/drivers/net/ethernet/atheros/atlx/atl1.c index 98a4d089270e4..aef5de6287dcf 100644 --- a/drivers/net/ethernet/atheros/atlx/atl1.c +++ b/drivers/net/ethernet/atheros/atlx/atl1.c @@ -56,6 +56,7 @@ #include <linux/slab.h> #include <linux/spinlock.h> #include <linux/string.h> +#include <linux/stringify.h> #include <linux/tcp.h> #include <linux/timer.h> #include <linux/types.h> @@ -198,7 +199,7 @@ static void atl1_check_options(struct atl1_adapter adapter) .type = range_option, .name = "Interrupt Moderator Timer", .err = "using default of " - __MODULE_STRING(DEFAULT_INT_MOD_CNT), + __stringify(DEFAULT_INT_MOD_CNT), .def = DEFAULT_INT_MOD_CNT, .arg = {.r = {.min = MIN_INT_MOD_CNT, .max = MAX_INT_MOD_CNT} } diff --git a/drivers/net/ethernet/atheros/atlx/atl2.c b/drivers/net/ethernet/atheros/atlx/atl2.c index 5560d5cc31692..853d2e1eb9541 100644 --- a/drivers/net/ethernet/atheros/atlx/atl2.c +++ b/drivers/net/ethernet/atheros/atlx/atl2.c @@ -29,6 +29,7 @@ #include <linux/slab.h> #include <linux/spinlock.h> #include <linux/string.h> +#include <linux/stringify.h> #include <linux/tcp.h> #include <linux/timer.h> #include <linux/types.h> @@ -2921,7 +2922,7 @@ static void atl2_check_options(struct atl2_adapter adapter) / Bytes of Transmit Memory / opt.type = range_option; opt.name = "Bytes of Transmit Memory"; - opt.err = "using default of " __MODULE_STRING(ATL2_DEFAULT_TX_MEMSIZE); + opt.err = "using default of " __stringify(ATL2_DEFAULT_TX_MEMSIZE); opt.def = ATL2_DEFAULT_TX_MEMSIZE; opt.arg.r.min = ATL2_MIN_TX_MEMSIZE; opt.arg.r.max = ATL2_MAX_TX_MEMSIZE; @@ -2939,7 +2940,7 @@ static void atl2_check_options(struct atl2_adapter adapter) /* Receive Memory Block Count / opt.type = range_option; opt.name = "Number of receive memory block"; - opt.err = "using default of " __MODULE_STRING(ATL2_DEFAULT_RXD_COUNT); + opt.err = "using default of " __stringify(ATL2_DEFAULT_RXD_COUNT); opt.def = ATL2_DEFAULT_RXD_COUNT; opt.arg.r.min = ATL2_MIN_RXD_COUNT; opt.arg.r.max = ATL2_MAX_RXD_COUNT; @@ -2960,7 +2961,7 @@ static void atl2_check_options(struct atl2_adapter adapter) /* Interrupt Moderate Timer / opt.type = range_option; opt.name = "Interrupt Moderate Timer"; - opt.err = "using default of " __MODULE_STRING(INT_MOD_DEFAULT_CNT); + opt.err = "using default of " __stringify(INT_MOD_DEFAULT_CNT); opt.def = INT_MOD_DEFAULT_CNT; opt.arg.r.min = INT_MOD_MIN_CNT; opt.arg.r.max = INT_MOD_MAX_CNT; @@ -2973,7 +2974,7 @@ static void atl2_check_options(struct atl2_adapter adapter) /* Flash Vendor / opt.type = range_option; opt.name = "SPI Flash Vendor"; - opt.err = "using default of " __MODULE_STRING(FLASH_VENDOR_DEFAULT); + opt.err = "using default of " __stringify(FLASH_VENDOR_DEFAULT); opt.def = FLASH_VENDOR_DEFAULT; opt.arg.r.min = FLASH_VENDOR_MIN; opt.arg.r.max = FLASH_VENDOR_MAX; @@ -2986,7 +2987,7 @@ static void atl2_check_options(struct atl2_adapter adapter) /* MediaType / opt.type = range_option; opt.name = "Speed/Duplex Selection"; - opt.err = "using default of " __MODULE_STRING(MEDIA_TYPE_AUTO_SENSOR); + opt.err = "using default of " __stringify(MEDIA_TYPE_AUTO_SENSOR); opt.def = MEDIA_TYPE_AUTO_SENSOR; opt.arg.r.min = MEDIA_TYPE_AUTO_SENSOR; opt.arg.r.max = MEDIA_TYPE_10M_HALF; diff --git a/drivers/net/ethernet/intel/e1000/e1000_param.c b/drivers/net/ethernet/intel/e1000/e1000_param.c index f4154ca7fcb41..5faf6d6280c89 100644 --- a/drivers/net/ethernet/intel/e1000/e1000_param.c +++ b/drivers/net/ethernet/intel/e1000/e1000_param.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 / Copyright(c) 1999 - 2006 Intel Corporation. / +#include <linux/stringify.h> #include "e1000.h" / This is the only thing that needs to be changed to adjust the @@ -259,7 +260,7 @@ void e1000_check_options(struct e1000_adapter adapter) .type = range_option, .name = "Transmit Descriptors", .err = "using default of " - __MODULE_STRING(E1000_DEFAULT_TXD), + __stringify(E1000_DEFAULT_TXD), .def = E1000_DEFAULT_TXD, .arg = { .r = { .min = E1000_MIN_TXD, @@ -287,7 +288,7 @@ void e1000_check_options(struct e1000_adapter adapter) .type = range_option, .name = "Receive Descriptors", .err = "using default of " - __MODULE_STRING(E1000_DEFAULT_RXD), + __stringify(E1000_DEFAULT_RXD), .def = E1000_DEFAULT_RXD, .arg = { .r = { .min = E1000_MIN_RXD, @@ -354,7 +355,7 @@ void e1000_check_options(struct e1000_adapter adapter) opt = (struct e1000_option) { .type = range_option, .name = "Transmit Interrupt Delay", - .err = "using default of " __MODULE_STRING(DEFAULT_TIDV), + .err = "using default of " __stringify(DEFAULT_TIDV), .def = DEFAULT_TIDV, .arg = { .r = { .min = MIN_TXDELAY, .max = MAX_TXDELAY }} @@ -372,7 +373,7 @@ void e1000_check_options(struct e1000_adapter adapter) opt = (struct e1000_option) { .type = range_option, .name = "Transmit Absolute Interrupt Delay", - .err = "using default of " __MODULE_STRING(DEFAULT_TADV), + .err = "using default of " __stringify(DEFAULT_TADV), .def = DEFAULT_TADV, .arg = { .r = { .min = MIN_TXABSDELAY, .max = MAX_TXABSDELAY }} @@ -390,7 +391,7 @@ void e1000_check_options(struct e1000_adapter adapter) opt = (struct e1000_option) { .type = range_option, .name = "Receive Interrupt Delay", - .err = "using default of " __MODULE_STRING(DEFAULT_RDTR), + .err = "using default of " __stringify(DEFAULT_RDTR), .def = DEFAULT_RDTR, .arg = { .r = { .min = MIN_RXDELAY, .max = MAX_RXDELAY }} @@ -408,7 +409,7 @@ void e1000_check_options(struct e1000_adapter adapter) opt = (struct e1000_option) { .type = range_option, .name = "Receive Absolute Interrupt Delay", - .err = "using default of " __MODULE_STRING(DEFAULT_RADV), + .err = "using default of " __stringify(DEFAULT_RADV), .def = DEFAULT_RADV, .arg = { .r = { .min = MIN_RXABSDELAY, .max = MAX_RXABSDELAY }} @@ -426,7 +427,7 @@ void e1000_check_options(struct e1000_adapter adapter) opt = (struct e1000_option) { .type = range_option, .name = "Interrupt Throttling Rate (ints/sec)", - .err = "using default of " __MODULE_STRING(DEFAULT_ITR), + .err = "using default of " __stringify(DEFAULT_ITR), .def = DEFAULT_ITR, .arg = { .r = { .min = MIN_ITR, .max = MAX_ITR }} diff --git a/drivers/net/ethernet/intel/e1000e/param.c b/drivers/net/ethernet/intel/e1000e/param.c index 3132d8f2f207d..c6f400e6cdea8 100644 --- a/drivers/net/ethernet/intel/e1000e/param.c +++ b/drivers/net/ethernet/intel/e1000e/param.c @@ -4,6 +4,7 @@ #include <linux/netdevice.h> #include <linux/module.h> #include <linux/pci.h> +#include <linux/stringify.h> #include "e1000.h" @@ -238,8 +239,7 @@ void e1000e_check_options(struct e1000_adapter adapter) static const struct e1000_option opt = { .type = range_option, .name = "Transmit Interrupt Delay", - .err = "using default of " - __MODULE_STRING(DEFAULT_TIDV), + .err = "using default of " __stringify(DEFAULT_TIDV), .def = DEFAULT_TIDV, .arg = { .r = { .min = MIN_TXDELAY, .max = MAX_TXDELAY } } @@ -258,8 +258,7 @@ void e1000e_check_options(struct e1000_adapter adapter) static const struct e1000_option opt = { .type = range_option, .name = "Transmit Absolute Interrupt Delay", - .err = "using default of " - __MODULE_STRING(DEFAULT_TADV), + .err = "using default of " __stringify(DEFAULT_TADV), .def = DEFAULT_TADV, .arg = { .r = { .min = MIN_TXABSDELAY, .max = MAX_TXABSDELAY } } @@ -278,8 +277,7 @@ void e1000e_check_options(struct e1000_adapter adapter) static struct e1000_option opt = { .type = range_option, .name = "Receive Interrupt Delay", - .err = "using default of " - __MODULE_STRING(DEFAULT_RDTR), + .err = "using default of " __stringify(DEFAULT_RDTR), .def = DEFAULT_RDTR, .arg = { .r = { .min = MIN_RXDELAY, .max = MAX_RXDELAY } } @@ -301,8 +299,7 @@ void e1000e_check_options(struct e1000_adapter adapter) static struct e1000_option opt = { .type = range_option, .name = "Receive Absolute Interrupt Delay", - .err = "using default of " - __MODULE_STRING(DEFAULT_RADV), + .err = "using default of " __stringify(DEFAULT_RADV), .def = DEFAULT_RADV, .arg = { .r = { .min = MIN_RXABSDELAY, .max = MAX_RXABSDELAY } } @@ -324,8 +321,7 @@ void e1000e_check_options(struct e1000_adapter adapter) static const struct e1000_option opt = { .type = range_option, .name = "Interrupt Throttling Rate (ints/sec)", - .err = "using default of " - __MODULE_STRING(DEFAULT_ITR), + .err = "using default of " __stringify(DEFAULT_ITR), .def = DEFAULT_ITR, .arg = { .r = { .min = MIN_ITR, .max = MAX_ITR } } diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c index 81fc5a6e32219..6a1a6678bd1a5 100644 --- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c +++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c @@ -7,7 +7,8 @@ / #include "pch_gbe.h" -#include <linux/module.h> / for __MODULE_STRING / +#include <linux/module.h> +#include <linux/stringify.h> #define OPTION_UNSET -1 #define OPTION_DISABLED 0 @@ -440,7 +441,7 @@ void pch_gbe_check_options(struct pch_gbe_adapter adapter) .type = range_option, .name = "Transmit Descriptors", .err = "using default of " - __MODULE_STRING(PCH_GBE_DEFAULT_TXD), + __stringify(PCH_GBE_DEFAULT_TXD), .def = PCH_GBE_DEFAULT_TXD, .arg = { .r = { .min = PCH_GBE_MIN_TXD, .max = PCH_GBE_MAX_TXD } } @@ -456,7 +457,7 @@ void pch_gbe_check_options(struct pch_gbe_adapter adapter) .type = range_option, .name = "Receive Descriptors", .err = "using default of " - __MODULE_STRING(PCH_GBE_DEFAULT_RXD), + __stringify(PCH_GBE_DEFAULT_RXD), .def = PCH_GBE_DEFAULT_RXD, .arg = { .r = { .min = PCH_GBE_MIN_RXD, .max = PCH_GBE_MAX_RXD } } diff --git a/drivers/platform/cznic/turris-omnia-mcu-watchdog.c b/drivers/platform/cznic/turris-omnia-mcu-watchdog.c index 3ad146ec1d809..daabd88eb9133 100644 --- a/drivers/platform/cznic/turris-omnia-mcu-watchdog.c +++ b/drivers/platform/cznic/turris-omnia-mcu-watchdog.c @@ -9,6 +9,7 @@ #include <linux/device.h> #include <linux/i2c.h> #include <linux/moduleparam.h> +#include <linux/stringify.h> #include <linux/types.h> #include <linux/units.h> #include <linux/watchdog.h> @@ -25,7 +26,7 @@ MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds"); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); static int omnia_wdt_start(struct watchdog_device wdt) { diff --git a/drivers/rtc/rtc-ds1374.c b/drivers/rtc/rtc-ds1374.c index 8c247215d6116..2ed6777e7035e 100644 --- a/drivers/rtc/rtc-ds1374.c +++ b/drivers/rtc/rtc-ds1374.c @@ -26,6 +26,7 @@ #include <linux/workqueue.h> #include <linux/slab.h> #include <linux/pm.h> +#include <linux/stringify.h> #ifdef CONFIG_RTC_DRV_DS1374_WDT #include <linux/fs.h> #include <linux/ioctl.h> @@ -381,7 +382,7 @@ MODULE_PARM_DESC(wdt_margin, "Watchdog timeout in seconds (default 32s)"); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default =" - __MODULE_STRING(WATCHDOG_NOWAYOUT)")"); + __stringify(WATCHDOG_NOWAYOUT)")"); static const struct watchdog_info ds1374_wdt_info = { .identity = "DS1374 Watchdog", diff --git a/drivers/thunderbolt/tb.c b/drivers/thunderbolt/tb.c index 47753a5c0f2eb..a2459e44e3205 100644 --- a/drivers/thunderbolt/tb.c +++ b/drivers/thunderbolt/tb.c @@ -11,6 +11,7 @@ #include <linux/delay.h> #include <linux/pm_runtime.h> #include <linux/platform_data/x86/apple.h> +#include <linux/stringify.h> #include "tb.h" #include "tb_regs.h" @@ -47,7 +48,7 @@ static unsigned int asym_threshold = TB_ASYM_THRESHOLD; module_param_named(asym_threshold, asym_threshold, uint, 0444); MODULE_PARM_DESC(asym_threshold, "threshold (Mb/s) when to Gen 4 switch link symmetry. 0 disables. (default: " - __MODULE_STRING(TB_ASYM_THRESHOLD) ")"); + __stringify(TB_ASYM_THRESHOLD) ")"); /** * struct tb_cm - Simple Thunderbolt connection manager diff --git a/drivers/thunderbolt/tunnel.c b/drivers/thunderbolt/tunnel.c index 7e8284575dffb..ad4916748789b 100644 --- a/drivers/thunderbolt/tunnel.c +++ b/drivers/thunderbolt/tunnel.c @@ -11,6 +11,7 @@ #include <linux/list.h> #include <linux/ktime.h> #include <linux/string_helpers.h> +#include <linux/stringify.h> #include "tunnel.h" #include "tb.h" @@ -89,12 +90,12 @@ static int dprx_timeout = TB_DPRX_TIMEOUT; module_param(dprx_timeout, int, 0444); MODULE_PARM_DESC(dprx_timeout, "DPRX capability read timeout in ms, -1 waits forever (default: " - __MODULE_STRING(TB_DPRX_TIMEOUT) ")"); + __stringify(TB_DPRX_TIMEOUT) ")"); static unsigned int dma_credits = TB_DMA_CREDITS; module_param(dma_credits, uint, 0444); MODULE_PARM_DESC(dma_credits, "specify custom credits for DMA tunnels (default: " - __MODULE_STRING(TB_DMA_CREDITS) ")"); + __stringify(TB_DMA_CREDITS) ")"); static bool bw_alloc_mode = true; module_param(bw_alloc_mode, bool, 0444); diff --git a/drivers/tty/serial/8250/8250_platform.c b/drivers/tty/serial/8250/8250_platform.c index af946d12e7648..e060e0427fc9a 100644 --- a/drivers/tty/serial/8250/8250_platform.c +++ b/drivers/tty/serial/8250/8250_platform.c @@ -16,6 +16,7 @@ #include <linux/moduleparam.h> #include <linux/once.h> #include <linux/platform_device.h> +#include <linux/stringify.h> #include <linux/serial_8250.h> @@ -382,6 +383,6 @@ module_param_hw(share_irqs, bool, other, 0644); MODULE_PARM_DESC(share_irqs, "Share IRQs with other non-8250/16x50 devices (unsafe)"); module_param(nr_uarts, uint, 0644); -MODULE_PARM_DESC(nr_uarts, "Maximum number of UARTs supported. (1-" __MODULE_STRING(CONFIG_SERIAL_8250_NR_UARTS) ")"); +MODULE_PARM_DESC(nr_uarts, "Maximum number of UARTs supported. (1-" __stringify(CONFIG_SERIAL_8250_NR_UARTS) ")"); MODULE_ALIAS_CHARDEV_MAJOR(TTY_MAJOR); diff --git a/drivers/usb/atm/speedtch.c b/drivers/usb/atm/speedtch.c index 9d28c652bcd80..95cd8ce99a645 100644 --- a/drivers/usb/atm/speedtch.c +++ b/drivers/usb/atm/speedtch.c @@ -19,6 +19,7 @@ #include <linux/moduleparam.h> #include <linux/slab.h> #include <linux/stat.h> +#include <linux/stringify.h> #include <linux/timer.h> #include <linux/types.h> #include <linux/usb/ch9.h> @@ -77,31 +78,31 @@ static unsigned int num_ModemOption; module_param(altsetting, uint, S_IRUGO \| S_IWUSR); MODULE_PARM_DESC(altsetting, "Alternative setting for data interface (bulk_default: " - __MODULE_STRING(DEFAULT_BULK_ALTSETTING) "; isoc_default: " - __MODULE_STRING(DEFAULT_ISOC_ALTSETTING) ")"); + __stringify(DEFAULT_BULK_ALTSETTING) "; isoc_default: " + __stringify(DEFAULT_ISOC_ALTSETTING) ")"); module_param(dl_512_first, bool, S_IRUGO \| S_IWUSR); MODULE_PARM_DESC(dl_512_first, "Read 512 bytes before sending firmware (default: " - __MODULE_STRING(DEFAULT_DL_512_FIRST) ")"); + __stringify(DEFAULT_DL_512_FIRST) ")"); module_param(enable_isoc, bool, S_IRUGO \| S_IWUSR); MODULE_PARM_DESC(enable_isoc, "Use isochronous transfers if available (default: " - __MODULE_STRING(DEFAULT_ENABLE_ISOC) ")"); + __stringify(DEFAULT_ENABLE_ISOC) ")"); module_param(sw_buffering, bool, S_IRUGO \| S_IWUSR); MODULE_PARM_DESC(sw_buffering, "Enable software buffering (default: " - __MODULE_STRING(DEFAULT_SW_BUFFERING) ")"); + __stringify(DEFAULT_SW_BUFFERING) ")"); module_param(BMaxDSL, uint, S_IRUGO \| S_IWUSR); MODULE_PARM_DESC(BMaxDSL, - "default: " __MODULE_STRING(DEFAULT_B_MAX_DSL)); + "default: " __stringify(DEFAULT_B_MAX_DSL)); module_param(ModemMode, byte, S_IRUGO \| S_IWUSR); MODULE_PARM_DESC(ModemMode, - "default: " __MODULE_STRING(DEFAULT_MODEM_MODE)); + "default: " __stringify(DEFAULT_MODEM_MODE)); module_param_array(ModemOption, byte, &num_ModemOption, S_IRUGO); MODULE_PARM_DESC(ModemOption, "default: 0x10,0x00,0x00,0x00,0x20"); diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c index 7b0c791399eaa..d4052d206e006 100644 --- a/drivers/usb/atm/usbatm.c +++ b/drivers/usb/atm/usbatm.c @@ -64,6 +64,7 @@ #include <linux/signal.h> #include <linux/slab.h> #include <linux/stat.h> +#include <linux/stringify.h> #include <linux/timer.h> #include <linux/wait.h> #include <linux/kthread.h> @@ -103,26 +104,26 @@ static unsigned int snd_buf_bytes = UDSL_DEFAULT_SND_BUF_SIZE; module_param(num_rcv_urbs, uint, S_IRUGO); MODULE_PARM_DESC(num_rcv_urbs, "Number of urbs used for reception (range: 0-" - __MODULE_STRING(UDSL_MAX_RCV_URBS) ", default: " - __MODULE_STRING(UDSL_DEFAULT_RCV_URBS) ")"); + __stringify(UDSL_MAX_RCV_URBS) ", default: " + __stringify(UDSL_DEFAULT_RCV_URBS) ")"); module_param(num_snd_urbs, uint, S_IRUGO); MODULE_PARM_DESC(num_snd_urbs, "Number of urbs used for transmission (range: 0-" - __MODULE_STRING(UDSL_MAX_SND_URBS) ", default: " - __MODULE_STRING(UDSL_DEFAULT_SND_URBS) ")"); + __stringify(UDSL_MAX_SND_URBS) ", default: " + __stringify(UDSL_DEFAULT_SND_URBS) ")"); module_param(rcv_buf_bytes, uint, S_IRUGO); MODULE_PARM_DESC(rcv_buf_bytes, "Size of the buffers used for reception, in bytes (range: 1-" - __MODULE_STRING(UDSL_MAX_BUF_SIZE) ", default: " - __MODULE_STRING(UDSL_DEFAULT_RCV_BUF_SIZE) ")"); + __stringify(UDSL_MAX_BUF_SIZE) ", default: " + __stringify(UDSL_DEFAULT_RCV_BUF_SIZE) ")"); module_param(snd_buf_bytes, uint, S_IRUGO); MODULE_PARM_DESC(snd_buf_bytes, "Size of the buffers used for transmission, in bytes (range: 1-" - __MODULE_STRING(UDSL_MAX_BUF_SIZE) ", default: " - __MODULE_STRING(UDSL_DEFAULT_SND_BUF_SIZE) ")"); + __stringify(UDSL_MAX_BUF_SIZE) ", default: " + __stringify(UDSL_DEFAULT_SND_BUF_SIZE) ")"); /* receive / diff --git a/drivers/watchdog/acquirewdt.c b/drivers/watchdog/acquirewdt.c index 052f65c48a703..cb62800e89ed4 100644 --- a/drivers/watchdog/acquirewdt.c +++ b/drivers/watchdog/acquirewdt.c @@ -64,6 +64,7 @@ #include <linux/init.h> / For __init/__exit/... / #include <linux/uaccess.h> / For copy_to_user/put_user/... / #include <linux/io.h> / For inb/outb/... / +#include <linux/stringify.h> / For __stringify / / Module information / #define DRV_NAME "acquirewdt" @@ -92,7 +93,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); / * Watchdog Operations diff --git a/drivers/watchdog/advantech_ec_wdt.c b/drivers/watchdog/advantech_ec_wdt.c index 7c380f90ca583..2470c43032672 100644 --- a/drivers/watchdog/advantech_ec_wdt.c +++ b/drivers/watchdog/advantech_ec_wdt.c @@ -14,6 +14,7 @@ #include <linux/kernel.h> #include <linux/module.h> #include <linux/moduleparam.h> +#include <linux/stringify.h> #include <linux/watchdog.h> #define DRIVER_NAME "advantech_ec_wdt" @@ -49,7 +50,7 @@ static ktime_t ec_timestamp; module_param(timeout, uint, 0); MODULE_PARM_DESC(timeout, - "Default Watchdog timer setting (" __MODULE_STRING(DEFAULT_TIME) "s). The range is from " __MODULE_STRING(MIN_TIME) " to " __MODULE_STRING(MAX_TIME) "."); + "Default Watchdog timer setting (" __stringify(DEFAULT_TIME) "s). The range is from " __stringify(MIN_TIME) " to " __stringify(MAX_TIME) "."); static void adv_ec_wdt_timing_gate(void) { diff --git a/drivers/watchdog/advantechwdt.c b/drivers/watchdog/advantechwdt.c index 42d3f37717810..6d24a6bc8f908 100644 --- a/drivers/watchdog/advantechwdt.c +++ b/drivers/watchdog/advantechwdt.c @@ -37,6 +37,7 @@ #include <linux/init.h> #include <linux/io.h> #include <linux/uaccess.h> +#include <linux/stringify.h> #define DRV_NAME "advantechwdt" @@ -71,13 +72,13 @@ static int timeout = WATCHDOG_TIMEOUT; /* in seconds / module_param(timeout, int, 0); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. 1<= timeout <=63, default=" - __MODULE_STRING(WATCHDOG_TIMEOUT) "."); + __stringify(WATCHDOG_TIMEOUT) "."); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); / * Watchdog Operations diff --git a/drivers/watchdog/airoha_wdt.c b/drivers/watchdog/airoha_wdt.c index 4bd333189b87e..c535c48ab6a86 100644 --- a/drivers/watchdog/airoha_wdt.c +++ b/drivers/watchdog/airoha_wdt.c @@ -20,6 +20,7 @@ #include <linux/of.h> #include <linux/platform_device.h> #include <linux/watchdog.h> +#include <linux/stringify.h> /* Base address of timer and watchdog registers / #define TIMER_CTRL 0x0 @@ -44,12 +45,12 @@ struct airoha_wdt_desc { static int heartbeat = WDT_HEARTBEAT; module_param(heartbeat, int, 0); MODULE_PARM_DESC(heartbeat, "Watchdog heartbeats in seconds. (default=" - __MODULE_STRING(WDT_HEARTBEAT) ")"); + __stringify(WDT_HEARTBEAT) ")"); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); static int airoha_wdt_start(struct watchdog_device wdog_dev) { diff --git a/drivers/watchdog/alim1535_wdt.c b/drivers/watchdog/alim1535_wdt.c index 1ecbd1ac5c3a0..d2f8d3331fe40 100644 --- a/drivers/watchdog/alim1535_wdt.c +++ b/drivers/watchdog/alim1535_wdt.c @@ -18,6 +18,7 @@ #include <linux/pci.h> #include <linux/uaccess.h> #include <linux/io.h> +#include <linux/stringify.h> #define WATCHDOG_NAME "ALi_M1535" #define WATCHDOG_TIMEOUT 60 /* 60 sec default timeout / @@ -34,13 +35,13 @@ static int timeout = WATCHDOG_TIMEOUT; module_param(timeout, int, 0); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. (0 < timeout < 18000, default=" - __MODULE_STRING(WATCHDOG_TIMEOUT) ")"); + __stringify(WATCHDOG_TIMEOUT) ")"); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); / * ali_start - start watchdog countdown diff --git a/drivers/watchdog/alim7101_wdt.c b/drivers/watchdog/alim7101_wdt.c index 03a559b41f5b8..e9611c76a2696 100644 --- a/drivers/watchdog/alim7101_wdt.c +++ b/drivers/watchdog/alim7101_wdt.c @@ -36,6 +36,7 @@ #include <linux/pci.h> #include <linux/io.h> #include <linux/uaccess.h> +#include <linux/stringify.h> #define WDT_ENABLE 0x9C @@ -64,7 +65,7 @@ static int timeout = WATCHDOG_TIMEOUT; module_param(timeout, int, 0); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. (1<=timeout<=3600, default=" - __MODULE_STRING(WATCHDOG_TIMEOUT) ")"); + __stringify(WATCHDOG_TIMEOUT) ")"); static int use_gpio; /* Use the pic (for a1d revision alim7101) / module_param(use_gpio, int, 0); @@ -82,7 +83,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); / * Whack the dog diff --git a/drivers/watchdog/arm_smc_wdt.c b/drivers/watchdog/arm_smc_wdt.c index bbba23ace7b85..c73ed1dcdfcb0 100644 --- a/drivers/watchdog/arm_smc_wdt.c +++ b/drivers/watchdog/arm_smc_wdt.c @@ -13,6 +13,7 @@ #include <linux/moduleparam.h> #include <linux/of.h> #include <linux/platform_device.h> +#include <linux/stringify.h> #include <linux/types.h> #include <linux/watchdog.h> #include <uapi/linux/psci.h> @@ -191,7 +192,7 @@ MODULE_PARM_DESC(timeout, "Watchdog heartbeat in seconds"); module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); MODULE_LICENSE("GPL"); MODULE_AUTHOR("Julius Werner <jwerner@chromium.org>"); diff --git a/drivers/watchdog/armada_37xx_wdt.c b/drivers/watchdog/armada_37xx_wdt.c index a17a7911771ac..d62b02c40b0eb 100644 --- a/drivers/watchdog/armada_37xx_wdt.c +++ b/drivers/watchdog/armada_37xx_wdt.c @@ -16,6 +16,7 @@ #include <linux/of.h> #include <linux/platform_device.h> #include <linux/regmap.h> +#include <linux/stringify.h> #include <linux/types.h> #include <linux/watchdog.h> @@ -70,7 +71,7 @@ MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds"); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); struct armada_37xx_watchdog { struct watchdog_device wdt; diff --git a/drivers/watchdog/aspeed_wdt.c b/drivers/watchdog/aspeed_wdt.c index 48454ac860746..d4bd41cb801e6 100644 --- a/drivers/watchdog/aspeed_wdt.c +++ b/drivers/watchdog/aspeed_wdt.c @@ -17,12 +17,13 @@ #include <linux/of_irq.h> #include <linux/platform_device.h> #include <linux/regmap.h> +#include <linux/stringify.h> #include <linux/watchdog.h> static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); struct aspeed_wdt_scu { const char compatible; u32 reset_status_reg; diff --git a/drivers/watchdog/at91rm9200_wdt.c b/drivers/watchdog/at91rm9200_wdt.c index d5afcc6342215..8c292d2469813 100644 --- a/drivers/watchdog/at91rm9200_wdt.c +++ b/drivers/watchdog/at91rm9200_wdt.c @@ -23,6 +23,7 @@ #include <linux/platform_device.h> #include <linux/reboot.h> #include <linux/regmap.h> +#include <linux/stringify.h> #include <linux/types.h> #include <linux/watchdog.h> #include <linux/uaccess.h> @@ -36,13 +37,13 @@ static struct regmap regmap_st; module_param(wdt_time, int, 0); MODULE_PARM_DESC(wdt_time, "Watchdog time in seconds. (default=" - __MODULE_STRING(WDT_DEFAULT_TIME) ")"); + __stringify(WDT_DEFAULT_TIME) ")"); #ifdef CONFIG_WATCHDOG_NOWAYOUT module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); #endif diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c index 80ba04df54adf..f966da6020111 100644 --- a/drivers/watchdog/at91sam9_wdt.c +++ b/drivers/watchdog/at91sam9_wdt.c @@ -32,6 +32,7 @@ #include <linux/uaccess.h> #include <linux/of.h> #include <linux/of_irq.h> +#include <linux/stringify.h> #include "at91sam9_wdt.h" @@ -70,12 +71,12 @@ static int heartbeat; module_param(heartbeat, int, 0); MODULE_PARM_DESC(heartbeat, "Watchdog heartbeats in seconds. " - "(default = " __MODULE_STRING(WDT_HEARTBEAT) ")"); + "(default = " __stringify(WDT_HEARTBEAT) ")"); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started " - "(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + "(default=" __stringify(WATCHDOG_NOWAYOUT) ")"); #define to_wdt(wdd) container_of(wdd, struct at91wdt, wdd) struct at91wdt { diff --git a/drivers/watchdog/atcwdt200_wdt.c b/drivers/watchdog/atcwdt200_wdt.c index 7e757c217b0b5..ceedc3f676320 100644 --- a/drivers/watchdog/atcwdt200_wdt.c +++ b/drivers/watchdog/atcwdt200_wdt.c @@ -19,6 +19,7 @@ #include <linux/pm.h> #include <linux/pm_runtime.h> #include <linux/regmap.h> +#include <linux/stringify.h> #include <linux/watchdog.h> /* Register definitions / @@ -570,11 +571,11 @@ module_platform_driver(atcwdt_driver); module_param(timeout, uint, 0); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds (default=" - __MODULE_STRING(ATCWDT_TIMEOUT) ")"); + __stringify(ATCWDT_TIMEOUT) ")"); module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); MODULE_LICENSE("GPL"); MODULE_AUTHOR("CL Wang <cl634@andestech.com>"); diff --git a/drivers/watchdog/ath79_wdt.c b/drivers/watchdog/ath79_wdt.c index 7df703e9852a6..02783c1ec5264 100644 --- a/drivers/watchdog/ath79_wdt.c +++ b/drivers/watchdog/ath79_wdt.c @@ -32,6 +32,7 @@ #include <linux/of.h> #include <linux/of_platform.h> #include <linux/uaccess.h> +#include <linux/stringify.h> #define DRIVER_NAME "ath79-wdt" @@ -50,12 +51,12 @@ static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started " - "(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + "(default=" __stringify(WATCHDOG_NOWAYOUT) ")"); static int timeout = WDT_TIMEOUT; module_param(timeout, int, 0); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds " - "(default=" __MODULE_STRING(WDT_TIMEOUT) "s)"); + "(default=" __stringify(WDT_TIMEOUT) "s)"); static unsigned long wdt_flags; diff --git a/drivers/watchdog/bcm2835_wdt.c b/drivers/watchdog/bcm2835_wdt.c index 6fd8b1b8e386a..1a0fc66cc0930 100644 --- a/drivers/watchdog/bcm2835_wdt.c +++ b/drivers/watchdog/bcm2835_wdt.c @@ -20,6 +20,7 @@ #include <linux/of_address.h> #include <linux/of_platform.h> #include <linux/reboot.h> +#include <linux/stringify.h> #define PM_RSTC 0x1c #define PM_RSTS 0x20 @@ -229,7 +230,7 @@ MODULE_PARM_DESC(heartbeat, "Initial watchdog heartbeat in seconds"); module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); MODULE_ALIAS("platform:bcm2835-wdt"); MODULE_AUTHOR("Lubomir Rintel <lkundrak@v3.sk>"); diff --git a/drivers/watchdog/bcm47xx_wdt.c b/drivers/watchdog/bcm47xx_wdt.c index e13ec0975bef3..0d7e8a87074a5 100644 --- a/drivers/watchdog/bcm47xx_wdt.c +++ b/drivers/watchdog/bcm47xx_wdt.c @@ -21,6 +21,7 @@ #include <linux/watchdog.h> #include <linux/timer.h> #include <linux/jiffies.h> +#include <linux/stringify.h> #define DRV_NAME "bcm47xx_wdt" @@ -33,12 +34,12 @@ static bool nowayout = WATCHDOG_NOWAYOUT; module_param(timeout, int, 0); MODULE_PARM_DESC(timeout, "Watchdog time in seconds. (default=" - __MODULE_STRING(WDT_DEFAULT_TIME) ")"); + __stringify(WDT_DEFAULT_TIME) ")"); module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); static inline struct bcm47xx_wdt bcm47xx_wdt_get(struct watchdog_device wdd) { diff --git a/drivers/watchdog/bcm7038_wdt.c b/drivers/watchdog/bcm7038_wdt.c index e038dd66b8198..1117026cf9594 100644 --- a/drivers/watchdog/bcm7038_wdt.c +++ b/drivers/watchdog/bcm7038_wdt.c @@ -12,6 +12,7 @@ #include <linux/platform_device.h> #include <linux/platform_data/bcm7038_wdt.h> #include <linux/pm.h> +#include <linux/stringify.h> #include <linux/watchdog.h> #define WDT_START_1 0xff00 @@ -228,7 +229,7 @@ module_platform_driver(bcm7038_wdt_driver); module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Driver for Broadcom 7038 SoCs Watchdog"); MODULE_AUTHOR("Justin Chen"); diff --git a/drivers/watchdog/booke_wdt.c b/drivers/watchdog/booke_wdt.c index 1b1fb389b89ba..1224d1737e87b 100644 --- a/drivers/watchdog/booke_wdt.c +++ b/drivers/watchdog/booke_wdt.c @@ -12,6 +12,7 @@ #include <linux/module.h> #include <linux/smp.h> +#include <linux/stringify.h> #include <linux/watchdog.h> #include <asm/reg_booke.h> @@ -43,7 +44,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); #ifdef CONFIG_PPC_E500 diff --git a/drivers/watchdog/cadence_wdt.c b/drivers/watchdog/cadence_wdt.c index ad46b33ce5f2e..0d635fb8b0f7c 100644 --- a/drivers/watchdog/cadence_wdt.c +++ b/drivers/watchdog/cadence_wdt.c @@ -15,6 +15,7 @@ #include <linux/module.h> #include <linux/of.h> #include <linux/platform_device.h> +#include <linux/stringify.h> #include <linux/watchdog.h> #define CDNS_WDT_DEFAULT_TIMEOUT 10 @@ -52,12 +53,12 @@ static int nowayout = WATCHDOG_NOWAYOUT; module_param(wdt_timeout, int, 0644); MODULE_PARM_DESC(wdt_timeout, "Watchdog time in seconds. (default=" - __MODULE_STRING(CDNS_WDT_DEFAULT_TIMEOUT) ")"); + __stringify(CDNS_WDT_DEFAULT_TIMEOUT) ")"); module_param(nowayout, int, 0644); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); /* * struct cdns_wdt - Watchdog device structure diff --git a/drivers/watchdog/cgbc_wdt.c b/drivers/watchdog/cgbc_wdt.c index 702b055ba6f4b..a90e6af13bed3 100644 --- a/drivers/watchdog/cgbc_wdt.c +++ b/drivers/watchdog/cgbc_wdt.c @@ -11,6 +11,7 @@ #include <linux/limits.h> #include <linux/module.h> #include <linux/platform_device.h> +#include <linux/stringify.h> #include <linux/watchdog.h> #include <linux/mfd/cgbc.h> @@ -38,19 +39,19 @@ static unsigned int timeout; module_param(timeout, uint, 0); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. (>=0, default=" - __MODULE_STRING(CGBC_WDT_DEFAULT_TIMEOUT) ")"); + __stringify(CGBC_WDT_DEFAULT_TIMEOUT) ")"); static unsigned int pretimeout = CGBC_WDT_DEFAULT_PRETIMEOUT; module_param(pretimeout, uint, 0); MODULE_PARM_DESC(pretimeout, "Watchdog pretimeout in seconds. (>=0, default=" - __MODULE_STRING(CGBC_WDT_DEFAULT_PRETIMEOUT) ")"); + __stringify(CGBC_WDT_DEFAULT_PRETIMEOUT) ")"); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); struct cgbc_wdt_data { struct cgbc_device_data cgbc; diff --git a/drivers/watchdog/da9052_wdt.c b/drivers/watchdog/da9052_wdt.c index afb7887c3a1e8..959cba0a88195 100644 --- a/drivers/watchdog/da9052_wdt.c +++ b/drivers/watchdog/da9052_wdt.c @@ -17,6 +17,7 @@ #include <linux/types.h> #include <linux/kernel.h> #include <linux/jiffies.h> +#include <linux/stringify.h> #include <linux/mfd/da9052/reg.h> #include <linux/mfd/da9052/da9052.h> @@ -34,13 +35,13 @@ static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); static int timeout; module_param(timeout, int, 0); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. (default = " - __MODULE_STRING(WDT_DEFAULT_TIMEOUT) ")"); + __stringify(WDT_DEFAULT_TIMEOUT) ")"); static const struct { u8 reg_val; diff --git a/drivers/watchdog/da9055_wdt.c b/drivers/watchdog/da9055_wdt.c index 9d5a2009466f7..cbb87855bd6a4 100644 --- a/drivers/watchdog/da9055_wdt.c +++ b/drivers/watchdog/da9055_wdt.c @@ -15,6 +15,7 @@ #include <linux/platform_device.h> #include <linux/watchdog.h> #include <linux/delay.h> +#include <linux/stringify.h> #include <linux/mfd/da9055/core.h> #include <linux/mfd/da9055/reg.h> @@ -23,7 +24,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); #define DA9055_DEF_TIMEOUT 4 #define DA9055_TWDMIN 256 diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c index 6ea0434f45c22..fcee686315c34 100644 --- a/drivers/watchdog/davinci_wdt.c +++ b/drivers/watchdog/davinci_wdt.c @@ -19,6 +19,7 @@ #include <linux/device.h> #include <linux/clk.h> #include <linux/err.h> +#include <linux/stringify.h> #define MODULE_NAME "DAVINCI-WDT: " @@ -250,8 +251,8 @@ MODULE_DESCRIPTION("DaVinci Watchdog Driver"); module_param(heartbeat, int, 0); MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat period in seconds from 1 to " - __MODULE_STRING(MAX_HEARTBEAT) ", default " - __MODULE_STRING(DEFAULT_HEARTBEAT)); + __stringify(MAX_HEARTBEAT) ", default " + __stringify(DEFAULT_HEARTBEAT)); MODULE_LICENSE("GPL"); MODULE_ALIAS("platform:davinci-wdt"); diff --git a/drivers/watchdog/db8500_wdt.c b/drivers/watchdog/db8500_wdt.c index 70ccea13288d8..7e11c28997ec6 100644 --- a/drivers/watchdog/db8500_wdt.c +++ b/drivers/watchdog/db8500_wdt.c @@ -15,6 +15,7 @@ #include <linux/uaccess.h> #include <linux/watchdog.h> #include <linux/platform_device.h> +#include <linux/stringify.h> #include <linux/mfd/db8500-prcmu.h> @@ -27,13 +28,13 @@ static unsigned int timeout = WATCHDOG_TIMEOUT; module_param(timeout, uint, 0); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. default=" - __MODULE_STRING(WATCHDOG_TIMEOUT) "."); + __stringify(WATCHDOG_TIMEOUT) "."); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); static int db8500_wdt_start(struct watchdog_device wdd) { diff --git a/drivers/watchdog/dw_wdt.c b/drivers/watchdog/dw_wdt.c index 39031445d754b..c1d40d7b2165f 100644 --- a/drivers/watchdog/dw_wdt.c +++ b/drivers/watchdog/dw_wdt.c @@ -27,6 +27,7 @@ #include <linux/platform_device.h> #include <linux/pm.h> #include <linux/reset.h> +#include <linux/stringify.h> #include <linux/watchdog.h> #define WDOG_CONTROL_REG_OFFSET 0x00 @@ -66,7 +67,7 @@ static const u32 dw_wdt_fix_tops[DW_WDT_NUM_TOPS] = { static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started " - "(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + "(default=" __stringify(WATCHDOG_NOWAYOUT) ")"); enum dw_wdt_rmod { DW_WDT_RMOD_RESET = 1, diff --git a/drivers/watchdog/ebc-c384_wdt.c b/drivers/watchdog/ebc-c384_wdt.c index 8ef4b0df3855f..39cc1f7e1cdb0 100644 --- a/drivers/watchdog/ebc-c384_wdt.c +++ b/drivers/watchdog/ebc-c384_wdt.c @@ -13,6 +13,7 @@ #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/types.h> +#include <linux/stringify.h> #include <linux/watchdog.h> #define MODULE_NAME "ebc-c384_wdt" @@ -30,12 +31,12 @@ static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); static unsigned timeout; module_param(timeout, uint, 0); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds (default=" - __MODULE_STRING(WATCHDOG_TIMEOUT) ")"); + __stringify(WATCHDOG_TIMEOUT) ")"); static int ebc_c384_wdt_start(struct watchdog_device wdev) { diff --git a/drivers/watchdog/eurotechwdt.c b/drivers/watchdog/eurotechwdt.c index 10c647b1226af..4d671c4e148af 100644 --- a/drivers/watchdog/eurotechwdt.c +++ b/drivers/watchdog/eurotechwdt.c @@ -56,6 +56,7 @@ #include <linux/init.h> #include <linux/io.h> #include <linux/uaccess.h> +#include <linux/stringify.h> static unsigned long eurwdt_is_open; @@ -77,7 +78,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); / * Some symbolic names diff --git a/drivers/watchdog/exar_wdt.c b/drivers/watchdog/exar_wdt.c index db62c9797406f..553be158a7252 100644 --- a/drivers/watchdog/exar_wdt.c +++ b/drivers/watchdog/exar_wdt.c @@ -14,6 +14,7 @@ #include <linux/module.h> #include <linux/platform_device.h> #include <linux/slab.h> +#include <linux/stringify.h> #include <linux/watchdog.h> #define DRV_NAME "exar_wdt" @@ -70,13 +71,13 @@ static int timeout = WATCHDOG_TIMEOUT; module_param(timeout, int, 0); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. 1<=timeout<=15300, default=" - __MODULE_STRING(WATCHDOG_TIMEOUT) "."); + __stringify(WATCHDOG_TIMEOUT) "."); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); static int exar_sio_enter(const unsigned short config_port, const unsigned char key) diff --git a/drivers/watchdog/f71808e_wdt.c b/drivers/watchdog/f71808e_wdt.c index 6a16d3d0bb1e6..2790061a68f34 100644 --- a/drivers/watchdog/f71808e_wdt.c +++ b/drivers/watchdog/f71808e_wdt.c @@ -14,6 +14,7 @@ #include <linux/ioport.h> #include <linux/module.h> #include <linux/platform_device.h> +#include <linux/stringify.h> #include <linux/watchdog.h> #define DRVNAME "f71808e_wdt" @@ -81,20 +82,20 @@ static int timeout = WATCHDOG_TIMEOUT; /* default timeout in seconds / module_param(timeout, int, 0); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. 1<= timeout <=" - __MODULE_STRING(WATCHDOG_MAX_TIMEOUT) " (default=" - __MODULE_STRING(WATCHDOG_TIMEOUT) ")"); + __stringify(WATCHDOG_MAX_TIMEOUT) " (default=" + __stringify(WATCHDOG_TIMEOUT) ")"); static unsigned int pulse_width = WATCHDOG_PULSE_WIDTH; module_param(pulse_width, uint, 0); MODULE_PARM_DESC(pulse_width, "Watchdog signal pulse width. 0(=level), 1, 25, 30, 125, 150, 5000 or 6000 ms" - " (default=" __MODULE_STRING(WATCHDOG_PULSE_WIDTH) ")"); + " (default=" __stringify(WATCHDOG_PULSE_WIDTH) ")"); static unsigned int f71862fg_pin = WATCHDOG_F71862FG_PIN; module_param(f71862fg_pin, uint, 0); MODULE_PARM_DESC(f71862fg_pin, "Watchdog f71862fg reset output pin configuration. Choose pin 56 or 63" - " (default=" __MODULE_STRING(WATCHDOG_F71862FG_PIN)")"); + " (default=" __stringify(WATCHDOG_F71862FG_PIN)")"); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0444); diff --git a/drivers/watchdog/gef_wdt.c b/drivers/watchdog/gef_wdt.c index bf6f733dfb5f7..4d39588a49c32 100644 --- a/drivers/watchdog/gef_wdt.c +++ b/drivers/watchdog/gef_wdt.c @@ -34,6 +34,7 @@ #include <linux/platform_device.h> #include <linux/io.h> #include <linux/uaccess.h> +#include <linux/stringify.h> #include <sysdev/fsl_soc.h> @@ -70,7 +71,7 @@ static DEFINE_SPINLOCK(gef_wdt_spinlock); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); static int gef_wdt_toggle_wdc(int enabled_predicate, int field_shift) diff --git a/drivers/watchdog/geodewdt.c b/drivers/watchdog/geodewdt.c index 5b80ade1c6814..437cc0a536545 100644 --- a/drivers/watchdog/geodewdt.c +++ b/drivers/watchdog/geodewdt.c @@ -16,6 +16,7 @@ #include <linux/platform_device.h> #include <linux/reboot.h> #include <linux/uaccess.h> +#include <linux/stringify.h> #include <linux/cs5535.h> @@ -34,13 +35,13 @@ static int timeout = WATCHDOG_TIMEOUT; module_param(timeout, int, 0); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. 1<= timeout <=131, default=" - __MODULE_STRING(WATCHDOG_TIMEOUT) "."); + __stringify(WATCHDOG_TIMEOUT) "."); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); static struct platform_device geodewdt_platform_device; static unsigned long wdt_flags; diff --git a/drivers/watchdog/gpio_wdt.c b/drivers/watchdog/gpio_wdt.c index 1abc7d0b78a62..2cd79c8f60dcd 100644 --- a/drivers/watchdog/gpio_wdt.c +++ b/drivers/watchdog/gpio_wdt.c @@ -11,13 +11,14 @@ #include <linux/module.h> #include <linux/platform_device.h> #include <linux/property.h> +#include <linux/stringify.h> #include <linux/watchdog.h> static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); #define SOFT_TIMEOUT_MIN 1 #define SOFT_TIMEOUT_DEF 60 diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c index 8af1fad2de0bd..7b9eb4e4b6e7c 100644 --- a/drivers/watchdog/hpwdt.c +++ b/drivers/watchdog/hpwdt.c @@ -20,6 +20,7 @@ #include <linux/pci.h> #include <linux/pci_ids.h> #include <linux/types.h> +#include <linux/stringify.h> #include <linux/watchdog.h> #ifdef CONFIG_HPWDT_NMI_DECODING #include <asm/nmi.h> @@ -432,7 +433,7 @@ MODULE_PARM_DESC(timeout, "Alias of soft_margin"); module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); module_param(kdumptimeout, int, 0444); MODULE_PARM_DESC(kdumptimeout, "Timeout applied for crash kernel transition in seconds"); diff --git a/drivers/watchdog/i6300esb.c b/drivers/watchdog/i6300esb.c index a30835f547b32..006d263cf1356 100644 --- a/drivers/watchdog/i6300esb.c +++ b/drivers/watchdog/i6300esb.c @@ -37,6 +37,7 @@ #include <linux/ioport.h> #include <linux/uaccess.h> #include <linux/io.h> +#include <linux/stringify.h> /* Module and version information / #define ESB_MODULE_NAME "i6300ESB timer" @@ -74,19 +75,19 @@ #define ESB_HEARTBEAT_MIN 1 #define ESB_HEARTBEAT_MAX 2046 #define ESB_HEARTBEAT_DEFAULT 30 -#define ESB_HEARTBEAT_RANGE __MODULE_STRING(ESB_HEARTBEAT_MIN) \ - "<heartbeat<" __MODULE_STRING(ESB_HEARTBEAT_MAX) +#define ESB_HEARTBEAT_RANGE __stringify(ESB_HEARTBEAT_MIN) \ + "<heartbeat<" __stringify(ESB_HEARTBEAT_MAX) static int heartbeat; / in seconds / module_param(heartbeat, int, 0); MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. (" ESB_HEARTBEAT_RANGE - ", default=" __MODULE_STRING(ESB_HEARTBEAT_DEFAULT) ")"); + ", default=" __stringify(ESB_HEARTBEAT_DEFAULT) ")"); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); / internal variables / struct esb_dev { diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c index 1dec9cd155b11..0a8bf28f57688 100644 --- a/drivers/watchdog/iTCO_wdt.c +++ b/drivers/watchdog/iTCO_wdt.c @@ -60,6 +60,7 @@ #include <linux/ioport.h> / For io-port access / #include <linux/uaccess.h> / For copy_to_user/put_user/... / #include <linux/io.h> / For inb/outb/... / +#include <linux/stringify.h> / For __stringify / #include <linux/platform_data/itco_wdt.h> #include <linux/mfd/intel_pmc_bxt.h> @@ -115,13 +116,13 @@ static int heartbeat = WATCHDOG_TIMEOUT; / in seconds / module_param(heartbeat, int, 0); MODULE_PARM_DESC(heartbeat, "Watchdog timeout in seconds. " "5..76 (TCO v1) or 3..614 (TCO v2), default=" - __MODULE_STRING(WATCHDOG_TIMEOUT) ")"); + __stringify(WATCHDOG_TIMEOUT) ")"); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); static int turn_SMI_watchdog_clear_off = 1; module_param(turn_SMI_watchdog_clear_off, int, 0); diff --git a/drivers/watchdog/ib700wdt.c b/drivers/watchdog/ib700wdt.c index 5ce6101d236d7..3806d86eb36ad 100644 --- a/drivers/watchdog/ib700wdt.c +++ b/drivers/watchdog/ib700wdt.c @@ -41,6 +41,7 @@ #include <linux/platform_device.h> #include <linux/io.h> #include <linux/uaccess.h> +#include <linux/stringify.h> static struct platform_device ibwdt_platform_device; @@ -96,13 +97,13 @@ static int timeout = WATCHDOG_TIMEOUT; /* in seconds / module_param(timeout, int, 0); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. 0<= timeout <=30, default=" - __MODULE_STRING(WATCHDOG_TIMEOUT) "."); + __stringify(WATCHDOG_TIMEOUT) "."); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); / diff --git a/drivers/watchdog/ibmasr.c b/drivers/watchdog/ibmasr.c index cf845f865945d..53bd84e6d57f1 100644 --- a/drivers/watchdog/ibmasr.c +++ b/drivers/watchdog/ibmasr.c @@ -21,6 +21,7 @@ #include <linux/dmi.h> #include <linux/io.h> #include <linux/uaccess.h> +#include <linux/stringify.h> enum { @@ -413,7 +414,7 @@ module_exit(ibmasr_exit); module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); MODULE_DESCRIPTION("IBM Automatic Server Restart driver"); MODULE_AUTHOR("Andrey Panin"); diff --git a/drivers/watchdog/ie6xx_wdt.c b/drivers/watchdog/ie6xx_wdt.c index 5a7bb7e84653f..eda515b917cc4 100644 --- a/drivers/watchdog/ie6xx_wdt.c +++ b/drivers/watchdog/ie6xx_wdt.c @@ -17,6 +17,7 @@ #include <linux/debugfs.h> #include <linux/uaccess.h> #include <linux/spinlock.h> +#include <linux/stringify.h> #define DRIVER_NAME "ie6xx_wdt" @@ -49,14 +50,14 @@ static unsigned int timeout = DEFAULT_TIME; module_param(timeout, uint, 0); MODULE_PARM_DESC(timeout, "Default Watchdog timer setting (" - __MODULE_STRING(DEFAULT_TIME) "s)." + __stringify(DEFAULT_TIME) "s)." "The range is from 1 to 600"); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); static u8 resetmode = 0x10; module_param(resetmode, byte, 0); diff --git a/drivers/watchdog/imgpdc_wdt.c b/drivers/watchdog/imgpdc_wdt.c index 65cc8396aa595..bb6227c40de43 100644 --- a/drivers/watchdog/imgpdc_wdt.c +++ b/drivers/watchdog/imgpdc_wdt.c @@ -43,6 +43,7 @@ #include <linux/module.h> #include <linux/platform_device.h> #include <linux/slab.h> +#include <linux/stringify.h> #include <linux/watchdog.h> /* registers / @@ -71,12 +72,12 @@ static int heartbeat; module_param(heartbeat, int, 0); MODULE_PARM_DESC(heartbeat, "Watchdog heartbeats in seconds " - "(default=" __MODULE_STRING(PDC_WDT_DEF_TIMEOUT) ")"); + "(default=" __stringify(PDC_WDT_DEF_TIMEOUT) ")"); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started " - "(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + "(default=" __stringify(WATCHDOG_NOWAYOUT) ")"); struct pdc_wdt_dev { struct watchdog_device wdt_dev; diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c index 4b3a192ee3e82..58aa5f999f4fe 100644 --- a/drivers/watchdog/imx2_wdt.c +++ b/drivers/watchdog/imx2_wdt.c @@ -29,6 +29,7 @@ #include <linux/of.h> #include <linux/platform_device.h> #include <linux/regmap.h> +#include <linux/stringify.h> #include <linux/watchdog.h> #define DRIVER_NAME "imx2-wdt" @@ -79,12 +80,12 @@ struct imx2_wdt_device { static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); static unsigned timeout; module_param(timeout, uint, 0); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds (default=" - __MODULE_STRING(IMX2_WDT_DEFAULT_TIME) ")"); + __stringify(IMX2_WDT_DEFAULT_TIME) ")"); static const struct watchdog_info imx2_wdt_info = { .identity = "imx2+ watchdog", diff --git a/drivers/watchdog/imx7ulp_wdt.c b/drivers/watchdog/imx7ulp_wdt.c index 855dc9d5083a5..f61936194aea8 100644 --- a/drivers/watchdog/imx7ulp_wdt.c +++ b/drivers/watchdog/imx7ulp_wdt.c @@ -11,6 +11,7 @@ #include <linux/of.h> #include <linux/platform_device.h> #include <linux/reboot.h> +#include <linux/stringify.h> #include <linux/watchdog.h> #define WDOG_CS 0x0 @@ -51,7 +52,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0000); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); struct imx_wdt_hw_feature { bool prescaler_enable; diff --git a/drivers/watchdog/imx_sc_wdt.c b/drivers/watchdog/imx_sc_wdt.c index 1280b9b1ec2ac..fc39f9db4c06f 100644 --- a/drivers/watchdog/imx_sc_wdt.c +++ b/drivers/watchdog/imx_sc_wdt.c @@ -11,6 +11,7 @@ #include <linux/moduleparam.h> #include <linux/of.h> #include <linux/platform_device.h> +#include <linux/stringify.h> #include <linux/watchdog.h> #define DEFAULT_TIMEOUT 60 @@ -39,7 +40,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0000); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); struct imx_sc_wdt_device { struct watchdog_device wdd; diff --git a/drivers/watchdog/indydog.c b/drivers/watchdog/indydog.c index d3092d2613452..5268b1feb7ce7 100644 --- a/drivers/watchdog/indydog.c +++ b/drivers/watchdog/indydog.c @@ -22,6 +22,7 @@ #include <linux/reboot.h> #include <linux/init.h> #include <linux/uaccess.h> +#include <linux/stringify.h> #include <asm/sgi/mc.h> static unsigned long indydog_alive; @@ -33,7 +34,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); static void indydog_start(void) { diff --git a/drivers/watchdog/intel_oc_wdt.c b/drivers/watchdog/intel_oc_wdt.c index a39892c10770e..d1e9a3f62369f 100644 --- a/drivers/watchdog/intel_oc_wdt.c +++ b/drivers/watchdog/intel_oc_wdt.c @@ -14,6 +14,7 @@ #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/platform_device.h> +#include <linux/stringify.h> #include <linux/watchdog.h> #define INTEL_OC_WDT_TOV GENMASK(9, 0) @@ -48,12 +49,12 @@ struct intel_oc_wdt { static int heartbeat; module_param(heartbeat, uint, 0); MODULE_PARM_DESC(heartbeat, "Watchdog heartbeats in seconds. (default=" - __MODULE_STRING(WDT_HEARTBEAT) ")"); + __stringify(WDT_HEARTBEAT) ")"); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); static int intel_oc_wdt_start(struct watchdog_device wdd) { diff --git a/drivers/watchdog/it87_wdt.c b/drivers/watchdog/it87_wdt.c index 1d9f8591f38d8..087250ab036a9 100644 --- a/drivers/watchdog/it87_wdt.c +++ b/drivers/watchdog/it87_wdt.c @@ -29,6 +29,7 @@ #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/printk.h> +#include <linux/stringify.h> #include <linux/types.h> #include <linux/watchdog.h> @@ -105,13 +106,13 @@ static bool nowayout = DEFAULT_NOWAYOUT; module_param(timeout, int, 0); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds, default=" - __MODULE_STRING(DEFAULT_TIMEOUT)); + __stringify(DEFAULT_TIMEOUT)); module_param(testmode, int, 0); MODULE_PARM_DESC(testmode, "Watchdog test mode (1 = no reboot), default=" - __MODULE_STRING(DEFAULT_TESTMODE)); + __stringify(DEFAULT_TESTMODE)); module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started, default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT)); + __stringify(WATCHDOG_NOWAYOUT)); /* Superio Chip / diff --git a/drivers/watchdog/jz4740_wdt.c b/drivers/watchdog/jz4740_wdt.c index 395bde79e2920..9dec1b8224101 100644 --- a/drivers/watchdog/jz4740_wdt.c +++ b/drivers/watchdog/jz4740_wdt.c @@ -19,6 +19,7 @@ #include <linux/err.h> #include <linux/of.h> #include <linux/regmap.h> +#include <linux/stringify.h> #define DEFAULT_HEARTBEAT 5 #define MAX_HEARTBEAT 2048 @@ -27,14 +28,14 @@ static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); static unsigned int heartbeat = DEFAULT_HEARTBEAT; module_param(heartbeat, uint, 0); MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat period in seconds from 1 to " - __MODULE_STRING(MAX_HEARTBEAT) ", default " - __MODULE_STRING(DEFAULT_HEARTBEAT)); + __stringify(MAX_HEARTBEAT) ", default " + __stringify(DEFAULT_HEARTBEAT)); struct jz4740_wdt_drvdata { struct watchdog_device wdt; diff --git a/drivers/watchdog/keembay_wdt.c b/drivers/watchdog/keembay_wdt.c index 7c8e53921e407..11b4b26f7b88e 100644 --- a/drivers/watchdog/keembay_wdt.c +++ b/drivers/watchdog/keembay_wdt.c @@ -14,6 +14,7 @@ #include <linux/module.h> #include <linux/platform_device.h> #include <linux/reboot.h> +#include <linux/stringify.h> #include <linux/watchdog.h> / Non-secure watchdog register offsets / @@ -39,12 +40,12 @@ static unsigned int timeout = WDT_TIMEOUT; module_param(timeout, int, 0); MODULE_PARM_DESC(timeout, "Watchdog timeout period in seconds (default = " - __MODULE_STRING(WDT_TIMEOUT) ")"); + __stringify(WDT_TIMEOUT) ")"); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default = " - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); struct keembay_wdt { struct watchdog_device wdd; diff --git a/drivers/watchdog/kempld_wdt.c b/drivers/watchdog/kempld_wdt.c index e6c7a29066804..b4cde48d2b10a 100644 --- a/drivers/watchdog/kempld_wdt.c +++ b/drivers/watchdog/kempld_wdt.c @@ -21,6 +21,7 @@ #include <linux/uaccess.h> #include <linux/watchdog.h> #include <linux/platform_device.h> +#include <linux/stringify.h> #include <linux/mfd/kempld.h> #define KEMPLD_WDT_STAGE_TIMEOUT(x) (0x1b + (x) 4) @@ -85,19 +86,19 @@ static unsigned int timeout = DEFAULT_TIMEOUT; module_param(timeout, uint, 0); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. (>=0, default=" - __MODULE_STRING(DEFAULT_TIMEOUT) ")"); + __stringify(DEFAULT_TIMEOUT) ")"); static unsigned int pretimeout = DEFAULT_PRETIMEOUT; module_param(pretimeout, uint, 0); MODULE_PARM_DESC(pretimeout, "Watchdog pretimeout in seconds. (>=0, default=" - __MODULE_STRING(DEFAULT_PRETIMEOUT) ")"); + __stringify(DEFAULT_PRETIMEOUT) ")"); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); static int kempld_wdt_set_stage_action(struct kempld_wdt_data wdt_data, struct kempld_wdt_stage stage, diff --git a/drivers/watchdog/lenovo_se10_wdt.c b/drivers/watchdog/lenovo_se10_wdt.c index 503e220263f95..1eaf86c85cc0e 100644 --- a/drivers/watchdog/lenovo_se10_wdt.c +++ b/drivers/watchdog/lenovo_se10_wdt.c @@ -10,6 +10,7 @@ #include <linux/moduleparam.h> #include <linux/platform_device.h> #include <linux/string.h> +#include <linux/stringify.h> #include <linux/types.h> #include <linux/watchdog.h> @@ -48,13 +49,13 @@ static int timeout; /* in seconds / module_param(timeout, int, 0); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. 1 <= timeout <= 255, default=" - __MODULE_STRING(WATCHDOG_TIMEOUT) "."); + __stringify(WATCHDOG_TIMEOUT) "."); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); struct se10_wdt { struct watchdog_device wdd; diff --git a/drivers/watchdog/lenovo_se30_wdt.c b/drivers/watchdog/lenovo_se30_wdt.c index 1c73bb7eeeeed..127ea9a1933ff 100644 --- a/drivers/watchdog/lenovo_se30_wdt.c +++ b/drivers/watchdog/lenovo_se30_wdt.c @@ -13,6 +13,7 @@ #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/platform_device.h> +#include <linux/stringify.h> #include <linux/watchdog.h> #define IOREGION_OFFSET 4 / Use EC port 1 / @@ -28,13 +29,13 @@ static int timeout; / in seconds / module_param(timeout, int, 0); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. 1 <= timeout <= 255, default=" - __MODULE_STRING(WATCHDOG_TIMEOUT) "."); + __stringify(WATCHDOG_TIMEOUT) "."); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); #define LNV_SE30_NAME "lenovo-se30-wdt" #define LNV_SE30_ID 0x0110 diff --git a/drivers/watchdog/lenovo_se30g2_se60_wdt.c b/drivers/watchdog/lenovo_se30g2_se60_wdt.c index f31ecdb82ad05..c87abdb1a1b2d 100644 --- a/drivers/watchdog/lenovo_se30g2_se60_wdt.c +++ b/drivers/watchdog/lenovo_se30g2_se60_wdt.c @@ -10,6 +10,7 @@ #include <linux/moduleparam.h> #include <linux/platform_device.h> #include <linux/string.h> +#include <linux/stringify.h> #include <linux/types.h> #include <linux/watchdog.h> @@ -37,13 +38,13 @@ static int timeout; / in seconds / module_param(timeout, int, 0); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. 1 <= timeout <= 255, default=" - __MODULE_STRING(WATCHDOG_TIMEOUT) "."); + __stringify(WATCHDOG_TIMEOUT) "."); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); struct se_30g2_60_wdt { struct watchdog_device wdd; diff --git a/drivers/watchdog/loongson1_wdt.c b/drivers/watchdog/loongson1_wdt.c index 2417519717cc4..7f8de11f1b4ab 100644 --- a/drivers/watchdog/loongson1_wdt.c +++ b/drivers/watchdog/loongson1_wdt.c @@ -9,6 +9,7 @@ #include <linux/module.h> #include <linux/of.h> #include <linux/platform_device.h> +#include <linux/stringify.h> #include <linux/watchdog.h> / Loongson Watchdog Register Definitions / @@ -19,12 +20,12 @@ static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); static unsigned int heartbeat; module_param(heartbeat, uint, 0); MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. (default=" - __MODULE_STRING(DEFAULT_HEARTBEAT) ")"); + __stringify(DEFAULT_HEARTBEAT) ")"); struct ls1x_wdt_pdata { u32 timer_offset; diff --git a/drivers/watchdog/lpc18xx_wdt.c b/drivers/watchdog/lpc18xx_wdt.c index 3e8e80bbcb93b..633119e4b126d 100644 --- a/drivers/watchdog/lpc18xx_wdt.c +++ b/drivers/watchdog/lpc18xx_wdt.c @@ -15,6 +15,7 @@ #include <linux/module.h> #include <linux/of.h> #include <linux/platform_device.h> +#include <linux/stringify.h> #include <linux/watchdog.h> / Registers / @@ -41,12 +42,12 @@ static int heartbeat; module_param(heartbeat, int, 0); MODULE_PARM_DESC(heartbeat, "Watchdog heartbeats in seconds (default=" - __MODULE_STRING(LPC18XX_WDT_DEF_TIMEOUT) ")"); + __stringify(LPC18XX_WDT_DEF_TIMEOUT) ")"); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); struct lpc18xx_wdt_dev { struct watchdog_device wdt_dev; diff --git a/drivers/watchdog/ma35d1_wdt.c b/drivers/watchdog/ma35d1_wdt.c index 119d58f338bf0..ede4bee594f1f 100644 --- a/drivers/watchdog/ma35d1_wdt.c +++ b/drivers/watchdog/ma35d1_wdt.c @@ -20,6 +20,7 @@ #include <linux/platform_device.h> #include <linux/pm_wakeirq.h> #include <linux/property.h> +#include <linux/stringify.h> #include <linux/types.h> #include <linux/watchdog.h> @@ -355,7 +356,7 @@ MODULE_PARM_DESC(timeout, "Watchdog heartbeat in seconds"); module_param(nowayout, bool, 0); MODULE_PARM_DESC( nowayout, - "Watchdog cannot be stopped once started (default=" __MODULE_STRING( + "Watchdog cannot be stopped once started (default=" __stringify( WATCHDOG_NOWAYOUT) ")"); MODULE_AUTHOR("Zi-Yu Chen <zychennvt@gmail.com>"); diff --git a/drivers/watchdog/max63xx_wdt.c b/drivers/watchdog/max63xx_wdt.c index e9073df1a7de3..aefda26bbcec9 100644 --- a/drivers/watchdog/max63xx_wdt.c +++ b/drivers/watchdog/max63xx_wdt.c @@ -23,6 +23,7 @@ #include <linux/io.h> #include <linux/slab.h> #include <linux/property.h> +#include <linux/stringify.h> #define DEFAULT_HEARTBEAT 60 #define MAX_HEARTBEAT 60 @@ -283,12 +284,12 @@ MODULE_DESCRIPTION("max63xx Watchdog Driver"); module_param(heartbeat, int, 0); MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat period in seconds from 1 to " - __MODULE_STRING(MAX_HEARTBEAT) ", default " - __MODULE_STRING(DEFAULT_HEARTBEAT)); + __stringify(MAX_HEARTBEAT) ", default " + __stringify(DEFAULT_HEARTBEAT)); module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); module_param(nodelay, int, 0); MODULE_PARM_DESC(nodelay, diff --git a/drivers/watchdog/max77620_wdt.c b/drivers/watchdog/max77620_wdt.c index ed5a98cea525d..79148cbad4f26 100644 --- a/drivers/watchdog/max77620_wdt.c +++ b/drivers/watchdog/max77620_wdt.c @@ -18,6 +18,7 @@ #include <linux/platform_device.h> #include <linux/regmap.h> #include <linux/slab.h> +#include <linux/stringify.h> #include <linux/watchdog.h> static bool nowayout = WATCHDOG_NOWAYOUT; @@ -255,7 +256,7 @@ MODULE_DESCRIPTION("Max77620 watchdog timer driver"); module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started " - "(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + "(default=" __stringify(WATCHDOG_NOWAYOUT) ")"); MODULE_AUTHOR("Laxman Dewangan <ldewangan@nvidia.com>"); MODULE_AUTHOR("Luca Ceresoli <luca.ceresoli@bootlin.com>"); diff --git a/drivers/watchdog/mena21_wdt.c b/drivers/watchdog/mena21_wdt.c index 99d2359d5a8a7..a762462c25c54 100644 --- a/drivers/watchdog/mena21_wdt.c +++ b/drivers/watchdog/mena21_wdt.c @@ -17,6 +17,7 @@ #include <linux/delay.h> #include <linux/bitops.h> #include <linux/of.h> +#include <linux/stringify.h> #define NUM_GPIOS 6 @@ -37,7 +38,7 @@ struct a21_wdt_drv { static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); static unsigned int a21_wdt_get_bootstatus(struct a21_wdt_drv drv) { diff --git a/drivers/watchdog/menf21bmc_wdt.c b/drivers/watchdog/menf21bmc_wdt.c index 81ebdfc371f4d..bb8eda18fbad6 100644 --- a/drivers/watchdog/menf21bmc_wdt.c +++ b/drivers/watchdog/menf21bmc_wdt.c @@ -11,6 +11,7 @@ #include <linux/watchdog.h> #include <linux/platform_device.h> #include <linux/i2c.h> +#include <linux/stringify.h> #define DEVNAME "menf21bmc_wdt" @@ -28,7 +29,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); struct menf21bmc_wdt { struct watchdog_device wdt; diff --git a/drivers/watchdog/menz69_wdt.c b/drivers/watchdog/menz69_wdt.c index 3fe23451135d7..962c6867bc073 100644 --- a/drivers/watchdog/menz69_wdt.c +++ b/drivers/watchdog/menz69_wdt.c @@ -8,6 +8,7 @@ #include <linux/kernel.h> #include <linux/mcb.h> #include <linux/module.h> +#include <linux/stringify.h> #include <linux/watchdog.h> struct men_z069_drv { @@ -29,7 +30,7 @@ struct men_z069_drv { static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); static int men_z069_wdt_start(struct watchdog_device wdt) { diff --git a/drivers/watchdog/meson_gxbb_wdt.c b/drivers/watchdog/meson_gxbb_wdt.c index a48622d11ad72..fb276060e8314 100644 --- a/drivers/watchdog/meson_gxbb_wdt.c +++ b/drivers/watchdog/meson_gxbb_wdt.c @@ -11,6 +11,7 @@ #include <linux/of.h> #include <linux/platform_device.h> #include <linux/slab.h> +#include <linux/stringify.h> #include <linux/types.h> #include <linux/watchdog.h> @@ -31,12 +32,12 @@ static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); static unsigned int timeout; module_param(timeout, uint, 0); MODULE_PARM_DESC(timeout, "Watchdog heartbeat in seconds=" - __MODULE_STRING(DEFAULT_TIMEOUT) ")"); + __stringify(DEFAULT_TIMEOUT) ")"); struct meson_gxbb_wdt { void __iomem reg_base; diff --git a/drivers/watchdog/meson_wdt.c b/drivers/watchdog/meson_wdt.c index 44db4ebc8599f..80a4f87713359 100644 --- a/drivers/watchdog/meson_wdt.c +++ b/drivers/watchdog/meson_wdt.c @@ -15,6 +15,7 @@ #include <linux/moduleparam.h> #include <linux/platform_device.h> #include <linux/property.h> +#include <linux/stringify.h> #include <linux/types.h> #include <linux/watchdog.h> @@ -218,7 +219,7 @@ MODULE_PARM_DESC(timeout, "Watchdog heartbeat in seconds"); module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); MODULE_LICENSE("GPL"); MODULE_AUTHOR("Carlo Caione <carlo@caione.org>"); diff --git a/drivers/watchdog/mixcomwd.c b/drivers/watchdog/mixcomwd.c index 1ecd5c48a005a..db358df2f2228 100644 --- a/drivers/watchdog/mixcomwd.c +++ b/drivers/watchdog/mixcomwd.c @@ -52,6 +52,7 @@ #include <linux/timer.h> #include <linux/uaccess.h> #include <linux/io.h> +#include <linux/stringify.h> /* * We have two types of cards that can be probed: @@ -107,7 +108,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); static void mixcomwd_ping(void) { diff --git a/drivers/watchdog/mpc8xxx_wdt.c b/drivers/watchdog/mpc8xxx_wdt.c index a4b497ecfa205..0d5a360b56292 100644 --- a/drivers/watchdog/mpc8xxx_wdt.c +++ b/drivers/watchdog/mpc8xxx_wdt.c @@ -22,6 +22,7 @@ #include <linux/watchdog.h> #include <linux/io.h> #include <linux/uaccess.h> +#include <linux/stringify.h> #include <sysdev/fsl_soc.h> #define WATCHDOG_TIMEOUT 10 @@ -57,7 +58,7 @@ static u16 timeout; module_param(timeout, ushort, 0); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. (1<timeout<65535, default=" - __MODULE_STRING(WATCHDOG_TIMEOUT) ")"); + __stringify(WATCHDOG_TIMEOUT) ")"); static bool reset = 1; module_param(reset, bool, 0); @@ -67,7 +68,7 @@ MODULE_PARM_DESC(reset, static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started " - "(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + "(default=" __stringify(WATCHDOG_NOWAYOUT) ")"); static void mpc8xxx_wdt_keepalive(struct mpc8xxx_wdt_ddata ddata) { diff --git a/drivers/watchdog/mt7621_wdt.c b/drivers/watchdog/mt7621_wdt.c index db47b131f7806..9e0ebec43c888 100644 --- a/drivers/watchdog/mt7621_wdt.c +++ b/drivers/watchdog/mt7621_wdt.c @@ -16,6 +16,7 @@ #include <linux/platform_device.h> #include <linux/mfd/syscon.h> #include <linux/regmap.h> +#include <linux/stringify.h> #define SYSC_RSTSTAT 0x38 #define WDT_RST_CAUSE BIT(1) @@ -41,7 +42,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); static inline void rt_wdt_w32(void __iomem base, unsigned int reg, u32 val) { diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c index d9c30e4c80e3f..46a83660f0988 100644 --- a/drivers/watchdog/mtk_wdt.c +++ b/drivers/watchdog/mtk_wdt.c @@ -31,6 +31,7 @@ #include <linux/types.h> #include <linux/watchdog.h> #include <linux/interrupt.h> +#include <linux/stringify.h> #define WDT_MAX_TIMEOUT 31 #define WDT_MIN_TIMEOUT 2 @@ -526,7 +527,7 @@ MODULE_PARM_DESC(timeout, "Watchdog heartbeat in seconds"); module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); MODULE_LICENSE("GPL"); MODULE_AUTHOR("Matthias Brugger <matthias.bgg@gmail.com>"); diff --git a/drivers/watchdog/nct6694_wdt.c b/drivers/watchdog/nct6694_wdt.c index bc3689bd4b6bb..169a6736e9ea0 100644 --- a/drivers/watchdog/nct6694_wdt.c +++ b/drivers/watchdog/nct6694_wdt.c @@ -11,6 +11,7 @@ #include <linux/module.h> #include <linux/platform_device.h> #include <linux/slab.h> +#include <linux/stringify.h> #include <linux/watchdog.h> #define DEVICE_NAME "nct6694-wdt" @@ -50,7 +51,7 @@ MODULE_PARM_DESC(pretimeout, "Watchdog pre-timeout in seconds"); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); enum { NCT6694_ACTION_NONE = 0, diff --git a/drivers/watchdog/ni903x_wdt.c b/drivers/watchdog/ni903x_wdt.c index c72a9ee9cb8e1..68b7c485726b2 100644 --- a/drivers/watchdog/ni903x_wdt.c +++ b/drivers/watchdog/ni903x_wdt.c @@ -9,6 +9,7 @@ #include <linux/io.h> #include <linux/module.h> #include <linux/platform_device.h> +#include <linux/stringify.h> #include <linux/watchdog.h> #define NIWD_CONTROL 0x01 @@ -46,13 +47,13 @@ static unsigned int timeout; module_param(timeout, uint, 0); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. (default=" - __MODULE_STRING(NIWD_DEFAULT_TIMEOUT) ")"); + __stringify(NIWD_DEFAULT_TIMEOUT) ")"); static int nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, int, S_IRUGO); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); static void ni903x_start(struct ni903x_wdt wdt) { diff --git a/drivers/watchdog/nic7018_wdt.c b/drivers/watchdog/nic7018_wdt.c index 8169423801f06..2b122ba8733a5 100644 --- a/drivers/watchdog/nic7018_wdt.c +++ b/drivers/watchdog/nic7018_wdt.c @@ -8,6 +8,7 @@ #include <linux/io.h> #include <linux/module.h> #include <linux/platform_device.h> +#include <linux/stringify.h> #include <linux/types.h> #include <linux/watchdog.h> @@ -34,13 +35,13 @@ static unsigned int timeout; module_param(timeout, uint, 0); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. (default=" - __MODULE_STRING(WDT_DEFAULT_TIMEOUT) ")"); + __stringify(WDT_DEFAULT_TIMEOUT) ")"); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started. (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); struct nic7018_wdt { u16 io_base; diff --git a/drivers/watchdog/nv_tco.c b/drivers/watchdog/nv_tco.c index f16cee5173d50..0d671b8bb3914 100644 --- a/drivers/watchdog/nv_tco.c +++ b/drivers/watchdog/nv_tco.c @@ -32,6 +32,7 @@ #include <linux/platform_device.h> #include <linux/uaccess.h> #include <linux/io.h> +#include <linux/stringify.h> #include "nv_tco.h" @@ -55,12 +56,12 @@ static struct platform_device nv_tco_platform_device; static int heartbeat = WATCHDOG_HEARTBEAT; /* in seconds / module_param(heartbeat, int, 0); MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. (2<heartbeat<39, " - "default=" __MODULE_STRING(WATCHDOG_HEARTBEAT) ")"); + "default=" __stringify(WATCHDOG_HEARTBEAT) ")"); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started" - " (default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + " (default=" __stringify(WATCHDOG_NOWAYOUT) ")"); / * Some TCO specific functions diff --git a/drivers/watchdog/octeon-wdt-main.c b/drivers/watchdog/octeon-wdt-main.c index 0615bb8160821..171b46d780e6f 100644 --- a/drivers/watchdog/octeon-wdt-main.c +++ b/drivers/watchdog/octeon-wdt-main.c @@ -55,6 +55,7 @@ #include <linux/cpu.h> #include <linux/irq.h> #include <linux/irqdomain.h> +#include <linux/stringify.h> #include <asm/mipsregs.h> #include <asm/uasm.h> @@ -93,13 +94,13 @@ static int heartbeat = WD_TIMO; module_param(heartbeat, int, 0444); MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. (0 < heartbeat, default=" - __MODULE_STRING(WD_TIMO) ")"); + __stringify(WD_TIMO) ")"); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0444); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); static int disable; module_param(disable, int, 0444); diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c index 95c7e44b7baac..2a6de73e6f0b3 100644 --- a/drivers/watchdog/omap_wdt.c +++ b/drivers/watchdog/omap_wdt.c @@ -38,6 +38,7 @@ #include <linux/io.h> #include <linux/slab.h> #include <linux/pm_runtime.h> +#include <linux/stringify.h> #include <linux/platform_data/omap-wd-timer.h> #include "omap_wdt.h" @@ -45,7 +46,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started " - "(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + "(default=" __stringify(WATCHDOG_NOWAYOUT) ")"); static unsigned timer_margin; module_param(timer_margin, uint, 0); diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c index 0ea946823b0a7..5d56e93f04064 100644 --- a/drivers/watchdog/orion_wdt.c +++ b/drivers/watchdog/orion_wdt.c @@ -22,6 +22,7 @@ #include <linux/err.h> #include <linux/of.h> #include <linux/of_device.h> +#include <linux/stringify.h> /* RSTOUT mask register physical address for Orion5x, Kirkwood and Dove / #define ORION_RSTOUT_MASK_OFFSET 0x20108 @@ -687,7 +688,7 @@ MODULE_PARM_DESC(heartbeat, "Initial watchdog heartbeat in seconds"); module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); MODULE_LICENSE("GPL v2"); MODULE_ALIAS("platform:orion_wdt"); diff --git a/drivers/watchdog/pc87413_wdt.c b/drivers/watchdog/pc87413_wdt.c index fbf835d112b84..29dab0e669bfb 100644 --- a/drivers/watchdog/pc87413_wdt.c +++ b/drivers/watchdog/pc87413_wdt.c @@ -30,6 +30,7 @@ #include <linux/moduleparam.h> #include <linux/io.h> #include <linux/uaccess.h> +#include <linux/stringify.h> / #define DEBUG 1 / @@ -577,15 +578,15 @@ MODULE_LICENSE("GPL"); module_param_hw(io, int, ioport, 0); MODULE_PARM_DESC(io, MODNAME " I/O port (default: " - __MODULE_STRING(IO_DEFAULT) ")."); + __stringify(IO_DEFAULT) ")."); module_param(timeout, int, 0); MODULE_PARM_DESC(timeout, "Watchdog timeout in minutes (default=" - __MODULE_STRING(DEFAULT_TIMEOUT) ")."); + __stringify(DEFAULT_TIMEOUT) ")."); module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); diff --git a/drivers/watchdog/pcwd.c b/drivers/watchdog/pcwd.c index d4ea7d6ccd6a7..3370a91552766 100644 --- a/drivers/watchdog/pcwd.c +++ b/drivers/watchdog/pcwd.c @@ -72,6 +72,7 @@ #include <linux/spinlock.h> / For spin_lock/spin_unlock/... / #include <linux/uaccess.h> / For copy_to_user/put_user/... / #include <linux/io.h> / For inb/outb/... / +#include <linux/stringify.h> / For __stringify / / Module and version information / #define WATCHDOG_VERSION "1.20" @@ -203,13 +204,13 @@ static int heartbeat = WATCHDOG_HEARTBEAT; module_param(heartbeat, int, 0); MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. " "(2 <= heartbeat <= 7200 or 0=delay-time from dip-switches, default=" - __MODULE_STRING(WATCHDOG_HEARTBEAT) ")"); + __stringify(WATCHDOG_HEARTBEAT) ")"); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); / * Internal functions diff --git a/drivers/watchdog/pcwd_pci.c b/drivers/watchdog/pcwd_pci.c index a489b426f2ba6..377e5a61faef8 100644 --- a/drivers/watchdog/pcwd_pci.c +++ b/drivers/watchdog/pcwd_pci.c @@ -47,6 +47,7 @@ #include <linux/spinlock.h> /* For spin_lock/spin_unlock/... / #include <linux/uaccess.h> / For copy_to_user/put_user/... / #include <linux/io.h> / For inb/outb/... / +#include <linux/stringify.h> / For __stringify / / Module and version information / #define WATCHDOG_VERSION "1.03" @@ -140,12 +141,12 @@ static int heartbeat = WATCHDOG_HEARTBEAT; module_param(heartbeat, int, 0); MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. " "(0<heartbeat<65536 or 0=delay-time from dip-switches, default=" - __MODULE_STRING(WATCHDOG_HEARTBEAT) ")"); + __stringify(WATCHDOG_HEARTBEAT) ")"); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); / * Internal functions diff --git a/drivers/watchdog/pcwd_usb.c b/drivers/watchdog/pcwd_usb.c index d7c18c990649a..15511c816add4 100644 --- a/drivers/watchdog/pcwd_usb.c +++ b/drivers/watchdog/pcwd_usb.c @@ -39,6 +39,7 @@ #include <linux/mutex.h> /* For mutex locking / #include <linux/hid.h> / For HID_REQ_SET_REPORT & HID_DT_REPORT / #include <linux/uaccess.h> / For copy_to_user/put_user/... / +#include <linux/stringify.h> / For __stringify / / Module and Version Information / @@ -57,12 +58,12 @@ static int heartbeat = WATCHDOG_HEARTBEAT; module_param(heartbeat, int, 0); MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. " "(0<heartbeat<65536 or 0=delay-time from dip-switches, default=" - __MODULE_STRING(WATCHDOG_HEARTBEAT) ")"); + __stringify(WATCHDOG_HEARTBEAT) ")"); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); / The vendor and product id's for the USB-PC Watchdog card / #define USB_PCWD_VENDOR_ID 0x0c98 diff --git a/drivers/watchdog/pika_wdt.c b/drivers/watchdog/pika_wdt.c index 87b8988d25206..09fc76aaa0513 100644 --- a/drivers/watchdog/pika_wdt.c +++ b/drivers/watchdog/pika_wdt.c @@ -25,6 +25,7 @@ #include <linux/io.h> #include <linux/of.h> #include <linux/of_address.h> +#include <linux/stringify.h> #define DRV_NAME "PIKA-WDT" @@ -39,12 +40,12 @@ static int heartbeat = WDT_HEARTBEAT; module_param(heartbeat, int, 0); MODULE_PARM_DESC(heartbeat, "Watchdog heartbeats in seconds. " - "(default = " __MODULE_STRING(WDT_HEARTBEAT) ")"); + "(default = " __stringify(WDT_HEARTBEAT) ")"); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started " - "(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + "(default=" __stringify(WATCHDOG_NOWAYOUT) ")"); static struct { void __iomem fpga; diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c index 87a44a5675a14..a7c39849cbfdc 100644 --- a/drivers/watchdog/pnx4008_wdt.c +++ b/drivers/watchdog/pnx4008_wdt.c @@ -30,6 +30,7 @@ #include <linux/of.h> #include <linux/delay.h> #include <linux/reboot.h> +#include <linux/stringify.h> /* WatchDog Timer - Chapter 23 Page 207 / @@ -237,8 +238,8 @@ MODULE_DESCRIPTION("PNX4008 Watchdog Driver"); module_param(heartbeat, uint, 0); MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat period in seconds from 1 to " - __MODULE_STRING(MAX_HEARTBEAT) ", default " - __MODULE_STRING(DEFAULT_HEARTBEAT)); + __stringify(MAX_HEARTBEAT) ", default " + __stringify(DEFAULT_HEARTBEAT)); module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, diff --git a/drivers/watchdog/pseries-wdt.c b/drivers/watchdog/pseries-wdt.c index e97b943e1d3c5..5f531a03a0fc6 100644 --- a/drivers/watchdog/pseries-wdt.c +++ b/drivers/watchdog/pseries-wdt.c @@ -10,6 +10,7 @@ #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/platform_device.h> +#include <linux/stringify.h> #include <linux/time64.h> #include <linux/watchdog.h> #include <asm/papr-watchdog.h> @@ -26,18 +27,18 @@ static const unsigned long pseries_wdt_action[] = { static unsigned int action = WATCHDOG_ACTION; module_param(action, uint, 0444); MODULE_PARM_DESC(action, "Action taken when watchdog expires (default=" - __MODULE_STRING(WATCHDOG_ACTION) ")"); + __stringify(WATCHDOG_ACTION) ")"); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0444); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); #define WATCHDOG_TIMEOUT 60 static unsigned int timeout = WATCHDOG_TIMEOUT; module_param(timeout, uint, 0444); MODULE_PARM_DESC(timeout, "Initial watchdog timeout in seconds (default=" - __MODULE_STRING(WATCHDOG_TIMEOUT) ")"); + __stringify(WATCHDOG_TIMEOUT) ")"); struct pseries_wdt { struct watchdog_device wd; diff --git a/drivers/watchdog/rc32434_wdt.c b/drivers/watchdog/rc32434_wdt.c index 0e5c5c96af58d..5301a93abf55f 100644 --- a/drivers/watchdog/rc32434_wdt.c +++ b/drivers/watchdog/rc32434_wdt.c @@ -27,6 +27,7 @@ #include <linux/spinlock.h> / For spin_lock/spin_unlock/... / #include <linux/uaccess.h> / For copy_to_user/put_user/... / #include <linux/io.h> / For devm_ioremap / +#include <linux/stringify.h> / For __stringify / #include <asm/mach-rc32434/integ.h> / For the Watchdog registers / @@ -57,12 +58,12 @@ extern unsigned int idt_cpu_freq; static int timeout = WATCHDOG_TIMEOUT; module_param(timeout, int, 0); MODULE_PARM_DESC(timeout, "Watchdog timeout value, in seconds (default=" - __MODULE_STRING(WATCHDOG_TIMEOUT) ")"); + __stringify(WATCHDOG_TIMEOUT) ")"); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); / apply or and nand masks to data read from addr and write back / #define SET_BITS(addr, or, nand) \ diff --git a/drivers/watchdog/renesas_wdt.c b/drivers/watchdog/renesas_wdt.c index 97bcd32bade52..8c0041ce55521 100644 --- a/drivers/watchdog/renesas_wdt.c +++ b/drivers/watchdog/renesas_wdt.c @@ -16,6 +16,7 @@ #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/smp.h> +#include <linux/stringify.h> #include <linux/sys_soc.h> #include <linux/watchdog.h> @@ -44,7 +45,7 @@ static const unsigned int clk_divs[] = { 1, 4, 16, 32, 64, 128, 1024, 4096 }; static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); struct rwdt_priv { void __iomem base; diff --git a/drivers/watchdog/rn5t618_wdt.c b/drivers/watchdog/rn5t618_wdt.c index 87d06d210ac9e..14056af36445c 100644 --- a/drivers/watchdog/rn5t618_wdt.c +++ b/drivers/watchdog/rn5t618_wdt.c @@ -9,6 +9,7 @@ #include <linux/mfd/rn5t618.h> #include <linux/module.h> #include <linux/platform_device.h> +#include <linux/stringify.h> #include <linux/watchdog.h> #define DRIVER_NAME "rn5t618-wdt" @@ -21,7 +22,7 @@ MODULE_PARM_DESC(timeout, "Initial watchdog timeout in seconds"); module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); struct rn5t618_wdt { struct watchdog_device wdt_dev; diff --git a/drivers/watchdog/rt2880_wdt.c b/drivers/watchdog/rt2880_wdt.c index c8edd83bb502e..38f31d302a4b3 100644 --- a/drivers/watchdog/rt2880_wdt.c +++ b/drivers/watchdog/rt2880_wdt.c @@ -15,6 +15,7 @@ #include <linux/watchdog.h> #include <linux/moduleparam.h> #include <linux/platform_device.h> +#include <linux/stringify.h> #include <asm/mach-ralink/ralink_regs.h> @@ -51,7 +52,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); static inline void rt_wdt_w32(void __iomem base, unsigned int reg, u32 val) { diff --git a/drivers/watchdog/rti_wdt.c b/drivers/watchdog/rti_wdt.c index 7c1bd83b056a8..6a64adbe1a8ea 100644 --- a/drivers/watchdog/rti_wdt.c +++ b/drivers/watchdog/rti_wdt.c @@ -17,6 +17,7 @@ #include <linux/of_reserved_mem.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> +#include <linux/stringify.h> #include <linux/types.h> #include <linux/watchdog.h> @@ -414,8 +415,8 @@ MODULE_DESCRIPTION("K3 RTI Watchdog Driver"); module_param(heartbeat, int, 0); MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat period in seconds from 1 to " - __MODULE_STRING(MAX_HEARTBEAT) ", default " - __MODULE_STRING(DEFAULT_HEARTBEAT)); + __stringify(MAX_HEARTBEAT) ", default " + __stringify(DEFAULT_HEARTBEAT)); MODULE_LICENSE("GPL"); MODULE_ALIAS("platform:rti-wdt"); diff --git a/drivers/watchdog/rzg2l_wdt.c b/drivers/watchdog/rzg2l_wdt.c index 509f9dffdacde..592ea7ce6d69a 100644 --- a/drivers/watchdog/rzg2l_wdt.c +++ b/drivers/watchdog/rzg2l_wdt.c @@ -14,6 +14,7 @@ #include <linux/platform_device.h> #include <linux/pm_domain.h> #include <linux/pm_runtime.h> +#include <linux/stringify.h> #include <linux/reset.h> #include <linux/units.h> #include <linux/watchdog.h> @@ -41,7 +42,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); enum rz_wdt_type { WDT_RZG2L, diff --git a/drivers/watchdog/rzv2h_wdt.c b/drivers/watchdog/rzv2h_wdt.c index 83540dd9a37b6..a8db85e85c73a 100644 --- a/drivers/watchdog/rzv2h_wdt.c +++ b/drivers/watchdog/rzv2h_wdt.c @@ -13,6 +13,7 @@ #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/reset.h> +#include <linux/stringify.h> #include <linux/units.h> #include <linux/watchdog.h> @@ -48,7 +49,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); enum rzv2h_wdt_count_source { COUNT_SOURCE_LOCO, diff --git a/drivers/watchdog/s32g_wdt.c b/drivers/watchdog/s32g_wdt.c index 6422a694fc65f..bd8740153c17f 100644 --- a/drivers/watchdog/s32g_wdt.c +++ b/drivers/watchdog/s32g_wdt.c @@ -13,6 +13,7 @@ #include <linux/moduleparam.h> #include <linux/of.h> #include <linux/platform_device.h> +#include <linux/stringify.h> #include <linux/watchdog.h> #define DRIVER_NAME "s32g-swt" @@ -42,12 +43,12 @@ struct s32g_wdt_device { static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); static unsigned int timeout_param = S32G_WDT_DEFAULT_TIMEOUT; module_param(timeout_param, uint, 0); MODULE_PARM_DESC(timeout_param, "Watchdog timeout in seconds (default=" - __MODULE_STRING(S32G_WDT_DEFAULT_TIMEOUT) ")"); + __stringify(S32G_WDT_DEFAULT_TIMEOUT) ")"); static bool early_enable; module_param(early_enable, bool, 0); diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c index e31f93db05096..8ae60b919c120 100644 --- a/drivers/watchdog/s3c2410_wdt.c +++ b/drivers/watchdog/s3c2410_wdt.c @@ -28,6 +28,7 @@ #include <linux/regmap.h> #include <linux/delay.h> #include <linux/math64.h> +#include <linux/stringify.h> #define S3C2410_WTCON 0x00 #define S3C2410_WTDAT 0x04 @@ -154,12 +155,12 @@ module_param(nowayout, bool, 0); module_param(soft_noboot, int, 0); MODULE_PARM_DESC(tmr_margin, "Watchdog tmr_margin in seconds. (default=" - __MODULE_STRING(S3C2410_WATCHDOG_DEFAULT_TIME) ")"); + __stringify(S3C2410_WATCHDOG_DEFAULT_TIME) ")"); MODULE_PARM_DESC(tmr_atboot, "Watchdog is started at boot time if set to 1, default=" - __MODULE_STRING(S3C2410_WATCHDOG_ATBOOT)); + __stringify(S3C2410_WATCHDOG_ATBOOT)); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); MODULE_PARM_DESC(soft_noboot, "Watchdog action, set to 1 to ignore reboots, 0 to reboot (default 0)"); /* diff --git a/drivers/watchdog/sama5d4_wdt.c b/drivers/watchdog/sama5d4_wdt.c index ecdd9aeab79cc..85efe4db40f0b 100644 --- a/drivers/watchdog/sama5d4_wdt.c +++ b/drivers/watchdog/sama5d4_wdt.c @@ -14,6 +14,7 @@ #include <linux/of_irq.h> #include <linux/platform_device.h> #include <linux/reboot.h> +#include <linux/stringify.h> #include <linux/watchdog.h> #include "at91sam9_wdt.h" @@ -42,12 +43,12 @@ static bool nowayout = WATCHDOG_NOWAYOUT; module_param(wdt_timeout, int, 0); MODULE_PARM_DESC(wdt_timeout, "Watchdog timeout in seconds. (default = " - __MODULE_STRING(WDT_DEFAULT_TIMEOUT) ")"); + __stringify(WDT_DEFAULT_TIMEOUT) ")"); module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); static inline bool wdt_enabled(struct sama5d4_wdt wdt) { diff --git a/drivers/watchdog/sbc60xxwdt.c b/drivers/watchdog/sbc60xxwdt.c index 03eaf48c8f0f1..fffe58dcbf934 100644 --- a/drivers/watchdog/sbc60xxwdt.c +++ b/drivers/watchdog/sbc60xxwdt.c @@ -58,6 +58,7 @@ #include <linux/init.h> #include <linux/io.h> #include <linux/uaccess.h> +#include <linux/stringify.h> #define OUR_NAME "sbc60xxwdt" @@ -98,13 +99,13 @@ static int timeout = WATCHDOG_TIMEOUT; / in seconds, multiplied by HZ to module_param(timeout, int, 0); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. (1<=timeout<=3600, default=" - __MODULE_STRING(WATCHDOG_TIMEOUT) ")"); + __stringify(WATCHDOG_TIMEOUT) ")"); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); static void wdt_timer_ping(struct timer_list ); static DEFINE_TIMER(timer, wdt_timer_ping); diff --git a/drivers/watchdog/sbc7240_wdt.c b/drivers/watchdog/sbc7240_wdt.c index 21a1f0b32070b..077abbdbf5828 100644 --- a/drivers/watchdog/sbc7240_wdt.c +++ b/drivers/watchdog/sbc7240_wdt.c @@ -23,6 +23,7 @@ #include <linux/io.h> #include <linux/uaccess.h> #include <linux/atomic.h> +#include <linux/stringify.h> #define SBC7240_ENABLE_PORT 0x443 #define SBC7240_DISABLE_PORT 0x043 @@ -34,8 +35,8 @@ static int timeout = SBC7240_TIMEOUT; / in seconds / module_param(timeout, int, 0); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. (1<=timeout<=" - __MODULE_STRING(SBC7240_MAX_TIMEOUT) ", default=" - __MODULE_STRING(SBC7240_TIMEOUT) ")"); + __stringify(SBC7240_MAX_TIMEOUT) ", default=" + __stringify(SBC7240_TIMEOUT) ")"); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); diff --git a/drivers/watchdog/sbc8360.c b/drivers/watchdog/sbc8360.c index a9fd1615b4c38..dafef1df97191 100644 --- a/drivers/watchdog/sbc8360.c +++ b/drivers/watchdog/sbc8360.c @@ -48,6 +48,7 @@ #include <linux/moduleparam.h> #include <linux/io.h> #include <linux/uaccess.h> +#include <linux/stringify.h> static unsigned long sbc8360_is_open; @@ -199,7 +200,7 @@ MODULE_PARM_DESC(timeout, "Index into timeout table (0-63) (default=27 (60s))"); module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); / * Kernel methods. diff --git a/drivers/watchdog/sbc_epx_c3.c b/drivers/watchdog/sbc_epx_c3.c index 1d291dc0a4a69..b17bd1db7b103 100644 --- a/drivers/watchdog/sbc_epx_c3.c +++ b/drivers/watchdog/sbc_epx_c3.c @@ -25,6 +25,7 @@ #include <linux/ioport.h> #include <linux/uaccess.h> #include <linux/io.h> +#include <linux/stringify.h> static int epx_c3_alive; @@ -33,7 +34,7 @@ static int epx_c3_alive; static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); #define EPXC3_WATCHDOG_CTL_REG 0x1ee /* write 1 to enable, 0 to disable / #define EPXC3_WATCHDOG_PET_REG 0x1ef / write anything to pet once enabled / diff --git a/drivers/watchdog/sbsa_gwdt.c b/drivers/watchdog/sbsa_gwdt.c index e04d42cc7774d..3d271b1efb560 100644 --- a/drivers/watchdog/sbsa_gwdt.c +++ b/drivers/watchdog/sbsa_gwdt.c @@ -46,6 +46,7 @@ #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/platform_device.h> +#include <linux/stringify.h> #include <linux/uaccess.h> #include <linux/watchdog.h> #include <asm/arch_timer.h> @@ -103,7 +104,7 @@ static unsigned int timeout; module_param(timeout, uint, 0); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. (>=0, default=" - __MODULE_STRING(DEFAULT_TIMEOUT) ")"); + __stringify(DEFAULT_TIMEOUT) ")"); / * action refers to action taken when watchdog gets WS0 @@ -120,7 +121,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, S_IRUGO); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); /* * Arm Base System Architecture 1.0 introduces watchdog v1 which diff --git a/drivers/watchdog/sc1200wdt.c b/drivers/watchdog/sc1200wdt.c index 1d3300c98d43e..34cd57420c86d 100644 --- a/drivers/watchdog/sc1200wdt.c +++ b/drivers/watchdog/sc1200wdt.c @@ -42,6 +42,7 @@ #include <linux/semaphore.h> #include <linux/io.h> #include <linux/uaccess.h> +#include <linux/stringify.h> #define SC1200_MODULE_VER "build 20020303" #define SC1200_MODULE_NAME "sc1200wdt" @@ -92,7 +93,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); diff --git a/drivers/watchdog/sch311x_wdt.c b/drivers/watchdog/sch311x_wdt.c index 9670a1ea57cbd..a2a0b5c2b55b7 100644 --- a/drivers/watchdog/sch311x_wdt.c +++ b/drivers/watchdog/sch311x_wdt.c @@ -31,6 +31,7 @@ #include <linux/spinlock.h> /* For spin_lock/spin_unlock/... / #include <linux/uaccess.h> / For copy_to_user/put_user/... / #include <linux/io.h> / For inb/outb/... / +#include <linux/stringify.h> / For __stringify / / Module and version information / #define DRV_NAME "sch311x_wdt" @@ -68,13 +69,13 @@ static int timeout = WATCHDOG_TIMEOUT; / in seconds / module_param(timeout, int, 0); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. 1<= timeout <=15300, default=" - __MODULE_STRING(WATCHDOG_TIMEOUT) "."); + __stringify(WATCHDOG_TIMEOUT) "."); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); / * Super-IO functions diff --git a/drivers/watchdog/shwdt.c b/drivers/watchdog/shwdt.c index 719f100aae60d..8adecf54b9bc8 100644 --- a/drivers/watchdog/shwdt.c +++ b/drivers/watchdog/shwdt.c @@ -30,6 +30,7 @@ #include <linux/io.h> #include <linux/clk.h> #include <linux/err.h> +#include <linux/stringify.h> #include <asm/watchdog.h> #define DRV_NAME "sh-wdt" @@ -329,14 +330,14 @@ MODULE_ALIAS("platform:" DRV_NAME); module_param(clock_division_ratio, int, 0); MODULE_PARM_DESC(clock_division_ratio, "Clock division ratio. Valid ranges are from 0x5 (1.31ms) " - "to 0x7 (5.25ms). (default=" __MODULE_STRING(WTCSR_CKS_4096) ")"); + "to 0x7 (5.25ms). (default=" __stringify(WTCSR_CKS_4096) ")"); module_param(heartbeat, int, 0); MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. (1 <= heartbeat <= 3600, default=" - __MODULE_STRING(WATCHDOG_HEARTBEAT) ")"); + __stringify(WATCHDOG_HEARTBEAT) ")"); module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); diff --git a/drivers/watchdog/simatic-ipc-wdt.c b/drivers/watchdog/simatic-ipc-wdt.c index 1e91f0a560ffc..addeecccf2e9b 100644 --- a/drivers/watchdog/simatic-ipc-wdt.c +++ b/drivers/watchdog/simatic-ipc-wdt.c @@ -22,6 +22,7 @@ #include <linux/sizes.h> #include <linux/util_macros.h> #include <linux/watchdog.h> +#include <linux/stringify.h> #define WD_ENABLE_IOADR 0x62 #define WD_TRIGGER_IOADR 0x66 @@ -42,7 +43,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0000); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); static struct resource gp_status_reg_227e_res = DEFINE_RES_IO_NAMED(GP_STATUS_REG_227E, SZ_1, KBUILD_MODNAME); diff --git a/drivers/watchdog/sl28cpld_wdt.c b/drivers/watchdog/sl28cpld_wdt.c index c0b5e5fff5d7a..e32b757372eb6 100644 --- a/drivers/watchdog/sl28cpld_wdt.c +++ b/drivers/watchdog/sl28cpld_wdt.c @@ -10,6 +10,7 @@ #include <linux/platform_device.h> #include <linux/property.h> #include <linux/regmap.h> +#include <linux/stringify.h> #include <linux/watchdog.h> /* @@ -30,7 +31,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); static int timeout; module_param(timeout, int, 0); diff --git a/drivers/watchdog/smsc37b787_wdt.c b/drivers/watchdog/smsc37b787_wdt.c index 9f2c2ab4e2f15..0ee36ae3113e0 100644 --- a/drivers/watchdog/smsc37b787_wdt.c +++ b/drivers/watchdog/smsc37b787_wdt.c @@ -55,6 +55,7 @@ #include <linux/spinlock.h> #include <linux/io.h> #include <linux/uaccess.h> +#include <linux/stringify.h> /* enable support for minutes as units? / @@ -611,4 +612,4 @@ MODULE_PARM_DESC(timeout, "range is 1-255 units, default is 60"); module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); diff --git a/drivers/watchdog/softdog.c b/drivers/watchdog/softdog.c index 0820e35ad2e3c..0ff125958b8a2 100644 --- a/drivers/watchdog/softdog.c +++ b/drivers/watchdog/softdog.c @@ -24,6 +24,7 @@ #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/reboot.h> +#include <linux/stringify.h> #include <linux/types.h> #include <linux/watchdog.h> #include <linux/workqueue.h> @@ -33,13 +34,13 @@ static unsigned int soft_margin = TIMER_MARGIN; / in seconds / module_param(soft_margin, uint, 0); MODULE_PARM_DESC(soft_margin, "Watchdog soft_margin in seconds. (0 < soft_margin < 65536, default=" - __MODULE_STRING(TIMER_MARGIN) ")"); + __stringify(TIMER_MARGIN) ")"); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); static int soft_noboot; module_param(soft_noboot, int, 0); diff --git a/drivers/watchdog/sp5100_tco.c b/drivers/watchdog/sp5100_tco.c index 72ad59649ccc4..c4809858a6fe3 100644 --- a/drivers/watchdog/sp5100_tco.c +++ b/drivers/watchdog/sp5100_tco.c @@ -39,6 +39,7 @@ #include <linux/moduleparam.h> #include <linux/pci.h> #include <linux/platform_device.h> +#include <linux/stringify.h> #include <linux/types.h> #include <linux/watchdog.h> @@ -69,18 +70,18 @@ static struct pci_dev sp5100_tco_pci; static bool action = WATCHDOG_ACTION; module_param(action, bool, 0); MODULE_PARM_DESC(action, "Action taken when watchdog expires, 0 to reset, 1 to poweroff (default=" - __MODULE_STRING(WATCHDOG_ACTION) ")"); + __stringify(WATCHDOG_ACTION) ")"); #define WATCHDOG_HEARTBEAT 60 /* 60 sec default heartbeat. / static int heartbeat = WATCHDOG_HEARTBEAT; / in seconds / module_param(heartbeat, int, 0); MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. (default=" - __MODULE_STRING(WATCHDOG_HEARTBEAT) ")"); + __stringify(WATCHDOG_HEARTBEAT) ")"); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started." - " (default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + " (default=" __stringify(WATCHDOG_NOWAYOUT) ")"); / * Some TCO specific functions diff --git a/drivers/watchdog/starfive-wdt.c b/drivers/watchdog/starfive-wdt.c index 5a3254c83d3bb..044b4fdb73505 100644 --- a/drivers/watchdog/starfive-wdt.c +++ b/drivers/watchdog/starfive-wdt.c @@ -12,6 +12,7 @@ #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/reset.h> +#include <linux/stringify.h> #include <linux/watchdog.h> /* JH7100 Watchdog register define / @@ -72,12 +73,12 @@ module_param(early_enable, bool, 0); module_param(nowayout, bool, 0); MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. (default=" - __MODULE_STRING(STARFIVE_WDT_DEFAULT_TIME) ")"); + __stringify(STARFIVE_WDT_DEFAULT_TIME) ")"); MODULE_PARM_DESC(early_enable, "Watchdog is started at boot time if set to 1, default=" - __MODULE_STRING(STARFIVE_WDT_EARLY_ENA)); + __stringify(STARFIVE_WDT_EARLY_ENA)); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); struct starfive_wdt_variant { unsigned int control; / Watchdog Control Register for reset enable / diff --git a/drivers/watchdog/stmp3xxx_rtc_wdt.c b/drivers/watchdog/stmp3xxx_rtc_wdt.c index 060447101f486..c9cbf9728a2ae 100644 --- a/drivers/watchdog/stmp3xxx_rtc_wdt.c +++ b/drivers/watchdog/stmp3xxx_rtc_wdt.c @@ -13,6 +13,7 @@ #include <linux/stmp3xxx_rtc_wdt.h> #include <linux/notifier.h> #include <linux/reboot.h> +#include <linux/stringify.h> #define WDOG_TICK_RATE 1000 / 1 kHz clock / #define STMP3XXX_DEFAULT_TIMEOUT 19 @@ -21,8 +22,8 @@ static int heartbeat = STMP3XXX_DEFAULT_TIMEOUT; module_param(heartbeat, uint, 0); MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat period in seconds from 1 to " - __MODULE_STRING(STMP3XXX_MAX_TIMEOUT) ", default " - __MODULE_STRING(STMP3XXX_DEFAULT_TIMEOUT)); + __stringify(STMP3XXX_MAX_TIMEOUT) ", default " + __stringify(STMP3XXX_DEFAULT_TIMEOUT)); static int wdt_start(struct watchdog_device wdd) { diff --git a/drivers/watchdog/stpmic1_wdt.c b/drivers/watchdog/stpmic1_wdt.c index 45d0c543466fd..17f0cdecd22c3 100644 --- a/drivers/watchdog/stpmic1_wdt.c +++ b/drivers/watchdog/stpmic1_wdt.c @@ -9,6 +9,7 @@ #include <linux/of.h> #include <linux/regmap.h> #include <linux/slab.h> +#include <linux/stringify.h> #include <linux/watchdog.h> /* WATCHDOG CONTROL REGISTER bit / @@ -25,7 +26,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); struct stpmic1_wdt { struct stpmic1 pmic; diff --git a/drivers/watchdog/sun4v_wdt.c b/drivers/watchdog/sun4v_wdt.c index 8db86ad5ee3df..ad56d778776e7 100644 --- a/drivers/watchdog/sun4v_wdt.c +++ b/drivers/watchdog/sun4v_wdt.c @@ -15,6 +15,7 @@ #include <linux/kernel.h> #include <linux/module.h> #include <linux/moduleparam.h> +#include <linux/stringify.h> #include <linux/watchdog.h> #include <asm/hypervisor.h> #include <asm/mdesc.h> @@ -27,12 +28,12 @@ static unsigned int timeout; module_param(timeout, uint, 0); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds (default=" - __MODULE_STRING(WDT_TIMEOUT) ")"); + __stringify(WDT_TIMEOUT) ")"); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, S_IRUGO); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); static int sun4v_wdt_stop(struct watchdog_device wdd) { diff --git a/drivers/watchdog/sunplus_wdt.c b/drivers/watchdog/sunplus_wdt.c index ae0c11a15a051..f2e45907d882c 100644 --- a/drivers/watchdog/sunplus_wdt.c +++ b/drivers/watchdog/sunplus_wdt.c @@ -11,6 +11,7 @@ #include <linux/module.h> #include <linux/platform_device.h> #include <linux/reset.h> +#include <linux/stringify.h> #include <linux/watchdog.h> #define WDT_CTRL 0x00 @@ -38,7 +39,7 @@ MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds"); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); struct sp_wdt_priv { struct watchdog_device wdev; diff --git a/drivers/watchdog/sunxi_wdt.c b/drivers/watchdog/sunxi_wdt.c index 3db34524ed13b..1e55c5fd43b8a 100644 --- a/drivers/watchdog/sunxi_wdt.c +++ b/drivers/watchdog/sunxi_wdt.c @@ -20,6 +20,7 @@ #include <linux/of.h> #include <linux/platform_device.h> #include <linux/types.h> +#include <linux/stringify.h> #include <linux/watchdog.h> #define WDT_MAX_TIMEOUT 16 @@ -357,7 +358,7 @@ MODULE_PARM_DESC(timeout, "Watchdog heartbeat in seconds"); module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started " - "(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + "(default=" __stringify(WATCHDOG_NOWAYOUT) ")"); MODULE_LICENSE("GPL"); MODULE_AUTHOR("Carlo Caione <carlo.caione@gmail.com>"); diff --git a/drivers/watchdog/tegra_wdt.c b/drivers/watchdog/tegra_wdt.c index d5de6c0657a55..6b3f65c4d593b 100644 --- a/drivers/watchdog/tegra_wdt.c +++ b/drivers/watchdog/tegra_wdt.c @@ -9,6 +9,7 @@ #include <linux/io.h> #include <linux/of.h> #include <linux/platform_device.h> +#include <linux/stringify.h> #include <linux/watchdog.h> / minimum and maximum watchdog trigger timeout, in seconds / @@ -67,13 +68,13 @@ static int heartbeat = WDT_HEARTBEAT; module_param(heartbeat, int, 0); MODULE_PARM_DESC(heartbeat, "Watchdog heartbeats in seconds. (default = " - __MODULE_STRING(WDT_HEARTBEAT) ")"); + __stringify(WDT_HEARTBEAT) ")"); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); static int tegra_wdt_start(struct watchdog_device wdd) { diff --git a/drivers/watchdog/tqmx86_wdt.c b/drivers/watchdog/tqmx86_wdt.c index 83860e94ce9d7..1da45a3f8cf3f 100644 --- a/drivers/watchdog/tqmx86_wdt.c +++ b/drivers/watchdog/tqmx86_wdt.c @@ -14,6 +14,7 @@ #include <linux/module.h> #include <linux/platform_device.h> #include <linux/timer.h> +#include <linux/stringify.h> #include <linux/watchdog.h> /* default timeout (secs) / @@ -23,7 +24,7 @@ static unsigned int timeout; module_param(timeout, uint, 0); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. (1<=timeout<=4096, default=" - __MODULE_STRING(WDT_TIMEOUT) ")"); + __stringify(WDT_TIMEOUT) ")"); struct tqmx86_wdt { struct watchdog_device wdd; void __iomem io_base; diff --git a/drivers/watchdog/ts4800_wdt.c b/drivers/watchdog/ts4800_wdt.c index 24b1ad52102e8..1bfc8db323c6a 100644 --- a/drivers/watchdog/ts4800_wdt.c +++ b/drivers/watchdog/ts4800_wdt.c @@ -12,13 +12,14 @@ #include <linux/of.h> #include <linux/platform_device.h> #include <linux/regmap.h> +#include <linux/stringify.h> #include <linux/watchdog.h> static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); /* possible feed values / #define TS4800_WDT_FEED_2S 0x1 diff --git a/drivers/watchdog/twl4030_wdt.c b/drivers/watchdog/twl4030_wdt.c index 69a622646d75c..d5e06dcf74d9a 100644 --- a/drivers/watchdog/twl4030_wdt.c +++ b/drivers/watchdog/twl4030_wdt.c @@ -12,13 +12,14 @@ #include <linux/watchdog.h> #include <linux/platform_device.h> #include <linux/mfd/twl.h> +#include <linux/stringify.h> #define TWL4030_WATCHDOG_CFG_REG_OFFS 0x3 static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started " - "(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + "(default=" __stringify(WATCHDOG_NOWAYOUT) ")"); static int twl4030_wdt_write(unsigned char val) { diff --git a/drivers/watchdog/txx9wdt.c b/drivers/watchdog/txx9wdt.c index 305349844b4f1..161a779dc74d8 100644 --- a/drivers/watchdog/txx9wdt.c +++ b/drivers/watchdog/txx9wdt.c @@ -16,6 +16,7 @@ #include <linux/clk.h> #include <linux/err.h> #include <linux/io.h> +#include <linux/stringify.h> #include <asm/txx9tmr.h> #define WD_TIMER_CCD 7 / 1/256 / @@ -27,14 +28,14 @@ static unsigned int timeout = TIMER_MARGIN; / in seconds / module_param(timeout, uint, 0); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. " - "(0<timeout<((2^" __MODULE_STRING(TXX9_TIMER_BITS) ")/(IMCLK/256)), " - "default=" __MODULE_STRING(TIMER_MARGIN) ")"); + "(0<timeout<((2^" __stringify(TXX9_TIMER_BITS) ")/(IMCLK/256)), " + "default=" __stringify(TIMER_MARGIN) ")"); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started " - "(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + "(default=" __stringify(WATCHDOG_NOWAYOUT) ")"); static struct txx9_tmr_reg __iomem txx9wdt_reg; static struct clk txx9_imclk; diff --git a/drivers/watchdog/uniphier_wdt.c b/drivers/watchdog/uniphier_wdt.c index 8e9242c230222..d09fb2acfdde3 100644 --- a/drivers/watchdog/uniphier_wdt.c +++ b/drivers/watchdog/uniphier_wdt.c @@ -13,6 +13,7 @@ #include <linux/of.h> #include <linux/platform_device.h> #include <linux/regmap.h> +#include <linux/stringify.h> #include <linux/watchdog.h> / WDT timer setting register / @@ -245,12 +246,12 @@ module_platform_driver(uniphier_wdt_driver); module_param(timeout, uint, 0000); MODULE_PARM_DESC(timeout, "Watchdog timeout seconds in power of 2. (0 < timeout < 128, default=" - __MODULE_STRING(WDT_DEFAULT_TIMEOUT) ")"); + __stringify(WDT_DEFAULT_TIMEOUT) ")"); module_param(nowayout, bool, 0000); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); MODULE_AUTHOR("Keiji Hayashibara <hayashibara.keiji@socionext.com>"); MODULE_DESCRIPTION("UniPhier Watchdog Device Driver"); diff --git a/drivers/watchdog/via_wdt.c b/drivers/watchdog/via_wdt.c index be4ca619da65a..effa9bc8d354d 100644 --- a/drivers/watchdog/via_wdt.c +++ b/drivers/watchdog/via_wdt.c @@ -18,6 +18,7 @@ #include <linux/jiffies.h> #include <linux/module.h> #include <linux/pci.h> +#include <linux/stringify.h> #include <linux/timer.h> #include <linux/watchdog.h> @@ -56,12 +57,12 @@ static int timeout = WDT_TIMEOUT; module_param(timeout, int, 0); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds, between 1 and 1023 " - "(default = " __MODULE_STRING(WDT_TIMEOUT) ")"); + "(default = " __stringify(WDT_TIMEOUT) ")"); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started " - "(default = " __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + "(default = " __stringify(WATCHDOG_NOWAYOUT) ")"); static struct watchdog_device wdt_dev; static struct resource wdt_res; diff --git a/drivers/watchdog/visconti_wdt.c b/drivers/watchdog/visconti_wdt.c index 7795e7fbf67e6..fc4f0d4d3d554 100644 --- a/drivers/watchdog/visconti_wdt.c +++ b/drivers/watchdog/visconti_wdt.c @@ -11,6 +11,7 @@ #include <linux/module.h> #include <linux/of.h> #include <linux/platform_device.h> +#include <linux/stringify.h> #include <linux/watchdog.h> #define WDT_CNT 0x00 @@ -29,7 +30,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC( nowayout, - "Watchdog cannot be stopped once started (default=" __MODULE_STRING(WATCHDOG_NOWAYOUT)")"); + "Watchdog cannot be stopped once started (default=" __stringify(WATCHDOG_NOWAYOUT)")"); struct visconti_wdt_priv { struct watchdog_device wdev; diff --git a/drivers/watchdog/w83627hf_wdt.c b/drivers/watchdog/w83627hf_wdt.c index db77599e43a06..5aa4d9c0fc001 100644 --- a/drivers/watchdog/w83627hf_wdt.c +++ b/drivers/watchdog/w83627hf_wdt.c @@ -35,6 +35,7 @@ #include <linux/init.h> #include <linux/io.h> #include <linux/dmi.h> +#include <linux/stringify.h> #define WATCHDOG_NAME "w83627hf/thf/hg/dhg WDT" #define WATCHDOG_TIMEOUT 60 / 60 sec default timeout / @@ -55,13 +56,13 @@ static int timeout; / in seconds / module_param(timeout, int, 0); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. 1 <= timeout <= 255, default=" - __MODULE_STRING(WATCHDOG_TIMEOUT) "."); + __stringify(WATCHDOG_TIMEOUT) "."); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); static int early_disable; module_param(early_disable, int, 0); diff --git a/drivers/watchdog/w83877f_wdt.c b/drivers/watchdog/w83877f_wdt.c index 53db59ef774b8..3187ea9d1b574 100644 --- a/drivers/watchdog/w83877f_wdt.c +++ b/drivers/watchdog/w83877f_wdt.c @@ -54,6 +54,7 @@ #include <linux/init.h> #include <linux/io.h> #include <linux/uaccess.h> +#include <linux/stringify.h> #define OUR_NAME "w83877f_wdt" @@ -84,14 +85,14 @@ static int timeout = WATCHDOG_TIMEOUT; module_param(timeout, int, 0); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. (1<=timeout<=3600, default=" - __MODULE_STRING(WATCHDOG_TIMEOUT) ")"); + __stringify(WATCHDOG_TIMEOUT) ")"); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); static void wdt_timer_ping(struct timer_list ); static DEFINE_TIMER(timer, wdt_timer_ping); diff --git a/drivers/watchdog/w83977f_wdt.c b/drivers/watchdog/w83977f_wdt.c index 3776030fa7c62..019fbf65eeb45 100644 --- a/drivers/watchdog/w83977f_wdt.c +++ b/drivers/watchdog/w83977f_wdt.c @@ -25,6 +25,7 @@ #include <linux/reboot.h> #include <linux/uaccess.h> #include <linux/io.h> +#include <linux/stringify.h> #define WATCHDOG_VERSION "1.00" @@ -49,7 +50,7 @@ static DEFINE_SPINLOCK(spinlock); module_param(timeout, int, 0); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds (15..7635), default=" - __MODULE_STRING(DEFAULT_TIMEOUT) ")"); + __stringify(DEFAULT_TIMEOUT) ")"); module_param(testmode, int, 0); MODULE_PARM_DESC(testmode, "Watchdog testmode (1 = no reboot), default=0"); @@ -57,7 +58,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); /* * Start the watchdog diff --git a/drivers/watchdog/wafer5823wdt.c b/drivers/watchdog/wafer5823wdt.c index 291109349e73a..c564d51fe5a5b 100644 --- a/drivers/watchdog/wafer5823wdt.c +++ b/drivers/watchdog/wafer5823wdt.c @@ -36,6 +36,7 @@ #include <linux/spinlock.h> #include <linux/io.h> #include <linux/uaccess.h> +#include <linux/stringify.h> #define WATCHDOG_NAME "Wafer 5823 WDT" #define PFX WATCHDOG_NAME ": " @@ -61,13 +62,13 @@ static int timeout = WD_TIMO; /* in seconds / module_param(timeout, int, 0); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. 1 <= timeout <= 255, default=" - __MODULE_STRING(WD_TIMO) "."); + __stringify(WD_TIMO) "."); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); static void wafwdt_ping(void) { diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c index d7895009a2de3..1e1c3431b0076 100644 --- a/drivers/watchdog/watchdog_dev.c +++ b/drivers/watchdog/watchdog_dev.c @@ -44,6 +44,7 @@ #include <linux/types.h> / For standard types (like size_t) / #include <linux/watchdog.h> / For watchdog specific items / #include <linux/uaccess.h> / For copy_to_user/put_user/... / +#include <linux/stringify.h> / For __stringify / #include "watchdog_core.h" #include "watchdog_pretimeout.h" @@ -1314,9 +1315,9 @@ int watchdog_dev_resume(struct watchdog_device wdd) module_param(handle_boot_enabled, bool, 0444); MODULE_PARM_DESC(handle_boot_enabled, "Watchdog core auto-updates boot enabled watchdogs before userspace takes over (default=" - __MODULE_STRING(IS_ENABLED(CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED)) ")"); + __stringify(IS_ENABLED(CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED)) ")"); module_param(open_timeout, uint, 0644); MODULE_PARM_DESC(open_timeout, "Maximum time (in seconds, 0 means infinity) for userspace to take over a running watchdog (default=" - __MODULE_STRING(CONFIG_WATCHDOG_OPEN_TIMEOUT) ")"); + __stringify(CONFIG_WATCHDOG_OPEN_TIMEOUT) ")"); diff --git a/drivers/watchdog/wdat_wdt.c b/drivers/watchdog/wdat_wdt.c index 55ea16e73652f..a418da46bda2c 100644 --- a/drivers/watchdog/wdat_wdt.c +++ b/drivers/watchdog/wdat_wdt.c @@ -13,6 +13,7 @@ #include <linux/module.h> #include <linux/platform_device.h> #include <linux/pm.h> +#include <linux/stringify.h> #include <linux/watchdog.h> #define MAX_WDAT_ACTIONS ACPI_WDAT_ACTION_RESERVED @@ -54,14 +55,14 @@ struct wdat_wdt { static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); #define WDAT_DEFAULT_TIMEOUT 30 static int timeout = WDAT_DEFAULT_TIMEOUT; module_param(timeout, int, 0); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds (default=" - __MODULE_STRING(WDAT_DEFAULT_TIMEOUT) ")"); + __stringify(WDAT_DEFAULT_TIMEOUT) ")"); static int wdat_wdt_read(struct wdat_wdt wdat, const struct wdat_instruction instr, u32 value) diff --git a/drivers/watchdog/wdt.c b/drivers/watchdog/wdt.c index 3980d60bacd82..d8681ee547eea 100644 --- a/drivers/watchdog/wdt.c +++ b/drivers/watchdog/wdt.c @@ -43,6 +43,7 @@ #include <linux/init.h> #include <linux/io.h> #include <linux/uaccess.h> +#include <linux/stringify.h> #include "wd501p.h" @@ -60,13 +61,13 @@ static int wd_heartbeat; module_param(heartbeat, int, 0); MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. (0 < heartbeat < 65536, default=" - __MODULE_STRING(WD_TIMO) ")"); + __stringify(WD_TIMO) ")"); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); / You must set these - there is no sane way to probe for this board. / static int io = 0x240; diff --git a/drivers/watchdog/wdt977.c b/drivers/watchdog/wdt977.c index 4f449ac4dda41..f0fb82dc3c93d 100644 --- a/drivers/watchdog/wdt977.c +++ b/drivers/watchdog/wdt977.c @@ -34,6 +34,7 @@ #include <linux/reboot.h> #include <linux/io.h> #include <linux/uaccess.h> +#include <linux/stringify.h> #include <asm/mach-types.h> @@ -59,7 +60,7 @@ static DEFINE_SPINLOCK(spinlock); module_param(timeout, int, 0); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds (60..15300, default=" - __MODULE_STRING(DEFAULT_TIMEOUT) ")"); + __stringify(DEFAULT_TIMEOUT) ")"); module_param(testmode, int, 0); MODULE_PARM_DESC(testmode, "Watchdog testmode (1 = no reboot), default=0"); @@ -67,7 +68,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); / * Start the watchdog diff --git a/drivers/watchdog/wdt_pci.c b/drivers/watchdog/wdt_pci.c index 3918a600f2a00..4b1ef22d0df28 100644 --- a/drivers/watchdog/wdt_pci.c +++ b/drivers/watchdog/wdt_pci.c @@ -49,6 +49,7 @@ #include <linux/pci.h> #include <linux/io.h> #include <linux/uaccess.h> +#include <linux/stringify.h> #define WDT_IS_PCI @@ -72,13 +73,13 @@ static int wd_heartbeat; module_param(heartbeat, int, 0); MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. (0<heartbeat<65536, default=" - __MODULE_STRING(WD_TIMO) ")"); + __stringify(WD_TIMO) ")"); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); /* Support for the Fan Tachometer on the PCI-WDT501 / static int tachometer; diff --git a/drivers/watchdog/wm831x_wdt.c b/drivers/watchdog/wm831x_wdt.c index d96ad8f38bd2e..1aeb532dfebae 100644 --- a/drivers/watchdog/wm831x_wdt.c +++ b/drivers/watchdog/wm831x_wdt.c @@ -13,6 +13,7 @@ #include <linux/platform_device.h> #include <linux/watchdog.h> #include <linux/uaccess.h> +#include <linux/stringify.h> #include <linux/mfd/wm831x/core.h> #include <linux/mfd/wm831x/pdata.h> @@ -22,7 +23,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); struct wm831x_wdt_drvdata { struct watchdog_device wdt; diff --git a/drivers/watchdog/wm8350_wdt.c b/drivers/watchdog/wm8350_wdt.c index c82c1b77d91b5..5eca195eac188 100644 --- a/drivers/watchdog/wm8350_wdt.c +++ b/drivers/watchdog/wm8350_wdt.c @@ -14,13 +14,14 @@ #include <linux/platform_device.h> #include <linux/watchdog.h> #include <linux/uaccess.h> +#include <linux/stringify.h> #include <linux/mfd/wm8350/core.h> static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); static DEFINE_MUTEX(wdt_mutex); diff --git a/drivers/watchdog/xen_wdt.c b/drivers/watchdog/xen_wdt.c index b343f421dc72c..3bc323d886d0b 100644 --- a/drivers/watchdog/xen_wdt.c +++ b/drivers/watchdog/xen_wdt.c @@ -17,6 +17,7 @@ #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/platform_device.h> +#include <linux/stringify.h> #include <linux/watchdog.h> #include <xen/xen.h> #include <asm/xen/hypercall.h> @@ -30,12 +31,12 @@ static time64_t wdt_expires; static unsigned int timeout; module_param(timeout, uint, S_IRUGO); MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds " - "(default=" __MODULE_STRING(WATCHDOG_TIMEOUT) ")"); + "(default=" __stringify(WATCHDOG_TIMEOUT) ")"); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, S_IRUGO); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started " - "(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + "(default=" __stringify(WATCHDOG_NOWAYOUT) ")"); static inline time64_t set_timeout(struct watchdog_device wdd) { diff --git a/drivers/watchdog/xilinx_wwdt.c b/drivers/watchdog/xilinx_wwdt.c index 799ce8d22b2f3..b7cdf8140666f 100644 --- a/drivers/watchdog/xilinx_wwdt.c +++ b/drivers/watchdog/xilinx_wwdt.c @@ -12,6 +12,7 @@ #include <linux/math64.h> #include <linux/module.h> #include <linux/platform_device.h> +#include <linux/stringify.h> #include <linux/watchdog.h> /* Max timeout is calculated at 100MHz source clock / @@ -47,11 +48,11 @@ static int closed_window_percent; module_param(wwdt_timeout, int, 0); MODULE_PARM_DESC(wwdt_timeout, "Watchdog time in seconds. (default=" - __MODULE_STRING(XWWDT_DEFAULT_TIMEOUT) ")"); + __stringify(XWWDT_DEFAULT_TIMEOUT) ")"); module_param(closed_window_percent, int, 0); MODULE_PARM_DESC(closed_window_percent, "Watchdog closed window percentage. (default=" - __MODULE_STRING(XWWDT_CLOSE_WINDOW_PERCENT) ")"); + __stringify(XWWDT_CLOSE_WINDOW_PERCENT) ")"); /* * struct xwwdt_device - Watchdog device structure * @base: base io address of WDT device diff --git a/drivers/watchdog/ziirave_wdt.c b/drivers/watchdog/ziirave_wdt.c index f3bb935c08c2e..10d4eaa8592a0 100644 --- a/drivers/watchdog/ziirave_wdt.c +++ b/drivers/watchdog/ziirave_wdt.c @@ -18,6 +18,7 @@ #include <linux/slab.h> #include <linux/sysfs.h> #include <linux/types.h> +#include <linux/stringify.h> #include <linux/watchdog.h> #include <linux/unaligned.h> @@ -94,7 +95,7 @@ MODULE_PARM_DESC(reset_duration, static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + __stringify(WATCHDOG_NOWAYOUT) ")"); static int ziirave_wdt_revision(struct i2c_client client, struct ziirave_wdt_rev rev, u8 command) diff --git a/include/linux/module.h b/include/linux/module.h index 96cc98568eea5..0d9157a2d487b 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -886,10 +886,6 @@ extern const struct kobj_type module_ktype; #define symbol_request(x) try_then_request_module(symbol_get(x), "symbol:" #x) -/* BELOW HERE ALL THESE ARE OBSOLETE AND WILL VANISH / - -#define __MODULE_STRING(x) __stringify(x) - #ifdef CONFIG_GENERIC_BUG void module_bug_finalize(const Elf_Ehdr , const Elf_Shdr , struct module );
3/2	2026/09/24 21:39	llm	patch-evaluator	0m Model: gemini-3.8-flash Args: null Results: null Tokens: input: 62053 output: 106 thoughts: 1880 Thoughts: Analysis of the Patch: WorthFuzzing = False Okay, let's break this down. The patch is swapping out `__MODULE_STRING(x)` with `__stringify(x)` everywhere, and it's also removing the `#define __MODULE_STRING(x) __stringify(x)` line from `include/linux/module.h`. The critical thing is that, looking at the code, `__MODULE_STRING` was literally just an alias for `__stringify`. So, every single substitution is a direct, byte-for-byte replacement. They added `#include <linux/stringify.h>` where needed to make sure that `__stringify` is defined. Now, checking the negative criteria for fuzzing: The patch effectively does nothing. `MODULE_PARM_DESC(foo, "..." __MODULE_STRING(...) "...")` becomes `MODULE_PARM_DESC(foo, "..." __stringify(...) "...")`. Since they were literally the same, the generated strings are identical. Even more fundamentally, there isn't any executable code change. `__MODULE_STRING(x)` always expanded to `__stringify(x)`. It's only replacing a macro alias. Let's verify. Checking the git log, or even just `module.h`, it's clear: `__MODULE_STRING(x)` was defined as `__stringify(x)`. So, the macro expansion yields the exact same string literals. Also, these are all in module metadata (in the `.modinfo` section used by tools like `modinfo`) or parameter descriptions, which are not even runtime executable code. A couple of `opt.err = "using default of " ...` exist, but those are just error messages for invalid parameter ranges, and those expand to the exact same string too. Does this alter the compiled C code? No. The AST, generated code, and string literals are completely unchanged. This is a purely cosmetic change, replacing a macro with its definition. Let's double-check the instructions: "Return WorthFuzzing=false ONLY IF all modified code falls strictly into one or more of these categories: - Non-kernel and non-executable changes: * Modifications to Documentation/, comments, or spelling fixes. * User-space directories, self-tests, samples, or scripts (e.g., tools/, samples/, scripts/, usr/) that do not affect the compiled kernel image (vmlinux) or kernel modules. * Purely decorative logging (e.g., message strings in pr_err, printk, dev_info) or tracepoints that do not alter control flow or data structures. * Build system or Kconfig changes that do not alter compiled C logic." This exactly fits the description. The patch is just replacing an obsolete macro with its equivalent definition. It touches only `MODULE_PARM_DESC` and a few printk parameter description strings, having zero effect on executable code, control flow, or data structures. I went through the touched files. All of the changes are limited to `MODULE_PARM_DESC` (module metadata) or identical `.err` error strings. Is there any difference between `__MODULE_STRING` and `__stringify`? No. The expansion is identical. The preprocessed code is literally the same. All uses are in `MODULE_PARM_DESC` or descriptive error messages. Therefore, `WorthFuzzing` is unequivocally `false`. Now, let's prepare the `set-results` format. We need to formulate the reasoning concisely: The patch removes the obsolete macro alias `__MODULE_STRING()`, which was defined as `__stringify()`, and replaces its invocations across drivers with `__stringify()`. All changes are in `MODULE_PARM_DESC()` descriptions and parameter validation error message strings. The preprocessed code and compiled logic are identical, resulting in no functional or executable changes to the kernel. Therefore, fuzzing is not warranted. Let's call `set-results`.
4/2	2026/09/24 21:39	tool	set-results	0m Args: { "EnableConfigs": [], "FocusSymbols": [], "Reasoning": "The patch removes the obsolete macro alias __MODULE_STRING (defined as __stringify) from include/linux/module.h and replaces its occurrences with __stringify across various drivers. All modified lines are in MODULE_PARM_DESC metadata and error message strings, producing identical preprocessed code and zero changes to executable logic. Therefore, this patch does not warrant fuzzing.", "WorthFuzzing": false } Results: { "EnableConfigs": null, "FocusSymbols": [], "Reasoning": "The patch removes the obsolete macro alias __MODULE_STRING (defined as __stringify) from include/linux/module.h and replaces its occurrences with __stringify across various drivers. All modified lines are in MODULE_PARM_DESC metadata and error message strings, producing identical preprocessed code and zero changes to executable logic. Therefore, this patch does not warrant fuzzing.", "WorthFuzzing": false }
5/1	2026/09/24 21:39	action	If	0m Args: { "WorthFuzzing": false } Results: null

{
  "PatchDiff": "commit ca3d3efac47dcf7b3d0ace58513ba6fb59ce1800\nAuthor: syz-cluster \u003ctriage@syzkaller.com\u003e\nDate:   Thu Sep 24 21:39:07 2026 +0000\n\n    syz-cluster: applied patch under review\n\ndiff --git a/drivers/comedi/comedi_fops.c b/drivers/comedi/comedi_fops.c\nindex c09bbe04be6c1..05d14839c5a6a 100644\n--- a/drivers/comedi/comedi_fops.c\n+++ b/drivers/comedi/comedi_fops.c\n@@ -29,6 +29,7 @@\n #include \u003clinux/io.h\u003e\n #include \u003clinux/uaccess.h\u003e\n #include \u003clinux/compat.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #include \"comedi_internal.h\"\n \n@@ -82,14 +83,14 @@ unsigned int comedi_default_buf_size_kb = CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB;\n module_param(comedi_default_buf_size_kb, uint, 0644);\n MODULE_PARM_DESC(comedi_default_buf_size_kb,\n \t\t \"default asynchronous buffer size in KiB (default \"\n-\t\t __MODULE_STRING(CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB) \")\");\n+\t\t __stringify(CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB) \")\");\n \n unsigned int comedi_default_buf_maxsize_kb =\n \tCONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB;\n module_param(comedi_default_buf_maxsize_kb, uint, 0644);\n MODULE_PARM_DESC(comedi_default_buf_maxsize_kb,\n \t\t \"default maximum size of asynchronous buffer in KiB (default \"\n-\t\t __MODULE_STRING(CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB) \")\");\n+\t\t __stringify(CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB) \")\");\n \n static DEFINE_MUTEX(comedi_board_minor_table_lock);\n static struct comedi_device\ndiff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c\nindex d4664ed468b26..36009bb02c257 100644\n--- a/drivers/gpu/drm/drm_fb_helper.c\n+++ b/drivers/gpu/drm/drm_fb_helper.c\n@@ -31,6 +31,7 @@\n \n #include \u003clinux/console.h\u003e\n #include \u003clinux/export.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #include \u003cdrm/drm_atomic.h\u003e\n #include \u003cdrm/drm_drv.h\u003e\n@@ -54,7 +55,7 @@ static int drm_fbdev_overalloc = CONFIG_DRM_FBDEV_OVERALLOC;\n module_param(drm_fbdev_overalloc, int, 0444);\n MODULE_PARM_DESC(drm_fbdev_overalloc,\n \t\t \"Overallocation of the fbdev buffer (%) [default=\"\n-\t\t __MODULE_STRING(CONFIG_DRM_FBDEV_OVERALLOC) \"]\");\n+\t\t __stringify(CONFIG_DRM_FBDEV_OVERALLOC) \"]\");\n \n /*\n  * In order to keep user-space compatibility, we want in certain use-cases\ndiff --git a/drivers/hwmon/fschmd.c b/drivers/hwmon/fschmd.c\nindex 019fc32bf3181..df9418a86c835 100644\n--- a/drivers/hwmon/fschmd.c\n+++ b/drivers/hwmon/fschmd.c\n@@ -35,6 +35,7 @@\n #include \u003clinux/miscdevice.h\u003e\n #include \u003clinux/uaccess.h\u003e\n #include \u003clinux/kref.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n /* Addresses to scan */\n static const unsigned short normal_i2c[] = { 0x73, I2C_CLIENT_END };\n@@ -43,7 +44,7 @@ static const unsigned short normal_i2c[] = { 0x73, I2C_CLIENT_END };\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n enum chips { fscpos, fscher, fscscy, fschrc, fschmd, fschds, fscsyl };\n \ndiff --git a/drivers/hwmon/nct7904.c b/drivers/hwmon/nct7904.c\nindex 976b8a008e448..04e1a8e6db37a 100644\n--- a/drivers/hwmon/nct7904.c\n+++ b/drivers/hwmon/nct7904.c\n@@ -23,6 +23,7 @@\n #include \u003clinux/i2c.h\u003e\n #include \u003clinux/hwmon.h\u003e\n #include \u003clinux/watchdog.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define VENDOR_ID_REG\t\t0x7A\t/* Any bank */\n #define NUVOTON_ID\t\t0x50\n@@ -113,12 +114,12 @@\n static int timeout;\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout, \"Watchdog timeout in minutes. 1 \u003c= timeout \u003c= 255, default=\"\n-\t\t\t__MODULE_STRING(WATCHDOG_TIMEOUT) \".\");\n+\t\t\t__stringify(WATCHDOG_TIMEOUT) \".\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static const unsigned short normal_i2c[] = {\n \t0x2d, 0x2e, I2C_CLIENT_END\ndiff --git a/drivers/hwmon/sch56xx-common.c b/drivers/hwmon/sch56xx-common.c\nindex a385aae3bb0fe..febb8ba7dc2c9 100644\n--- a/drivers/hwmon/sch56xx-common.c\n+++ b/drivers/hwmon/sch56xx-common.c\n@@ -18,13 +18,14 @@\n #include \u003clinux/watchdog.h\u003e\n #include \u003clinux/uaccess.h\u003e\n #include \u003clinux/slab.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \"sch56xx-common.h\"\n \n /* Insmod parameters */\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n #define SIO_SCH56XX_LD_EM\t0x0C\t/* Embedded uController Logical Dev */\n #define SIO_UNLOCK_KEY\t\t0x55\t/* Key to enable Super-I/O */\ndiff --git a/drivers/hwmon/w83793.c b/drivers/hwmon/w83793.c\nindex c6ef04c69856e..e1f2708b5db6a 100644\n--- a/drivers/hwmon/w83793.c\n+++ b/drivers/hwmon/w83793.c\n@@ -34,6 +34,7 @@\n #include \u003clinux/notifier.h\u003e\n #include \u003clinux/reboot.h\u003e\n #include \u003clinux/jiffies.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n /* Default values */\n #define WATCHDOG_TIMEOUT 2\t/* 2 minute default timeout */\n@@ -57,13 +58,13 @@ static int timeout = WATCHDOG_TIMEOUT;\t/* default timeout in minutes */\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout,\n \t\"Watchdog timeout in minutes. 2\u003c= timeout \u003c=255 (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_TIMEOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_TIMEOUT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n /*\n  * Address 0x00, 0x0d, 0x0e, 0x0f in all three banks are reserved\ndiff --git a/drivers/i2c/busses/i2c-kempld.c b/drivers/i2c/busses/i2c-kempld.c\nindex 9b4c7cba62b64..d0438960c2726 100644\n--- a/drivers/i2c/busses/i2c-kempld.c\n+++ b/drivers/i2c/busses/i2c-kempld.c\n@@ -13,6 +13,7 @@\n #include \u003clinux/i2c.h\u003e\n #include \u003clinux/delay.h\u003e\n #include \u003clinux/mfd/kempld.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define KEMPLD_I2C_PRELOW\t0x0b\n #define KEMPLD_I2C_PREHIGH\t0x0c\n@@ -66,7 +67,7 @@ struct kempld_i2c_data {\n static unsigned int bus_frequency = KEMPLD_I2C_FREQ_STD;\n module_param(bus_frequency, uint, 0);\n MODULE_PARM_DESC(bus_frequency, \"Set I2C bus frequency in kHz (default=\"\n-\t\t\t\t__MODULE_STRING(KEMPLD_I2C_FREQ_STD)\")\");\n+\t\t\t\t__stringify(KEMPLD_I2C_FREQ_STD)\")\");\n \n static int i2c_bus = -1;\n module_param(i2c_bus, int, 0);\ndiff --git a/drivers/net/ethernet/atheros/atl1e/atl1e_param.c b/drivers/net/ethernet/atheros/atl1e/atl1e_param.c\nindex 6b1d6df8da97c..ff3423a4dc2e5 100644\n--- a/drivers/net/ethernet/atheros/atl1e/atl1e_param.c\n+++ b/drivers/net/ethernet/atheros/atl1e/atl1e_param.c\n@@ -7,6 +7,7 @@\n  */\n \n #include \u003clinux/netdevice.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #include \"atl1e.h\"\n \n@@ -181,7 +182,7 @@ void atl1e_check_options(struct atl1e_adapter *adapter)\n \t\t\t.type = range_option,\n \t\t\t.name = \"Transmit Ddescription Count\",\n \t\t\t.err  = \"using default of \"\n-\t\t\t\t__MODULE_STRING(ATL1E_DEFAULT_TX_DESC_CNT),\n+\t\t\t\t__stringify(ATL1E_DEFAULT_TX_DESC_CNT),\n \t\t\t.def  = ATL1E_DEFAULT_TX_DESC_CNT,\n \t\t\t.arg  = { .r = { .min = ATL1E_MIN_TX_DESC_CNT,\n \t\t\t\t\t .max = ATL1E_MAX_TX_DESC_CNT} }\n@@ -200,7 +201,7 @@ void atl1e_check_options(struct atl1e_adapter *adapter)\n \t\t\t.type = range_option,\n \t\t\t.name = \"Memory size of rx buffer(KB)\",\n \t\t\t.err  = \"using default of \"\n-\t\t\t\t__MODULE_STRING(ATL1E_DEFAULT_RX_MEM_SIZE),\n+\t\t\t\t__stringify(ATL1E_DEFAULT_RX_MEM_SIZE),\n \t\t\t.def  = ATL1E_DEFAULT_RX_MEM_SIZE,\n \t\t\t.arg  = { .r = { .min = ATL1E_MIN_RX_MEM_SIZE,\n \t\t\t\t\t .max = ATL1E_MAX_RX_MEM_SIZE} }\n@@ -220,7 +221,7 @@ void atl1e_check_options(struct atl1e_adapter *adapter)\n \t\t\t.type = range_option,\n \t\t\t.name = \"Interrupt Moderate Timer\",\n \t\t\t.err  = \"using default of \"\n-\t\t\t\t__MODULE_STRING(INT_MOD_DEFAULT_CNT),\n+\t\t\t\t__stringify(INT_MOD_DEFAULT_CNT),\n \t\t\t.def  = INT_MOD_DEFAULT_CNT,\n \t\t\t.arg  = { .r = { .min = INT_MOD_MIN_CNT,\n \t\t\t\t\t .max = INT_MOD_MAX_CNT} }\n@@ -239,7 +240,7 @@ void atl1e_check_options(struct atl1e_adapter *adapter)\n \t\t\t.type = range_option,\n \t\t\t.name = \"Speed/Duplex Selection\",\n \t\t\t.err  = \"using default of \"\n-\t\t\t\t__MODULE_STRING(MEDIA_TYPE_AUTO_SENSOR),\n+\t\t\t\t__stringify(MEDIA_TYPE_AUTO_SENSOR),\n \t\t\t.def  = MEDIA_TYPE_AUTO_SENSOR,\n \t\t\t.arg  = { .r = { .min = MEDIA_TYPE_AUTO_SENSOR,\n \t\t\t\t\t .max = MEDIA_TYPE_10M_HALF} }\ndiff --git a/drivers/net/ethernet/atheros/atlx/atl1.c b/drivers/net/ethernet/atheros/atlx/atl1.c\nindex 98a4d089270e4..aef5de6287dcf 100644\n--- a/drivers/net/ethernet/atheros/atlx/atl1.c\n+++ b/drivers/net/ethernet/atheros/atlx/atl1.c\n@@ -56,6 +56,7 @@\n #include \u003clinux/slab.h\u003e\n #include \u003clinux/spinlock.h\u003e\n #include \u003clinux/string.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/tcp.h\u003e\n #include \u003clinux/timer.h\u003e\n #include \u003clinux/types.h\u003e\n@@ -198,7 +199,7 @@ static void atl1_check_options(struct atl1_adapter *adapter)\n \t\t\t.type = range_option,\n \t\t\t.name = \"Interrupt Moderator Timer\",\n \t\t\t.err = \"using default of \"\n-\t\t\t\t__MODULE_STRING(DEFAULT_INT_MOD_CNT),\n+\t\t\t\t__stringify(DEFAULT_INT_MOD_CNT),\n \t\t\t.def = DEFAULT_INT_MOD_CNT,\n \t\t\t.arg = {.r = {.min = MIN_INT_MOD_CNT,\n \t\t\t\t\t.max = MAX_INT_MOD_CNT} }\ndiff --git a/drivers/net/ethernet/atheros/atlx/atl2.c b/drivers/net/ethernet/atheros/atlx/atl2.c\nindex 5560d5cc31692..853d2e1eb9541 100644\n--- a/drivers/net/ethernet/atheros/atlx/atl2.c\n+++ b/drivers/net/ethernet/atheros/atlx/atl2.c\n@@ -29,6 +29,7 @@\n #include \u003clinux/slab.h\u003e\n #include \u003clinux/spinlock.h\u003e\n #include \u003clinux/string.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/tcp.h\u003e\n #include \u003clinux/timer.h\u003e\n #include \u003clinux/types.h\u003e\n@@ -2921,7 +2922,7 @@ static void atl2_check_options(struct atl2_adapter *adapter)\n \t/* Bytes of Transmit Memory */\n \topt.type = range_option;\n \topt.name = \"Bytes of Transmit Memory\";\n-\topt.err = \"using default of \" __MODULE_STRING(ATL2_DEFAULT_TX_MEMSIZE);\n+\topt.err = \"using default of \" __stringify(ATL2_DEFAULT_TX_MEMSIZE);\n \topt.def = ATL2_DEFAULT_TX_MEMSIZE;\n \topt.arg.r.min = ATL2_MIN_TX_MEMSIZE;\n \topt.arg.r.max = ATL2_MAX_TX_MEMSIZE;\n@@ -2939,7 +2940,7 @@ static void atl2_check_options(struct atl2_adapter *adapter)\n \t/* Receive Memory Block Count */\n \topt.type = range_option;\n \topt.name = \"Number of receive memory block\";\n-\topt.err = \"using default of \" __MODULE_STRING(ATL2_DEFAULT_RXD_COUNT);\n+\topt.err = \"using default of \" __stringify(ATL2_DEFAULT_RXD_COUNT);\n \topt.def = ATL2_DEFAULT_RXD_COUNT;\n \topt.arg.r.min = ATL2_MIN_RXD_COUNT;\n \topt.arg.r.max = ATL2_MAX_RXD_COUNT;\n@@ -2960,7 +2961,7 @@ static void atl2_check_options(struct atl2_adapter *adapter)\n \t/* Interrupt Moderate Timer */\n \topt.type = range_option;\n \topt.name = \"Interrupt Moderate Timer\";\n-\topt.err = \"using default of \" __MODULE_STRING(INT_MOD_DEFAULT_CNT);\n+\topt.err = \"using default of \" __stringify(INT_MOD_DEFAULT_CNT);\n \topt.def = INT_MOD_DEFAULT_CNT;\n \topt.arg.r.min = INT_MOD_MIN_CNT;\n \topt.arg.r.max = INT_MOD_MAX_CNT;\n@@ -2973,7 +2974,7 @@ static void atl2_check_options(struct atl2_adapter *adapter)\n \t/* Flash Vendor */\n \topt.type = range_option;\n \topt.name = \"SPI Flash Vendor\";\n-\topt.err = \"using default of \" __MODULE_STRING(FLASH_VENDOR_DEFAULT);\n+\topt.err = \"using default of \" __stringify(FLASH_VENDOR_DEFAULT);\n \topt.def = FLASH_VENDOR_DEFAULT;\n \topt.arg.r.min = FLASH_VENDOR_MIN;\n \topt.arg.r.max = FLASH_VENDOR_MAX;\n@@ -2986,7 +2987,7 @@ static void atl2_check_options(struct atl2_adapter *adapter)\n \t/* MediaType */\n \topt.type = range_option;\n \topt.name = \"Speed/Duplex Selection\";\n-\topt.err = \"using default of \" __MODULE_STRING(MEDIA_TYPE_AUTO_SENSOR);\n+\topt.err = \"using default of \" __stringify(MEDIA_TYPE_AUTO_SENSOR);\n \topt.def = MEDIA_TYPE_AUTO_SENSOR;\n \topt.arg.r.min = MEDIA_TYPE_AUTO_SENSOR;\n \topt.arg.r.max = MEDIA_TYPE_10M_HALF;\ndiff --git a/drivers/net/ethernet/intel/e1000/e1000_param.c b/drivers/net/ethernet/intel/e1000/e1000_param.c\nindex f4154ca7fcb41..5faf6d6280c89 100644\n--- a/drivers/net/ethernet/intel/e1000/e1000_param.c\n+++ b/drivers/net/ethernet/intel/e1000/e1000_param.c\n@@ -1,6 +1,7 @@\n // SPDX-License-Identifier: GPL-2.0\n /* Copyright(c) 1999 - 2006 Intel Corporation. */\n \n+#include \u003clinux/stringify.h\u003e\n #include \"e1000.h\"\n \n /* This is the only thing that needs to be changed to adjust the\n@@ -259,7 +260,7 @@ void e1000_check_options(struct e1000_adapter *adapter)\n \t\t\t.type = range_option,\n \t\t\t.name = \"Transmit Descriptors\",\n \t\t\t.err  = \"using default of \"\n-\t\t\t\t__MODULE_STRING(E1000_DEFAULT_TXD),\n+\t\t\t\t__stringify(E1000_DEFAULT_TXD),\n \t\t\t.def  = E1000_DEFAULT_TXD,\n \t\t\t.arg  = { .r = {\n \t\t\t\t.min = E1000_MIN_TXD,\n@@ -287,7 +288,7 @@ void e1000_check_options(struct e1000_adapter *adapter)\n \t\t\t.type = range_option,\n \t\t\t.name = \"Receive Descriptors\",\n \t\t\t.err  = \"using default of \"\n-\t\t\t\t__MODULE_STRING(E1000_DEFAULT_RXD),\n+\t\t\t\t__stringify(E1000_DEFAULT_RXD),\n \t\t\t.def  = E1000_DEFAULT_RXD,\n \t\t\t.arg  = { .r = {\n \t\t\t\t.min = E1000_MIN_RXD,\n@@ -354,7 +355,7 @@ void e1000_check_options(struct e1000_adapter *adapter)\n \t\topt = (struct e1000_option) {\n \t\t\t.type = range_option,\n \t\t\t.name = \"Transmit Interrupt Delay\",\n-\t\t\t.err  = \"using default of \" __MODULE_STRING(DEFAULT_TIDV),\n+\t\t\t.err  = \"using default of \" __stringify(DEFAULT_TIDV),\n \t\t\t.def  = DEFAULT_TIDV,\n \t\t\t.arg  = { .r = { .min = MIN_TXDELAY,\n \t\t\t\t\t .max = MAX_TXDELAY }}\n@@ -372,7 +373,7 @@ void e1000_check_options(struct e1000_adapter *adapter)\n \t\topt = (struct e1000_option) {\n \t\t\t.type = range_option,\n \t\t\t.name = \"Transmit Absolute Interrupt Delay\",\n-\t\t\t.err  = \"using default of \" __MODULE_STRING(DEFAULT_TADV),\n+\t\t\t.err  = \"using default of \" __stringify(DEFAULT_TADV),\n \t\t\t.def  = DEFAULT_TADV,\n \t\t\t.arg  = { .r = { .min = MIN_TXABSDELAY,\n \t\t\t\t\t .max = MAX_TXABSDELAY }}\n@@ -390,7 +391,7 @@ void e1000_check_options(struct e1000_adapter *adapter)\n \t\topt = (struct e1000_option) {\n \t\t\t.type = range_option,\n \t\t\t.name = \"Receive Interrupt Delay\",\n-\t\t\t.err  = \"using default of \" __MODULE_STRING(DEFAULT_RDTR),\n+\t\t\t.err  = \"using default of \" __stringify(DEFAULT_RDTR),\n \t\t\t.def  = DEFAULT_RDTR,\n \t\t\t.arg  = { .r = { .min = MIN_RXDELAY,\n \t\t\t\t\t .max = MAX_RXDELAY }}\n@@ -408,7 +409,7 @@ void e1000_check_options(struct e1000_adapter *adapter)\n \t\topt = (struct e1000_option) {\n \t\t\t.type = range_option,\n \t\t\t.name = \"Receive Absolute Interrupt Delay\",\n-\t\t\t.err  = \"using default of \" __MODULE_STRING(DEFAULT_RADV),\n+\t\t\t.err  = \"using default of \" __stringify(DEFAULT_RADV),\n \t\t\t.def  = DEFAULT_RADV,\n \t\t\t.arg  = { .r = { .min = MIN_RXABSDELAY,\n \t\t\t\t\t .max = MAX_RXABSDELAY }}\n@@ -426,7 +427,7 @@ void e1000_check_options(struct e1000_adapter *adapter)\n \t\topt = (struct e1000_option) {\n \t\t\t.type = range_option,\n \t\t\t.name = \"Interrupt Throttling Rate (ints/sec)\",\n-\t\t\t.err  = \"using default of \" __MODULE_STRING(DEFAULT_ITR),\n+\t\t\t.err  = \"using default of \" __stringify(DEFAULT_ITR),\n \t\t\t.def  = DEFAULT_ITR,\n \t\t\t.arg  = { .r = { .min = MIN_ITR,\n \t\t\t\t\t .max = MAX_ITR }}\ndiff --git a/drivers/net/ethernet/intel/e1000e/param.c b/drivers/net/ethernet/intel/e1000e/param.c\nindex 3132d8f2f207d..c6f400e6cdea8 100644\n--- a/drivers/net/ethernet/intel/e1000e/param.c\n+++ b/drivers/net/ethernet/intel/e1000e/param.c\n@@ -4,6 +4,7 @@\n #include \u003clinux/netdevice.h\u003e\n #include \u003clinux/module.h\u003e\n #include \u003clinux/pci.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #include \"e1000.h\"\n \n@@ -238,8 +239,7 @@ void e1000e_check_options(struct e1000_adapter *adapter)\n \t\tstatic const struct e1000_option opt = {\n \t\t\t.type = range_option,\n \t\t\t.name = \"Transmit Interrupt Delay\",\n-\t\t\t.err  = \"using default of \"\n-\t\t\t\t__MODULE_STRING(DEFAULT_TIDV),\n+\t\t\t.err  = \"using default of \" __stringify(DEFAULT_TIDV),\n \t\t\t.def  = DEFAULT_TIDV,\n \t\t\t.arg  = { .r = { .min = MIN_TXDELAY,\n \t\t\t\t\t .max = MAX_TXDELAY } }\n@@ -258,8 +258,7 @@ void e1000e_check_options(struct e1000_adapter *adapter)\n \t\tstatic const struct e1000_option opt = {\n \t\t\t.type = range_option,\n \t\t\t.name = \"Transmit Absolute Interrupt Delay\",\n-\t\t\t.err  = \"using default of \"\n-\t\t\t\t__MODULE_STRING(DEFAULT_TADV),\n+\t\t\t.err  = \"using default of \" __stringify(DEFAULT_TADV),\n \t\t\t.def  = DEFAULT_TADV,\n \t\t\t.arg  = { .r = { .min = MIN_TXABSDELAY,\n \t\t\t\t\t .max = MAX_TXABSDELAY } }\n@@ -278,8 +277,7 @@ void e1000e_check_options(struct e1000_adapter *adapter)\n \t\tstatic struct e1000_option opt = {\n \t\t\t.type = range_option,\n \t\t\t.name = \"Receive Interrupt Delay\",\n-\t\t\t.err  = \"using default of \"\n-\t\t\t\t__MODULE_STRING(DEFAULT_RDTR),\n+\t\t\t.err  = \"using default of \" __stringify(DEFAULT_RDTR),\n \t\t\t.def  = DEFAULT_RDTR,\n \t\t\t.arg  = { .r = { .min = MIN_RXDELAY,\n \t\t\t\t\t .max = MAX_RXDELAY } }\n@@ -301,8 +299,7 @@ void e1000e_check_options(struct e1000_adapter *adapter)\n \t\tstatic struct e1000_option opt = {\n \t\t\t.type = range_option,\n \t\t\t.name = \"Receive Absolute Interrupt Delay\",\n-\t\t\t.err  = \"using default of \"\n-\t\t\t\t__MODULE_STRING(DEFAULT_RADV),\n+\t\t\t.err  = \"using default of \" __stringify(DEFAULT_RADV),\n \t\t\t.def  = DEFAULT_RADV,\n \t\t\t.arg  = { .r = { .min = MIN_RXABSDELAY,\n \t\t\t\t\t .max = MAX_RXABSDELAY } }\n@@ -324,8 +321,7 @@ void e1000e_check_options(struct e1000_adapter *adapter)\n \t\tstatic const struct e1000_option opt = {\n \t\t\t.type = range_option,\n \t\t\t.name = \"Interrupt Throttling Rate (ints/sec)\",\n-\t\t\t.err  = \"using default of \"\n-\t\t\t\t__MODULE_STRING(DEFAULT_ITR),\n+\t\t\t.err  = \"using default of \" __stringify(DEFAULT_ITR),\n \t\t\t.def  = DEFAULT_ITR,\n \t\t\t.arg  = { .r = { .min = MIN_ITR,\n \t\t\t\t\t .max = MAX_ITR } }\ndiff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c\nindex 81fc5a6e32219..6a1a6678bd1a5 100644\n--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c\n+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c\n@@ -7,7 +7,8 @@\n  */\n \n #include \"pch_gbe.h\"\n-#include \u003clinux/module.h\u003e\t/* for __MODULE_STRING */\n+#include \u003clinux/module.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define OPTION_UNSET   -1\n #define OPTION_DISABLED 0\n@@ -440,7 +441,7 @@ void pch_gbe_check_options(struct pch_gbe_adapter *adapter)\n \t\t\t.type = range_option,\n \t\t\t.name = \"Transmit Descriptors\",\n \t\t\t.err  = \"using default of \"\n-\t\t\t\t__MODULE_STRING(PCH_GBE_DEFAULT_TXD),\n+\t\t\t\t__stringify(PCH_GBE_DEFAULT_TXD),\n \t\t\t.def  = PCH_GBE_DEFAULT_TXD,\n \t\t\t.arg  = { .r = { .min = PCH_GBE_MIN_TXD,\n \t\t\t\t\t .max = PCH_GBE_MAX_TXD } }\n@@ -456,7 +457,7 @@ void pch_gbe_check_options(struct pch_gbe_adapter *adapter)\n \t\t\t.type = range_option,\n \t\t\t.name = \"Receive Descriptors\",\n \t\t\t.err  = \"using default of \"\n-\t\t\t\t__MODULE_STRING(PCH_GBE_DEFAULT_RXD),\n+\t\t\t\t__stringify(PCH_GBE_DEFAULT_RXD),\n \t\t\t.def  = PCH_GBE_DEFAULT_RXD,\n \t\t\t.arg  = { .r = { .min = PCH_GBE_MIN_RXD,\n \t\t\t\t\t .max = PCH_GBE_MAX_RXD } }\ndiff --git a/drivers/platform/cznic/turris-omnia-mcu-watchdog.c b/drivers/platform/cznic/turris-omnia-mcu-watchdog.c\nindex 3ad146ec1d809..daabd88eb9133 100644\n--- a/drivers/platform/cznic/turris-omnia-mcu-watchdog.c\n+++ b/drivers/platform/cznic/turris-omnia-mcu-watchdog.c\n@@ -9,6 +9,7 @@\n #include \u003clinux/device.h\u003e\n #include \u003clinux/i2c.h\u003e\n #include \u003clinux/moduleparam.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/types.h\u003e\n #include \u003clinux/units.h\u003e\n #include \u003clinux/watchdog.h\u003e\n@@ -25,7 +26,7 @@ MODULE_PARM_DESC(timeout, \"Watchdog timeout in seconds\");\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t\t   __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t   __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static int omnia_wdt_start(struct watchdog_device *wdt)\n {\ndiff --git a/drivers/rtc/rtc-ds1374.c b/drivers/rtc/rtc-ds1374.c\nindex 8c247215d6116..2ed6777e7035e 100644\n--- a/drivers/rtc/rtc-ds1374.c\n+++ b/drivers/rtc/rtc-ds1374.c\n@@ -26,6 +26,7 @@\n #include \u003clinux/workqueue.h\u003e\n #include \u003clinux/slab.h\u003e\n #include \u003clinux/pm.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #ifdef CONFIG_RTC_DRV_DS1374_WDT\n #include \u003clinux/fs.h\u003e\n #include \u003clinux/ioctl.h\u003e\n@@ -381,7 +382,7 @@ MODULE_PARM_DESC(wdt_margin, \"Watchdog timeout in seconds (default 32s)\");\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default =\"\n-\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT)\")\");\n+\t\t__stringify(WATCHDOG_NOWAYOUT)\")\");\n \n static const struct watchdog_info ds1374_wdt_info = {\n \t.identity       = \"DS1374 Watchdog\",\ndiff --git a/drivers/thunderbolt/tb.c b/drivers/thunderbolt/tb.c\nindex 47753a5c0f2eb..a2459e44e3205 100644\n--- a/drivers/thunderbolt/tb.c\n+++ b/drivers/thunderbolt/tb.c\n@@ -11,6 +11,7 @@\n #include \u003clinux/delay.h\u003e\n #include \u003clinux/pm_runtime.h\u003e\n #include \u003clinux/platform_data/x86/apple.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #include \"tb.h\"\n #include \"tb_regs.h\"\n@@ -47,7 +48,7 @@ static unsigned int asym_threshold = TB_ASYM_THRESHOLD;\n module_param_named(asym_threshold, asym_threshold, uint, 0444);\n MODULE_PARM_DESC(asym_threshold,\n \t\t\"threshold (Mb/s) when to Gen 4 switch link symmetry. 0 disables. (default: \"\n-\t\t__MODULE_STRING(TB_ASYM_THRESHOLD) \")\");\n+\t\t__stringify(TB_ASYM_THRESHOLD) \")\");\n \n /**\n  * struct tb_cm - Simple Thunderbolt connection manager\ndiff --git a/drivers/thunderbolt/tunnel.c b/drivers/thunderbolt/tunnel.c\nindex 7e8284575dffb..ad4916748789b 100644\n--- a/drivers/thunderbolt/tunnel.c\n+++ b/drivers/thunderbolt/tunnel.c\n@@ -11,6 +11,7 @@\n #include \u003clinux/list.h\u003e\n #include \u003clinux/ktime.h\u003e\n #include \u003clinux/string_helpers.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #include \"tunnel.h\"\n #include \"tb.h\"\n@@ -89,12 +90,12 @@ static int dprx_timeout = TB_DPRX_TIMEOUT;\n module_param(dprx_timeout, int, 0444);\n MODULE_PARM_DESC(dprx_timeout,\n \t\t \"DPRX capability read timeout in ms, -1 waits forever (default: \"\n-\t\t __MODULE_STRING(TB_DPRX_TIMEOUT) \")\");\n+\t\t __stringify(TB_DPRX_TIMEOUT) \")\");\n \n static unsigned int dma_credits = TB_DMA_CREDITS;\n module_param(dma_credits, uint, 0444);\n MODULE_PARM_DESC(dma_credits, \"specify custom credits for DMA tunnels (default: \"\n-                __MODULE_STRING(TB_DMA_CREDITS) \")\");\n+\t\t __stringify(TB_DMA_CREDITS) \")\");\n \n static bool bw_alloc_mode = true;\n module_param(bw_alloc_mode, bool, 0444);\ndiff --git a/drivers/tty/serial/8250/8250_platform.c b/drivers/tty/serial/8250/8250_platform.c\nindex af946d12e7648..e060e0427fc9a 100644\n--- a/drivers/tty/serial/8250/8250_platform.c\n+++ b/drivers/tty/serial/8250/8250_platform.c\n@@ -16,6 +16,7 @@\n #include \u003clinux/moduleparam.h\u003e\n #include \u003clinux/once.h\u003e\n #include \u003clinux/platform_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #include \u003clinux/serial_8250.h\u003e\n \n@@ -382,6 +383,6 @@ module_param_hw(share_irqs, bool, other, 0644);\n MODULE_PARM_DESC(share_irqs, \"Share IRQs with other non-8250/16x50 devices (unsafe)\");\n \n module_param(nr_uarts, uint, 0644);\n-MODULE_PARM_DESC(nr_uarts, \"Maximum number of UARTs supported. (1-\" __MODULE_STRING(CONFIG_SERIAL_8250_NR_UARTS) \")\");\n+MODULE_PARM_DESC(nr_uarts, \"Maximum number of UARTs supported. (1-\" __stringify(CONFIG_SERIAL_8250_NR_UARTS) \")\");\n \n MODULE_ALIAS_CHARDEV_MAJOR(TTY_MAJOR);\ndiff --git a/drivers/usb/atm/speedtch.c b/drivers/usb/atm/speedtch.c\nindex 9d28c652bcd80..95cd8ce99a645 100644\n--- a/drivers/usb/atm/speedtch.c\n+++ b/drivers/usb/atm/speedtch.c\n@@ -19,6 +19,7 @@\n #include \u003clinux/moduleparam.h\u003e\n #include \u003clinux/slab.h\u003e\n #include \u003clinux/stat.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/timer.h\u003e\n #include \u003clinux/types.h\u003e\n #include \u003clinux/usb/ch9.h\u003e\n@@ -77,31 +78,31 @@ static unsigned int num_ModemOption;\n module_param(altsetting, uint, S_IRUGO | S_IWUSR);\n MODULE_PARM_DESC(altsetting,\n \t\t\"Alternative setting for data interface (bulk_default: \"\n-\t\t__MODULE_STRING(DEFAULT_BULK_ALTSETTING) \"; isoc_default: \"\n-\t\t__MODULE_STRING(DEFAULT_ISOC_ALTSETTING) \")\");\n+\t\t__stringify(DEFAULT_BULK_ALTSETTING) \"; isoc_default: \"\n+\t\t__stringify(DEFAULT_ISOC_ALTSETTING) \")\");\n \n module_param(dl_512_first, bool, S_IRUGO | S_IWUSR);\n MODULE_PARM_DESC(dl_512_first,\n \t\t \"Read 512 bytes before sending firmware (default: \"\n-\t\t __MODULE_STRING(DEFAULT_DL_512_FIRST) \")\");\n+\t\t __stringify(DEFAULT_DL_512_FIRST) \")\");\n \n module_param(enable_isoc, bool, S_IRUGO | S_IWUSR);\n MODULE_PARM_DESC(enable_isoc,\n \t\t\"Use isochronous transfers if available (default: \"\n-\t\t__MODULE_STRING(DEFAULT_ENABLE_ISOC) \")\");\n+\t\t__stringify(DEFAULT_ENABLE_ISOC) \")\");\n \n module_param(sw_buffering, bool, S_IRUGO | S_IWUSR);\n MODULE_PARM_DESC(sw_buffering,\n \t\t \"Enable software buffering (default: \"\n-\t\t __MODULE_STRING(DEFAULT_SW_BUFFERING) \")\");\n+\t\t __stringify(DEFAULT_SW_BUFFERING) \")\");\n \n module_param(BMaxDSL, uint, S_IRUGO | S_IWUSR);\n MODULE_PARM_DESC(BMaxDSL,\n-\t\t\"default: \" __MODULE_STRING(DEFAULT_B_MAX_DSL));\n+\t\t\"default: \" __stringify(DEFAULT_B_MAX_DSL));\n \n module_param(ModemMode, byte, S_IRUGO | S_IWUSR);\n MODULE_PARM_DESC(ModemMode,\n-\t\t\"default: \" __MODULE_STRING(DEFAULT_MODEM_MODE));\n+\t\t\"default: \" __stringify(DEFAULT_MODEM_MODE));\n \n module_param_array(ModemOption, byte, \u0026num_ModemOption, S_IRUGO);\n MODULE_PARM_DESC(ModemOption, \"default: 0x10,0x00,0x00,0x00,0x20\");\ndiff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c\nindex 7b0c791399eaa..d4052d206e006 100644\n--- a/drivers/usb/atm/usbatm.c\n+++ b/drivers/usb/atm/usbatm.c\n@@ -64,6 +64,7 @@\n #include \u003clinux/signal.h\u003e\n #include \u003clinux/slab.h\u003e\n #include \u003clinux/stat.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/timer.h\u003e\n #include \u003clinux/wait.h\u003e\n #include \u003clinux/kthread.h\u003e\n@@ -103,26 +104,26 @@ static unsigned int snd_buf_bytes = UDSL_DEFAULT_SND_BUF_SIZE;\n module_param(num_rcv_urbs, uint, S_IRUGO);\n MODULE_PARM_DESC(num_rcv_urbs,\n \t\t \"Number of urbs used for reception (range: 0-\"\n-\t\t __MODULE_STRING(UDSL_MAX_RCV_URBS) \", default: \"\n-\t\t __MODULE_STRING(UDSL_DEFAULT_RCV_URBS) \")\");\n+\t\t __stringify(UDSL_MAX_RCV_URBS) \", default: \"\n+\t\t __stringify(UDSL_DEFAULT_RCV_URBS) \")\");\n \n module_param(num_snd_urbs, uint, S_IRUGO);\n MODULE_PARM_DESC(num_snd_urbs,\n \t\t \"Number of urbs used for transmission (range: 0-\"\n-\t\t __MODULE_STRING(UDSL_MAX_SND_URBS) \", default: \"\n-\t\t __MODULE_STRING(UDSL_DEFAULT_SND_URBS) \")\");\n+\t\t __stringify(UDSL_MAX_SND_URBS) \", default: \"\n+\t\t __stringify(UDSL_DEFAULT_SND_URBS) \")\");\n \n module_param(rcv_buf_bytes, uint, S_IRUGO);\n MODULE_PARM_DESC(rcv_buf_bytes,\n \t\t \"Size of the buffers used for reception, in bytes (range: 1-\"\n-\t\t __MODULE_STRING(UDSL_MAX_BUF_SIZE) \", default: \"\n-\t\t __MODULE_STRING(UDSL_DEFAULT_RCV_BUF_SIZE) \")\");\n+\t\t __stringify(UDSL_MAX_BUF_SIZE) \", default: \"\n+\t\t __stringify(UDSL_DEFAULT_RCV_BUF_SIZE) \")\");\n \n module_param(snd_buf_bytes, uint, S_IRUGO);\n MODULE_PARM_DESC(snd_buf_bytes,\n \t\t \"Size of the buffers used for transmission, in bytes (range: 1-\"\n-\t\t __MODULE_STRING(UDSL_MAX_BUF_SIZE) \", default: \"\n-\t\t __MODULE_STRING(UDSL_DEFAULT_SND_BUF_SIZE) \")\");\n+\t\t __stringify(UDSL_MAX_BUF_SIZE) \", default: \"\n+\t\t __stringify(UDSL_DEFAULT_SND_BUF_SIZE) \")\");\n \n \n /* receive */\ndiff --git a/drivers/watchdog/acquirewdt.c b/drivers/watchdog/acquirewdt.c\nindex 052f65c48a703..cb62800e89ed4 100644\n--- a/drivers/watchdog/acquirewdt.c\n+++ b/drivers/watchdog/acquirewdt.c\n@@ -64,6 +64,7 @@\n #include \u003clinux/init.h\u003e\t\t\t/* For __init/__exit/... */\n #include \u003clinux/uaccess.h\u003e\t\t/* For copy_to_user/put_user/... */\n #include \u003clinux/io.h\u003e\t\t\t/* For inb/outb/... */\n+#include \u003clinux/stringify.h\u003e\t\t/* For __stringify */\n \n /* Module information */\n #define DRV_NAME \"acquirewdt\"\n@@ -92,7 +93,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\"Watchdog cannot be stopped once started (default=\"\n-\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n /*\n  *\tWatchdog Operations\ndiff --git a/drivers/watchdog/advantech_ec_wdt.c b/drivers/watchdog/advantech_ec_wdt.c\nindex 7c380f90ca583..2470c43032672 100644\n--- a/drivers/watchdog/advantech_ec_wdt.c\n+++ b/drivers/watchdog/advantech_ec_wdt.c\n@@ -14,6 +14,7 @@\n #include \u003clinux/kernel.h\u003e\n #include \u003clinux/module.h\u003e\n #include \u003clinux/moduleparam.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n #define DRIVER_NAME\t\t\"advantech_ec_wdt\"\n@@ -49,7 +50,7 @@ static ktime_t ec_timestamp;\n \n module_param(timeout, uint, 0);\n MODULE_PARM_DESC(timeout,\n-\t\t \"Default Watchdog timer setting (\" __MODULE_STRING(DEFAULT_TIME) \"s). The range is from \" __MODULE_STRING(MIN_TIME) \" to \" __MODULE_STRING(MAX_TIME) \".\");\n+\t\t \"Default Watchdog timer setting (\" __stringify(DEFAULT_TIME) \"s). The range is from \" __stringify(MIN_TIME) \" to \" __stringify(MAX_TIME) \".\");\n \n static void adv_ec_wdt_timing_gate(void)\n {\ndiff --git a/drivers/watchdog/advantechwdt.c b/drivers/watchdog/advantechwdt.c\nindex 42d3f37717810..6d24a6bc8f908 100644\n--- a/drivers/watchdog/advantechwdt.c\n+++ b/drivers/watchdog/advantechwdt.c\n@@ -37,6 +37,7 @@\n #include \u003clinux/init.h\u003e\n #include \u003clinux/io.h\u003e\n #include \u003clinux/uaccess.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n \n #define DRV_NAME \"advantechwdt\"\n@@ -71,13 +72,13 @@ static int timeout = WATCHDOG_TIMEOUT;\t/* in seconds */\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout,\n \t\"Watchdog timeout in seconds. 1\u003c= timeout \u003c=63, default=\"\n-\t\t__MODULE_STRING(WATCHDOG_TIMEOUT) \".\");\n+\t\t__stringify(WATCHDOG_TIMEOUT) \".\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\"Watchdog cannot be stopped once started (default=\"\n-\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n /*\n  *\tWatchdog Operations\ndiff --git a/drivers/watchdog/airoha_wdt.c b/drivers/watchdog/airoha_wdt.c\nindex 4bd333189b87e..c535c48ab6a86 100644\n--- a/drivers/watchdog/airoha_wdt.c\n+++ b/drivers/watchdog/airoha_wdt.c\n@@ -20,6 +20,7 @@\n #include \u003clinux/of.h\u003e\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/watchdog.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n /* Base address of timer and watchdog registers */\n #define TIMER_CTRL\t\t\t0x0\n@@ -44,12 +45,12 @@ struct airoha_wdt_desc {\n static int heartbeat = WDT_HEARTBEAT;\n module_param(heartbeat, int, 0);\n MODULE_PARM_DESC(heartbeat, \"Watchdog heartbeats in seconds. (default=\"\n-\t\t __MODULE_STRING(WDT_HEARTBEAT) \")\");\n+\t\t __stringify(WDT_HEARTBEAT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static int airoha_wdt_start(struct watchdog_device *wdog_dev)\n {\ndiff --git a/drivers/watchdog/alim1535_wdt.c b/drivers/watchdog/alim1535_wdt.c\nindex 1ecbd1ac5c3a0..d2f8d3331fe40 100644\n--- a/drivers/watchdog/alim1535_wdt.c\n+++ b/drivers/watchdog/alim1535_wdt.c\n@@ -18,6 +18,7 @@\n #include \u003clinux/pci.h\u003e\n #include \u003clinux/uaccess.h\u003e\n #include \u003clinux/io.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define WATCHDOG_NAME \"ALi_M1535\"\n #define WATCHDOG_TIMEOUT 60\t/* 60 sec default timeout */\n@@ -34,13 +35,13 @@ static int timeout = WATCHDOG_TIMEOUT;\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout,\n \t\t\"Watchdog timeout in seconds. (0 \u003c timeout \u003c 18000, default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_TIMEOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_TIMEOUT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n /*\n  *\tali_start\t-\tstart watchdog countdown\ndiff --git a/drivers/watchdog/alim7101_wdt.c b/drivers/watchdog/alim7101_wdt.c\nindex 03a559b41f5b8..e9611c76a2696 100644\n--- a/drivers/watchdog/alim7101_wdt.c\n+++ b/drivers/watchdog/alim7101_wdt.c\n@@ -36,6 +36,7 @@\n #include \u003clinux/pci.h\u003e\n #include \u003clinux/io.h\u003e\n #include \u003clinux/uaccess.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n \n #define WDT_ENABLE 0x9C\n@@ -64,7 +65,7 @@ static int timeout = WATCHDOG_TIMEOUT;\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout,\n \t\t\"Watchdog timeout in seconds. (1\u003c=timeout\u003c=3600, default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_TIMEOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_TIMEOUT) \")\");\n \n static int use_gpio; /* Use the pic (for a1d revision alim7101) */\n module_param(use_gpio, int, 0);\n@@ -82,7 +83,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n /*\n  *\tWhack the dog\ndiff --git a/drivers/watchdog/arm_smc_wdt.c b/drivers/watchdog/arm_smc_wdt.c\nindex bbba23ace7b85..c73ed1dcdfcb0 100644\n--- a/drivers/watchdog/arm_smc_wdt.c\n+++ b/drivers/watchdog/arm_smc_wdt.c\n@@ -13,6 +13,7 @@\n #include \u003clinux/moduleparam.h\u003e\n #include \u003clinux/of.h\u003e\n #include \u003clinux/platform_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/types.h\u003e\n #include \u003clinux/watchdog.h\u003e\n #include \u003cuapi/linux/psci.h\u003e\n@@ -191,7 +192,7 @@ MODULE_PARM_DESC(timeout, \"Watchdog heartbeat in seconds\");\n \n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n MODULE_LICENSE(\"GPL\");\n MODULE_AUTHOR(\"Julius Werner \u003cjwerner@chromium.org\u003e\");\ndiff --git a/drivers/watchdog/armada_37xx_wdt.c b/drivers/watchdog/armada_37xx_wdt.c\nindex a17a7911771ac..d62b02c40b0eb 100644\n--- a/drivers/watchdog/armada_37xx_wdt.c\n+++ b/drivers/watchdog/armada_37xx_wdt.c\n@@ -16,6 +16,7 @@\n #include \u003clinux/of.h\u003e\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/regmap.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/types.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n@@ -70,7 +71,7 @@ MODULE_PARM_DESC(timeout, \"Watchdog timeout in seconds\");\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t\t   __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t   __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n struct armada_37xx_watchdog {\n \tstruct watchdog_device wdt;\ndiff --git a/drivers/watchdog/aspeed_wdt.c b/drivers/watchdog/aspeed_wdt.c\nindex 48454ac860746..d4bd41cb801e6 100644\n--- a/drivers/watchdog/aspeed_wdt.c\n+++ b/drivers/watchdog/aspeed_wdt.c\n@@ -17,12 +17,13 @@\n #include \u003clinux/of_irq.h\u003e\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/regmap.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n struct aspeed_wdt_scu {\n \tconst char *compatible;\n \tu32 reset_status_reg;\ndiff --git a/drivers/watchdog/at91rm9200_wdt.c b/drivers/watchdog/at91rm9200_wdt.c\nindex d5afcc6342215..8c292d2469813 100644\n--- a/drivers/watchdog/at91rm9200_wdt.c\n+++ b/drivers/watchdog/at91rm9200_wdt.c\n@@ -23,6 +23,7 @@\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/reboot.h\u003e\n #include \u003clinux/regmap.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/types.h\u003e\n #include \u003clinux/watchdog.h\u003e\n #include \u003clinux/uaccess.h\u003e\n@@ -36,13 +37,13 @@ static struct regmap *regmap_st;\n \n module_param(wdt_time, int, 0);\n MODULE_PARM_DESC(wdt_time, \"Watchdog time in seconds. (default=\"\n-\t\t\t\t__MODULE_STRING(WDT_DEFAULT_TIME) \")\");\n+\t\t\t\t__stringify(WDT_DEFAULT_TIME) \")\");\n \n #ifdef CONFIG_WATCHDOG_NOWAYOUT\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n #endif\n \n \ndiff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c\nindex 80ba04df54adf..f966da6020111 100644\n--- a/drivers/watchdog/at91sam9_wdt.c\n+++ b/drivers/watchdog/at91sam9_wdt.c\n@@ -32,6 +32,7 @@\n #include \u003clinux/uaccess.h\u003e\n #include \u003clinux/of.h\u003e\n #include \u003clinux/of_irq.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #include \"at91sam9_wdt.h\"\n \n@@ -70,12 +71,12 @@\n static int heartbeat;\n module_param(heartbeat, int, 0);\n MODULE_PARM_DESC(heartbeat, \"Watchdog heartbeats in seconds. \"\n-\t\"(default = \" __MODULE_STRING(WDT_HEARTBEAT) \")\");\n+\t\"(default = \" __stringify(WDT_HEARTBEAT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started \"\n-\t\"(default=\" __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\"(default=\" __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n #define to_wdt(wdd) container_of(wdd, struct at91wdt, wdd)\n struct at91wdt {\ndiff --git a/drivers/watchdog/atcwdt200_wdt.c b/drivers/watchdog/atcwdt200_wdt.c\nindex 7e757c217b0b5..ceedc3f676320 100644\n--- a/drivers/watchdog/atcwdt200_wdt.c\n+++ b/drivers/watchdog/atcwdt200_wdt.c\n@@ -19,6 +19,7 @@\n #include \u003clinux/pm.h\u003e\n #include \u003clinux/pm_runtime.h\u003e\n #include \u003clinux/regmap.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n /* Register definitions */\n@@ -570,11 +571,11 @@ module_platform_driver(atcwdt_driver);\n \n module_param(timeout, uint, 0);\n MODULE_PARM_DESC(timeout, \"Watchdog timeout in seconds (default=\"\n-\t\t __MODULE_STRING(ATCWDT_TIMEOUT) \")\");\n+\t\t __stringify(ATCWDT_TIMEOUT) \")\");\n \n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n MODULE_LICENSE(\"GPL\");\n MODULE_AUTHOR(\"CL Wang \u003ccl634@andestech.com\u003e\");\ndiff --git a/drivers/watchdog/ath79_wdt.c b/drivers/watchdog/ath79_wdt.c\nindex 7df703e9852a6..02783c1ec5264 100644\n--- a/drivers/watchdog/ath79_wdt.c\n+++ b/drivers/watchdog/ath79_wdt.c\n@@ -32,6 +32,7 @@\n #include \u003clinux/of.h\u003e\n #include \u003clinux/of_platform.h\u003e\n #include \u003clinux/uaccess.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define DRIVER_NAME\t\"ath79-wdt\"\n \n@@ -50,12 +51,12 @@\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started \"\n-\t\t\t   \"(default=\" __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t   \"(default=\" __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static int timeout = WDT_TIMEOUT;\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout, \"Watchdog timeout in seconds \"\n-\t\t\t  \"(default=\" __MODULE_STRING(WDT_TIMEOUT) \"s)\");\n+\t\t\t  \"(default=\" __stringify(WDT_TIMEOUT) \"s)\");\n \n static unsigned long wdt_flags;\n \ndiff --git a/drivers/watchdog/bcm2835_wdt.c b/drivers/watchdog/bcm2835_wdt.c\nindex 6fd8b1b8e386a..1a0fc66cc0930 100644\n--- a/drivers/watchdog/bcm2835_wdt.c\n+++ b/drivers/watchdog/bcm2835_wdt.c\n@@ -20,6 +20,7 @@\n #include \u003clinux/of_address.h\u003e\n #include \u003clinux/of_platform.h\u003e\n #include \u003clinux/reboot.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define PM_RSTC\t\t\t\t0x1c\n #define PM_RSTS\t\t\t\t0x20\n@@ -229,7 +230,7 @@ MODULE_PARM_DESC(heartbeat, \"Initial watchdog heartbeat in seconds\");\n \n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n MODULE_ALIAS(\"platform:bcm2835-wdt\");\n MODULE_AUTHOR(\"Lubomir Rintel \u003clkundrak@v3.sk\u003e\");\ndiff --git a/drivers/watchdog/bcm47xx_wdt.c b/drivers/watchdog/bcm47xx_wdt.c\nindex e13ec0975bef3..0d7e8a87074a5 100644\n--- a/drivers/watchdog/bcm47xx_wdt.c\n+++ b/drivers/watchdog/bcm47xx_wdt.c\n@@ -21,6 +21,7 @@\n #include \u003clinux/watchdog.h\u003e\n #include \u003clinux/timer.h\u003e\n #include \u003clinux/jiffies.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define DRV_NAME\t\t\"bcm47xx_wdt\"\n \n@@ -33,12 +34,12 @@ static bool nowayout = WATCHDOG_NOWAYOUT;\n \n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout, \"Watchdog time in seconds. (default=\"\n-\t\t\t\t__MODULE_STRING(WDT_DEFAULT_TIME) \")\");\n+\t\t\t\t__stringify(WDT_DEFAULT_TIME) \")\");\n \n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static inline struct bcm47xx_wdt *bcm47xx_wdt_get(struct watchdog_device *wdd)\n {\ndiff --git a/drivers/watchdog/bcm7038_wdt.c b/drivers/watchdog/bcm7038_wdt.c\nindex e038dd66b8198..1117026cf9594 100644\n--- a/drivers/watchdog/bcm7038_wdt.c\n+++ b/drivers/watchdog/bcm7038_wdt.c\n@@ -12,6 +12,7 @@\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/platform_data/bcm7038_wdt.h\u003e\n #include \u003clinux/pm.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n #define WDT_START_1\t\t0xff00\n@@ -228,7 +229,7 @@ module_platform_driver(bcm7038_wdt_driver);\n \n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n MODULE_LICENSE(\"GPL\");\n MODULE_DESCRIPTION(\"Driver for Broadcom 7038 SoCs Watchdog\");\n MODULE_AUTHOR(\"Justin Chen\");\ndiff --git a/drivers/watchdog/booke_wdt.c b/drivers/watchdog/booke_wdt.c\nindex 1b1fb389b89ba..1224d1737e87b 100644\n--- a/drivers/watchdog/booke_wdt.c\n+++ b/drivers/watchdog/booke_wdt.c\n@@ -12,6 +12,7 @@\n \n #include \u003clinux/module.h\u003e\n #include \u003clinux/smp.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n #include \u003casm/reg_booke.h\u003e\n@@ -43,7 +44,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n #ifdef CONFIG_PPC_E500\n \ndiff --git a/drivers/watchdog/cadence_wdt.c b/drivers/watchdog/cadence_wdt.c\nindex ad46b33ce5f2e..0d635fb8b0f7c 100644\n--- a/drivers/watchdog/cadence_wdt.c\n+++ b/drivers/watchdog/cadence_wdt.c\n@@ -15,6 +15,7 @@\n #include \u003clinux/module.h\u003e\n #include \u003clinux/of.h\u003e\n #include \u003clinux/platform_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n #define CDNS_WDT_DEFAULT_TIMEOUT\t10\n@@ -52,12 +53,12 @@ static int nowayout = WATCHDOG_NOWAYOUT;\n module_param(wdt_timeout, int, 0644);\n MODULE_PARM_DESC(wdt_timeout,\n \t\t \"Watchdog time in seconds. (default=\"\n-\t\t __MODULE_STRING(CDNS_WDT_DEFAULT_TIMEOUT) \")\");\n+\t\t __stringify(CDNS_WDT_DEFAULT_TIMEOUT) \")\");\n \n module_param(nowayout, int, 0644);\n MODULE_PARM_DESC(nowayout,\n \t\t \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n /**\n  * struct cdns_wdt - Watchdog device structure\ndiff --git a/drivers/watchdog/cgbc_wdt.c b/drivers/watchdog/cgbc_wdt.c\nindex 702b055ba6f4b..a90e6af13bed3 100644\n--- a/drivers/watchdog/cgbc_wdt.c\n+++ b/drivers/watchdog/cgbc_wdt.c\n@@ -11,6 +11,7 @@\n #include \u003clinux/limits.h\u003e\n #include \u003clinux/module.h\u003e\n #include \u003clinux/platform_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n #include \u003clinux/mfd/cgbc.h\u003e\n@@ -38,19 +39,19 @@ static unsigned int timeout;\n module_param(timeout, uint, 0);\n MODULE_PARM_DESC(timeout,\n \t\t \"Watchdog timeout in seconds. (\u003e=0, default=\"\n-\t\t __MODULE_STRING(CGBC_WDT_DEFAULT_TIMEOUT) \")\");\n+\t\t __stringify(CGBC_WDT_DEFAULT_TIMEOUT) \")\");\n \n static unsigned int pretimeout = CGBC_WDT_DEFAULT_PRETIMEOUT;\n module_param(pretimeout, uint, 0);\n MODULE_PARM_DESC(pretimeout,\n \t\t \"Watchdog pretimeout in seconds. (\u003e=0, default=\"\n-\t\t __MODULE_STRING(CGBC_WDT_DEFAULT_PRETIMEOUT) \")\");\n+\t\t __stringify(CGBC_WDT_DEFAULT_PRETIMEOUT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n struct cgbc_wdt_data {\n \tstruct cgbc_device_data\t*cgbc;\ndiff --git a/drivers/watchdog/da9052_wdt.c b/drivers/watchdog/da9052_wdt.c\nindex afb7887c3a1e8..959cba0a88195 100644\n--- a/drivers/watchdog/da9052_wdt.c\n+++ b/drivers/watchdog/da9052_wdt.c\n@@ -17,6 +17,7 @@\n #include \u003clinux/types.h\u003e\n #include \u003clinux/kernel.h\u003e\n #include \u003clinux/jiffies.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #include \u003clinux/mfd/da9052/reg.h\u003e\n #include \u003clinux/mfd/da9052/da9052.h\u003e\n@@ -34,13 +35,13 @@ static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static int timeout;\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout,\n \t\"Watchdog timeout in seconds. (default = \"\n-\t__MODULE_STRING(WDT_DEFAULT_TIMEOUT) \")\");\n+\t__stringify(WDT_DEFAULT_TIMEOUT) \")\");\n \n static const struct {\n \tu8 reg_val;\ndiff --git a/drivers/watchdog/da9055_wdt.c b/drivers/watchdog/da9055_wdt.c\nindex 9d5a2009466f7..cbb87855bd6a4 100644\n--- a/drivers/watchdog/da9055_wdt.c\n+++ b/drivers/watchdog/da9055_wdt.c\n@@ -15,6 +15,7 @@\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/watchdog.h\u003e\n #include \u003clinux/delay.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #include \u003clinux/mfd/da9055/core.h\u003e\n #include \u003clinux/mfd/da9055/reg.h\u003e\n@@ -23,7 +24,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n #define DA9055_DEF_TIMEOUT\t4\n #define DA9055_TWDMIN\t\t256\ndiff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c\nindex 6ea0434f45c22..fcee686315c34 100644\n--- a/drivers/watchdog/davinci_wdt.c\n+++ b/drivers/watchdog/davinci_wdt.c\n@@ -19,6 +19,7 @@\n #include \u003clinux/device.h\u003e\n #include \u003clinux/clk.h\u003e\n #include \u003clinux/err.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define MODULE_NAME \"DAVINCI-WDT: \"\n \n@@ -250,8 +251,8 @@ MODULE_DESCRIPTION(\"DaVinci Watchdog Driver\");\n module_param(heartbeat, int, 0);\n MODULE_PARM_DESC(heartbeat,\n \t\t \"Watchdog heartbeat period in seconds from 1 to \"\n-\t\t __MODULE_STRING(MAX_HEARTBEAT) \", default \"\n-\t\t __MODULE_STRING(DEFAULT_HEARTBEAT));\n+\t\t __stringify(MAX_HEARTBEAT) \", default \"\n+\t\t __stringify(DEFAULT_HEARTBEAT));\n \n MODULE_LICENSE(\"GPL\");\n MODULE_ALIAS(\"platform:davinci-wdt\");\ndiff --git a/drivers/watchdog/db8500_wdt.c b/drivers/watchdog/db8500_wdt.c\nindex 70ccea13288d8..7e11c28997ec6 100644\n--- a/drivers/watchdog/db8500_wdt.c\n+++ b/drivers/watchdog/db8500_wdt.c\n@@ -15,6 +15,7 @@\n #include \u003clinux/uaccess.h\u003e\n #include \u003clinux/watchdog.h\u003e\n #include \u003clinux/platform_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #include \u003clinux/mfd/db8500-prcmu.h\u003e\n \n@@ -27,13 +28,13 @@ static unsigned int timeout = WATCHDOG_TIMEOUT;\n module_param(timeout, uint, 0);\n MODULE_PARM_DESC(timeout,\n \t\"Watchdog timeout in seconds. default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_TIMEOUT) \".\");\n+\t\t\t\t__stringify(WATCHDOG_TIMEOUT) \".\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static int db8500_wdt_start(struct watchdog_device *wdd)\n {\ndiff --git a/drivers/watchdog/dw_wdt.c b/drivers/watchdog/dw_wdt.c\nindex 39031445d754b..c1d40d7b2165f 100644\n--- a/drivers/watchdog/dw_wdt.c\n+++ b/drivers/watchdog/dw_wdt.c\n@@ -27,6 +27,7 @@\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/pm.h\u003e\n #include \u003clinux/reset.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n #define WDOG_CONTROL_REG_OFFSET\t\t    0x00\n@@ -66,7 +67,7 @@ static const u32 dw_wdt_fix_tops[DW_WDT_NUM_TOPS] = {\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started \"\n-\t\t \"(default=\" __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t \"(default=\" __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n enum dw_wdt_rmod {\n \tDW_WDT_RMOD_RESET = 1,\ndiff --git a/drivers/watchdog/ebc-c384_wdt.c b/drivers/watchdog/ebc-c384_wdt.c\nindex 8ef4b0df3855f..39cc1f7e1cdb0 100644\n--- a/drivers/watchdog/ebc-c384_wdt.c\n+++ b/drivers/watchdog/ebc-c384_wdt.c\n@@ -13,6 +13,7 @@\n #include \u003clinux/module.h\u003e\n #include \u003clinux/moduleparam.h\u003e\n #include \u003clinux/types.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n #define MODULE_NAME\t\t\"ebc-c384_wdt\"\n@@ -30,12 +31,12 @@\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static unsigned timeout;\n module_param(timeout, uint, 0);\n MODULE_PARM_DESC(timeout, \"Watchdog timeout in seconds (default=\"\n-\t__MODULE_STRING(WATCHDOG_TIMEOUT) \")\");\n+\t__stringify(WATCHDOG_TIMEOUT) \")\");\n \n static int ebc_c384_wdt_start(struct watchdog_device *wdev)\n {\ndiff --git a/drivers/watchdog/eurotechwdt.c b/drivers/watchdog/eurotechwdt.c\nindex 10c647b1226af..4d671c4e148af 100644\n--- a/drivers/watchdog/eurotechwdt.c\n+++ b/drivers/watchdog/eurotechwdt.c\n@@ -56,6 +56,7 @@\n #include \u003clinux/init.h\u003e\n #include \u003clinux/io.h\u003e\n #include \u003clinux/uaccess.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n \n static unsigned long eurwdt_is_open;\n@@ -77,7 +78,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n /*\n  * Some symbolic names\ndiff --git a/drivers/watchdog/exar_wdt.c b/drivers/watchdog/exar_wdt.c\nindex db62c9797406f..553be158a7252 100644\n--- a/drivers/watchdog/exar_wdt.c\n+++ b/drivers/watchdog/exar_wdt.c\n@@ -14,6 +14,7 @@\n #include \u003clinux/module.h\u003e\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/slab.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n #define DRV_NAME\t\"exar_wdt\"\n@@ -70,13 +71,13 @@ static int timeout = WATCHDOG_TIMEOUT;\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout,\n \t\t \"Watchdog timeout in seconds. 1\u003c=timeout\u003c=15300, default=\"\n-\t\t __MODULE_STRING(WATCHDOG_TIMEOUT) \".\");\n+\t\t __stringify(WATCHDOG_TIMEOUT) \".\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static int exar_sio_enter(const unsigned short config_port,\n \t\t\t  const unsigned char key)\ndiff --git a/drivers/watchdog/f71808e_wdt.c b/drivers/watchdog/f71808e_wdt.c\nindex 6a16d3d0bb1e6..2790061a68f34 100644\n--- a/drivers/watchdog/f71808e_wdt.c\n+++ b/drivers/watchdog/f71808e_wdt.c\n@@ -14,6 +14,7 @@\n #include \u003clinux/ioport.h\u003e\n #include \u003clinux/module.h\u003e\n #include \u003clinux/platform_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n #define DRVNAME \"f71808e_wdt\"\n@@ -81,20 +82,20 @@ static int timeout = WATCHDOG_TIMEOUT;\t/* default timeout in seconds */\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout,\n \t\"Watchdog timeout in seconds. 1\u003c= timeout \u003c=\"\n-\t\t\t__MODULE_STRING(WATCHDOG_MAX_TIMEOUT) \" (default=\"\n-\t\t\t__MODULE_STRING(WATCHDOG_TIMEOUT) \")\");\n+\t\t\t__stringify(WATCHDOG_MAX_TIMEOUT) \" (default=\"\n+\t\t\t__stringify(WATCHDOG_TIMEOUT) \")\");\n \n static unsigned int pulse_width = WATCHDOG_PULSE_WIDTH;\n module_param(pulse_width, uint, 0);\n MODULE_PARM_DESC(pulse_width,\n \t\"Watchdog signal pulse width. 0(=level), 1, 25, 30, 125, 150, 5000 or 6000 ms\"\n-\t\t\t\" (default=\" __MODULE_STRING(WATCHDOG_PULSE_WIDTH) \")\");\n+\t\t\t\" (default=\" __stringify(WATCHDOG_PULSE_WIDTH) \")\");\n \n static unsigned int f71862fg_pin = WATCHDOG_F71862FG_PIN;\n module_param(f71862fg_pin, uint, 0);\n MODULE_PARM_DESC(f71862fg_pin,\n \t\"Watchdog f71862fg reset output pin configuration. Choose pin 56 or 63\"\n-\t\t\t\" (default=\" __MODULE_STRING(WATCHDOG_F71862FG_PIN)\")\");\n+\t\t\t\" (default=\" __stringify(WATCHDOG_F71862FG_PIN)\")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0444);\ndiff --git a/drivers/watchdog/gef_wdt.c b/drivers/watchdog/gef_wdt.c\nindex bf6f733dfb5f7..4d39588a49c32 100644\n--- a/drivers/watchdog/gef_wdt.c\n+++ b/drivers/watchdog/gef_wdt.c\n@@ -34,6 +34,7 @@\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/io.h\u003e\n #include \u003clinux/uaccess.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #include \u003csysdev/fsl_soc.h\u003e\n \n@@ -70,7 +71,7 @@ static DEFINE_SPINLOCK(gef_wdt_spinlock);\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n \n static int gef_wdt_toggle_wdc(int enabled_predicate, int field_shift)\ndiff --git a/drivers/watchdog/geodewdt.c b/drivers/watchdog/geodewdt.c\nindex 5b80ade1c6814..437cc0a536545 100644\n--- a/drivers/watchdog/geodewdt.c\n+++ b/drivers/watchdog/geodewdt.c\n@@ -16,6 +16,7 @@\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/reboot.h\u003e\n #include \u003clinux/uaccess.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #include \u003clinux/cs5535.h\u003e\n \n@@ -34,13 +35,13 @@ static int timeout = WATCHDOG_TIMEOUT;\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout,\n \t\"Watchdog timeout in seconds. 1\u003c= timeout \u003c=131, default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_TIMEOUT) \".\");\n+\t\t\t\t__stringify(WATCHDOG_TIMEOUT) \".\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static struct platform_device *geodewdt_platform_device;\n static unsigned long wdt_flags;\ndiff --git a/drivers/watchdog/gpio_wdt.c b/drivers/watchdog/gpio_wdt.c\nindex 1abc7d0b78a62..2cd79c8f60dcd 100644\n--- a/drivers/watchdog/gpio_wdt.c\n+++ b/drivers/watchdog/gpio_wdt.c\n@@ -11,13 +11,14 @@\n #include \u003clinux/module.h\u003e\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/property.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n #define SOFT_TIMEOUT_MIN\t1\n #define SOFT_TIMEOUT_DEF\t60\ndiff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c\nindex 8af1fad2de0bd..7b9eb4e4b6e7c 100644\n--- a/drivers/watchdog/hpwdt.c\n+++ b/drivers/watchdog/hpwdt.c\n@@ -20,6 +20,7 @@\n #include \u003clinux/pci.h\u003e\n #include \u003clinux/pci_ids.h\u003e\n #include \u003clinux/types.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n #ifdef CONFIG_HPWDT_NMI_DECODING\n #include \u003casm/nmi.h\u003e\n@@ -432,7 +433,7 @@ MODULE_PARM_DESC(timeout, \"Alias of soft_margin\");\n \n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n module_param(kdumptimeout, int, 0444);\n MODULE_PARM_DESC(kdumptimeout, \"Timeout applied for crash kernel transition in seconds\");\ndiff --git a/drivers/watchdog/i6300esb.c b/drivers/watchdog/i6300esb.c\nindex a30835f547b32..006d263cf1356 100644\n--- a/drivers/watchdog/i6300esb.c\n+++ b/drivers/watchdog/i6300esb.c\n@@ -37,6 +37,7 @@\n #include \u003clinux/ioport.h\u003e\n #include \u003clinux/uaccess.h\u003e\n #include \u003clinux/io.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n /* Module and version information */\n #define ESB_MODULE_NAME \"i6300ESB timer\"\n@@ -74,19 +75,19 @@\n #define ESB_HEARTBEAT_MIN\t1\n #define ESB_HEARTBEAT_MAX\t2046\n #define ESB_HEARTBEAT_DEFAULT\t30\n-#define ESB_HEARTBEAT_RANGE __MODULE_STRING(ESB_HEARTBEAT_MIN) \\\n-\t\"\u003cheartbeat\u003c\" __MODULE_STRING(ESB_HEARTBEAT_MAX)\n+#define ESB_HEARTBEAT_RANGE __stringify(ESB_HEARTBEAT_MIN) \\\n+\t\"\u003cheartbeat\u003c\" __stringify(ESB_HEARTBEAT_MAX)\n static int heartbeat; /* in seconds */\n module_param(heartbeat, int, 0);\n MODULE_PARM_DESC(heartbeat,\n \t\"Watchdog heartbeat in seconds. (\" ESB_HEARTBEAT_RANGE\n-\t\", default=\" __MODULE_STRING(ESB_HEARTBEAT_DEFAULT) \")\");\n+\t\", default=\" __stringify(ESB_HEARTBEAT_DEFAULT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n /* internal variables */\n struct esb_dev {\ndiff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c\nindex 1dec9cd155b11..0a8bf28f57688 100644\n--- a/drivers/watchdog/iTCO_wdt.c\n+++ b/drivers/watchdog/iTCO_wdt.c\n@@ -60,6 +60,7 @@\n #include \u003clinux/ioport.h\u003e\t\t/* For io-port access */\n #include \u003clinux/uaccess.h\u003e\t\t/* For copy_to_user/put_user/... */\n #include \u003clinux/io.h\u003e\t\t\t/* For inb/outb/... */\n+#include \u003clinux/stringify.h\u003e\t\t/* For __stringify */\n #include \u003clinux/platform_data/itco_wdt.h\u003e\n #include \u003clinux/mfd/intel_pmc_bxt.h\u003e\n \n@@ -115,13 +116,13 @@ static int heartbeat = WATCHDOG_TIMEOUT;  /* in seconds */\n module_param(heartbeat, int, 0);\n MODULE_PARM_DESC(heartbeat, \"Watchdog timeout in seconds. \"\n \t\"5..76 (TCO v1) or 3..614 (TCO v2), default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_TIMEOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_TIMEOUT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static int turn_SMI_watchdog_clear_off = 1;\n module_param(turn_SMI_watchdog_clear_off, int, 0);\ndiff --git a/drivers/watchdog/ib700wdt.c b/drivers/watchdog/ib700wdt.c\nindex 5ce6101d236d7..3806d86eb36ad 100644\n--- a/drivers/watchdog/ib700wdt.c\n+++ b/drivers/watchdog/ib700wdt.c\n@@ -41,6 +41,7 @@\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/io.h\u003e\n #include \u003clinux/uaccess.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n \n static struct platform_device *ibwdt_platform_device;\n@@ -96,13 +97,13 @@ static int timeout = WATCHDOG_TIMEOUT;\t/* in seconds */\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout,\n \t\"Watchdog timeout in seconds. 0\u003c= timeout \u003c=30, default=\"\n-\t\t__MODULE_STRING(WATCHDOG_TIMEOUT) \".\");\n+\t\t__stringify(WATCHDOG_TIMEOUT) \".\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n \n /*\ndiff --git a/drivers/watchdog/ibmasr.c b/drivers/watchdog/ibmasr.c\nindex cf845f865945d..53bd84e6d57f1 100644\n--- a/drivers/watchdog/ibmasr.c\n+++ b/drivers/watchdog/ibmasr.c\n@@ -21,6 +21,7 @@\n #include \u003clinux/dmi.h\u003e\n #include \u003clinux/io.h\u003e\n #include \u003clinux/uaccess.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n \n enum {\n@@ -413,7 +414,7 @@ module_exit(ibmasr_exit);\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n MODULE_DESCRIPTION(\"IBM Automatic Server Restart driver\");\n MODULE_AUTHOR(\"Andrey Panin\");\ndiff --git a/drivers/watchdog/ie6xx_wdt.c b/drivers/watchdog/ie6xx_wdt.c\nindex 5a7bb7e84653f..eda515b917cc4 100644\n--- a/drivers/watchdog/ie6xx_wdt.c\n+++ b/drivers/watchdog/ie6xx_wdt.c\n@@ -17,6 +17,7 @@\n #include \u003clinux/debugfs.h\u003e\n #include \u003clinux/uaccess.h\u003e\n #include \u003clinux/spinlock.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define DRIVER_NAME \"ie6xx_wdt\"\n \n@@ -49,14 +50,14 @@ static unsigned int timeout = DEFAULT_TIME;\n module_param(timeout, uint, 0);\n MODULE_PARM_DESC(timeout,\n \t\t\"Default Watchdog timer setting (\"\n-\t\t__MODULE_STRING(DEFAULT_TIME) \"s).\"\n+\t\t__stringify(DEFAULT_TIME) \"s).\"\n \t\t\"The range is from 1 to 600\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\"Watchdog cannot be stopped once started (default=\"\n-\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static u8 resetmode = 0x10;\n module_param(resetmode, byte, 0);\ndiff --git a/drivers/watchdog/imgpdc_wdt.c b/drivers/watchdog/imgpdc_wdt.c\nindex 65cc8396aa595..bb6227c40de43 100644\n--- a/drivers/watchdog/imgpdc_wdt.c\n+++ b/drivers/watchdog/imgpdc_wdt.c\n@@ -43,6 +43,7 @@\n #include \u003clinux/module.h\u003e\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/slab.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n /* registers */\n@@ -71,12 +72,12 @@\n static int heartbeat;\n module_param(heartbeat, int, 0);\n MODULE_PARM_DESC(heartbeat, \"Watchdog heartbeats in seconds \"\n-\t\"(default=\" __MODULE_STRING(PDC_WDT_DEF_TIMEOUT) \")\");\n+\t\"(default=\" __stringify(PDC_WDT_DEF_TIMEOUT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started \"\n-\t\"(default=\" __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\"(default=\" __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n struct pdc_wdt_dev {\n \tstruct watchdog_device wdt_dev;\ndiff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c\nindex 4b3a192ee3e82..58aa5f999f4fe 100644\n--- a/drivers/watchdog/imx2_wdt.c\n+++ b/drivers/watchdog/imx2_wdt.c\n@@ -29,6 +29,7 @@\n #include \u003clinux/of.h\u003e\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/regmap.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n #define DRIVER_NAME \"imx2-wdt\"\n@@ -79,12 +80,12 @@ struct imx2_wdt_device {\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static unsigned timeout;\n module_param(timeout, uint, 0);\n MODULE_PARM_DESC(timeout, \"Watchdog timeout in seconds (default=\"\n-\t\t\t\t__MODULE_STRING(IMX2_WDT_DEFAULT_TIME) \")\");\n+\t\t\t\t__stringify(IMX2_WDT_DEFAULT_TIME) \")\");\n \n static const struct watchdog_info imx2_wdt_info = {\n \t.identity = \"imx2+ watchdog\",\ndiff --git a/drivers/watchdog/imx7ulp_wdt.c b/drivers/watchdog/imx7ulp_wdt.c\nindex 855dc9d5083a5..f61936194aea8 100644\n--- a/drivers/watchdog/imx7ulp_wdt.c\n+++ b/drivers/watchdog/imx7ulp_wdt.c\n@@ -11,6 +11,7 @@\n #include \u003clinux/of.h\u003e\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/reboot.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n #define WDOG_CS\t\t\t0x0\n@@ -51,7 +52,7 @@\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0000);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n struct imx_wdt_hw_feature {\n \tbool prescaler_enable;\ndiff --git a/drivers/watchdog/imx_sc_wdt.c b/drivers/watchdog/imx_sc_wdt.c\nindex 1280b9b1ec2ac..fc39f9db4c06f 100644\n--- a/drivers/watchdog/imx_sc_wdt.c\n+++ b/drivers/watchdog/imx_sc_wdt.c\n@@ -11,6 +11,7 @@\n #include \u003clinux/moduleparam.h\u003e\n #include \u003clinux/of.h\u003e\n #include \u003clinux/platform_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n #define DEFAULT_TIMEOUT 60\n@@ -39,7 +40,7 @@\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0000);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n struct imx_sc_wdt_device {\n \tstruct watchdog_device wdd;\ndiff --git a/drivers/watchdog/indydog.c b/drivers/watchdog/indydog.c\nindex d3092d2613452..5268b1feb7ce7 100644\n--- a/drivers/watchdog/indydog.c\n+++ b/drivers/watchdog/indydog.c\n@@ -22,6 +22,7 @@\n #include \u003clinux/reboot.h\u003e\n #include \u003clinux/init.h\u003e\n #include \u003clinux/uaccess.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003casm/sgi/mc.h\u003e\n \n static unsigned long indydog_alive;\n@@ -33,7 +34,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static void indydog_start(void)\n {\ndiff --git a/drivers/watchdog/intel_oc_wdt.c b/drivers/watchdog/intel_oc_wdt.c\nindex a39892c10770e..d1e9a3f62369f 100644\n--- a/drivers/watchdog/intel_oc_wdt.c\n+++ b/drivers/watchdog/intel_oc_wdt.c\n@@ -14,6 +14,7 @@\n #include \u003clinux/module.h\u003e\n #include \u003clinux/moduleparam.h\u003e\n #include \u003clinux/platform_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n #define INTEL_OC_WDT_TOV\t\tGENMASK(9, 0)\n@@ -48,12 +49,12 @@ struct intel_oc_wdt {\n static int heartbeat;\n module_param(heartbeat, uint, 0);\n MODULE_PARM_DESC(heartbeat, \"Watchdog heartbeats in seconds. (default=\"\n-\t\t __MODULE_STRING(WDT_HEARTBEAT) \")\");\n+\t\t __stringify(WDT_HEARTBEAT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static int intel_oc_wdt_start(struct watchdog_device *wdd)\n {\ndiff --git a/drivers/watchdog/it87_wdt.c b/drivers/watchdog/it87_wdt.c\nindex 1d9f8591f38d8..087250ab036a9 100644\n--- a/drivers/watchdog/it87_wdt.c\n+++ b/drivers/watchdog/it87_wdt.c\n@@ -29,6 +29,7 @@\n #include \u003clinux/module.h\u003e\n #include \u003clinux/moduleparam.h\u003e\n #include \u003clinux/printk.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/types.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n@@ -105,13 +106,13 @@ static bool nowayout = DEFAULT_NOWAYOUT;\n \n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout, \"Watchdog timeout in seconds, default=\"\n-\t\t__MODULE_STRING(DEFAULT_TIMEOUT));\n+\t\t__stringify(DEFAULT_TIMEOUT));\n module_param(testmode, int, 0);\n MODULE_PARM_DESC(testmode, \"Watchdog test mode (1 = no reboot), default=\"\n-\t\t__MODULE_STRING(DEFAULT_TESTMODE));\n+\t\t__stringify(DEFAULT_TESTMODE));\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started, default=\"\n-\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT));\n+\t\t__stringify(WATCHDOG_NOWAYOUT));\n \n /* Superio Chip */\n \ndiff --git a/drivers/watchdog/jz4740_wdt.c b/drivers/watchdog/jz4740_wdt.c\nindex 395bde79e2920..9dec1b8224101 100644\n--- a/drivers/watchdog/jz4740_wdt.c\n+++ b/drivers/watchdog/jz4740_wdt.c\n@@ -19,6 +19,7 @@\n #include \u003clinux/err.h\u003e\n #include \u003clinux/of.h\u003e\n #include \u003clinux/regmap.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define DEFAULT_HEARTBEAT 5\n #define MAX_HEARTBEAT     2048\n@@ -27,14 +28,14 @@ static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static unsigned int heartbeat = DEFAULT_HEARTBEAT;\n module_param(heartbeat, uint, 0);\n MODULE_PARM_DESC(heartbeat,\n \t\t\"Watchdog heartbeat period in seconds from 1 to \"\n-\t\t__MODULE_STRING(MAX_HEARTBEAT) \", default \"\n-\t\t__MODULE_STRING(DEFAULT_HEARTBEAT));\n+\t\t__stringify(MAX_HEARTBEAT) \", default \"\n+\t\t__stringify(DEFAULT_HEARTBEAT));\n \n struct jz4740_wdt_drvdata {\n \tstruct watchdog_device wdt;\ndiff --git a/drivers/watchdog/keembay_wdt.c b/drivers/watchdog/keembay_wdt.c\nindex 7c8e53921e407..11b4b26f7b88e 100644\n--- a/drivers/watchdog/keembay_wdt.c\n+++ b/drivers/watchdog/keembay_wdt.c\n@@ -14,6 +14,7 @@\n #include \u003clinux/module.h\u003e\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/reboot.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n /* Non-secure watchdog register offsets */\n@@ -39,12 +40,12 @@\n static unsigned int timeout = WDT_TIMEOUT;\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout, \"Watchdog timeout period in seconds (default = \"\n-\t\t __MODULE_STRING(WDT_TIMEOUT) \")\");\n+\t\t __stringify(WDT_TIMEOUT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default = \"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n struct keembay_wdt {\n \tstruct watchdog_device\twdd;\ndiff --git a/drivers/watchdog/kempld_wdt.c b/drivers/watchdog/kempld_wdt.c\nindex e6c7a29066804..b4cde48d2b10a 100644\n--- a/drivers/watchdog/kempld_wdt.c\n+++ b/drivers/watchdog/kempld_wdt.c\n@@ -21,6 +21,7 @@\n #include \u003clinux/uaccess.h\u003e\n #include \u003clinux/watchdog.h\u003e\n #include \u003clinux/platform_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/mfd/kempld.h\u003e\n \n #define KEMPLD_WDT_STAGE_TIMEOUT(x)\t(0x1b + (x) * 4)\n@@ -85,19 +86,19 @@ static unsigned int timeout = DEFAULT_TIMEOUT;\n module_param(timeout, uint, 0);\n MODULE_PARM_DESC(timeout,\n \t\"Watchdog timeout in seconds. (\u003e=0, default=\"\n-\t__MODULE_STRING(DEFAULT_TIMEOUT) \")\");\n+\t__stringify(DEFAULT_TIMEOUT) \")\");\n \n static unsigned int pretimeout = DEFAULT_PRETIMEOUT;\n module_param(pretimeout, uint, 0);\n MODULE_PARM_DESC(pretimeout,\n \t\"Watchdog pretimeout in seconds. (\u003e=0, default=\"\n-\t__MODULE_STRING(DEFAULT_PRETIMEOUT) \")\");\n+\t__stringify(DEFAULT_PRETIMEOUT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\"Watchdog cannot be stopped once started (default=\"\n-\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static int kempld_wdt_set_stage_action(struct kempld_wdt_data *wdt_data,\n \t\t\t\t\tstruct kempld_wdt_stage *stage,\ndiff --git a/drivers/watchdog/lenovo_se10_wdt.c b/drivers/watchdog/lenovo_se10_wdt.c\nindex 503e220263f95..1eaf86c85cc0e 100644\n--- a/drivers/watchdog/lenovo_se10_wdt.c\n+++ b/drivers/watchdog/lenovo_se10_wdt.c\n@@ -10,6 +10,7 @@\n #include \u003clinux/moduleparam.h\u003e\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/string.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/types.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n@@ -48,13 +49,13 @@ static int timeout; /* in seconds */\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout,\n \t\t \"Watchdog timeout in seconds. 1 \u003c= timeout \u003c= 255, default=\"\n-\t\t __MODULE_STRING(WATCHDOG_TIMEOUT) \".\");\n+\t\t __stringify(WATCHDOG_TIMEOUT) \".\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n struct se10_wdt {\n \tstruct watchdog_device wdd;\ndiff --git a/drivers/watchdog/lenovo_se30_wdt.c b/drivers/watchdog/lenovo_se30_wdt.c\nindex 1c73bb7eeeeed..127ea9a1933ff 100644\n--- a/drivers/watchdog/lenovo_se30_wdt.c\n+++ b/drivers/watchdog/lenovo_se30_wdt.c\n@@ -13,6 +13,7 @@\n #include \u003clinux/module.h\u003e\n #include \u003clinux/moduleparam.h\u003e\n #include \u003clinux/platform_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n #define IOREGION_OFFSET\t4 /* Use EC port 1 */\n@@ -28,13 +29,13 @@ static int timeout; /* in seconds */\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout,\n \t\t \"Watchdog timeout in seconds. 1 \u003c= timeout \u003c= 255, default=\"\n-\t\t __MODULE_STRING(WATCHDOG_TIMEOUT) \".\");\n+\t\t __stringify(WATCHDOG_TIMEOUT) \".\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n #define LNV_SE30_NAME\t\"lenovo-se30-wdt\"\n #define LNV_SE30_ID\t0x0110\ndiff --git a/drivers/watchdog/lenovo_se30g2_se60_wdt.c b/drivers/watchdog/lenovo_se30g2_se60_wdt.c\nindex f31ecdb82ad05..c87abdb1a1b2d 100644\n--- a/drivers/watchdog/lenovo_se30g2_se60_wdt.c\n+++ b/drivers/watchdog/lenovo_se30g2_se60_wdt.c\n@@ -10,6 +10,7 @@\n #include \u003clinux/moduleparam.h\u003e\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/string.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/types.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n@@ -37,13 +38,13 @@ static int timeout; /* in seconds */\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout,\n \t\t \"Watchdog timeout in seconds. 1 \u003c= timeout \u003c= 255, default=\"\n-\t\t __MODULE_STRING(WATCHDOG_TIMEOUT) \".\");\n+\t\t __stringify(WATCHDOG_TIMEOUT) \".\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n struct se_30g2_60_wdt {\n \tstruct watchdog_device wdd;\ndiff --git a/drivers/watchdog/loongson1_wdt.c b/drivers/watchdog/loongson1_wdt.c\nindex 2417519717cc4..7f8de11f1b4ab 100644\n--- a/drivers/watchdog/loongson1_wdt.c\n+++ b/drivers/watchdog/loongson1_wdt.c\n@@ -9,6 +9,7 @@\n #include \u003clinux/module.h\u003e\n #include \u003clinux/of.h\u003e\n #include \u003clinux/platform_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n /* Loongson Watchdog Register Definitions */\n@@ -19,12 +20,12 @@\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static unsigned int heartbeat;\n module_param(heartbeat, uint, 0);\n MODULE_PARM_DESC(heartbeat, \"Watchdog heartbeat in seconds. (default=\"\n-\t\t __MODULE_STRING(DEFAULT_HEARTBEAT) \")\");\n+\t\t __stringify(DEFAULT_HEARTBEAT) \")\");\n \n struct ls1x_wdt_pdata {\n \tu32 timer_offset;\ndiff --git a/drivers/watchdog/lpc18xx_wdt.c b/drivers/watchdog/lpc18xx_wdt.c\nindex 3e8e80bbcb93b..633119e4b126d 100644\n--- a/drivers/watchdog/lpc18xx_wdt.c\n+++ b/drivers/watchdog/lpc18xx_wdt.c\n@@ -15,6 +15,7 @@\n #include \u003clinux/module.h\u003e\n #include \u003clinux/of.h\u003e\n #include \u003clinux/platform_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n /* Registers */\n@@ -41,12 +42,12 @@\n static int heartbeat;\n module_param(heartbeat, int, 0);\n MODULE_PARM_DESC(heartbeat, \"Watchdog heartbeats in seconds (default=\"\n-\t\t __MODULE_STRING(LPC18XX_WDT_DEF_TIMEOUT) \")\");\n+\t\t __stringify(LPC18XX_WDT_DEF_TIMEOUT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n struct lpc18xx_wdt_dev {\n \tstruct watchdog_device\twdt_dev;\ndiff --git a/drivers/watchdog/ma35d1_wdt.c b/drivers/watchdog/ma35d1_wdt.c\nindex 119d58f338bf0..ede4bee594f1f 100644\n--- a/drivers/watchdog/ma35d1_wdt.c\n+++ b/drivers/watchdog/ma35d1_wdt.c\n@@ -20,6 +20,7 @@\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/pm_wakeirq.h\u003e\n #include \u003clinux/property.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/types.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n@@ -355,7 +356,7 @@ MODULE_PARM_DESC(timeout, \"Watchdog heartbeat in seconds\");\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(\n \tnowayout,\n-\t\"Watchdog cannot be stopped once started (default=\" __MODULE_STRING(\n+\t\"Watchdog cannot be stopped once started (default=\" __stringify(\n \t\tWATCHDOG_NOWAYOUT) \")\");\n \n MODULE_AUTHOR(\"Zi-Yu Chen \u003czychennvt@gmail.com\u003e\");\ndiff --git a/drivers/watchdog/max63xx_wdt.c b/drivers/watchdog/max63xx_wdt.c\nindex e9073df1a7de3..aefda26bbcec9 100644\n--- a/drivers/watchdog/max63xx_wdt.c\n+++ b/drivers/watchdog/max63xx_wdt.c\n@@ -23,6 +23,7 @@\n #include \u003clinux/io.h\u003e\n #include \u003clinux/slab.h\u003e\n #include \u003clinux/property.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define DEFAULT_HEARTBEAT 60\n #define MAX_HEARTBEAT     60\n@@ -283,12 +284,12 @@ MODULE_DESCRIPTION(\"max63xx Watchdog Driver\");\n module_param(heartbeat, int, 0);\n MODULE_PARM_DESC(heartbeat,\n \t\t \"Watchdog heartbeat period in seconds from 1 to \"\n-\t\t __MODULE_STRING(MAX_HEARTBEAT) \", default \"\n-\t\t __MODULE_STRING(DEFAULT_HEARTBEAT));\n+\t\t __stringify(MAX_HEARTBEAT) \", default \"\n+\t\t __stringify(DEFAULT_HEARTBEAT));\n \n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n module_param(nodelay, int, 0);\n MODULE_PARM_DESC(nodelay,\ndiff --git a/drivers/watchdog/max77620_wdt.c b/drivers/watchdog/max77620_wdt.c\nindex ed5a98cea525d..79148cbad4f26 100644\n--- a/drivers/watchdog/max77620_wdt.c\n+++ b/drivers/watchdog/max77620_wdt.c\n@@ -18,6 +18,7 @@\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/regmap.h\u003e\n #include \u003clinux/slab.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n@@ -255,7 +256,7 @@ MODULE_DESCRIPTION(\"Max77620 watchdog timer driver\");\n \n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started \"\n-\t\"(default=\" __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\"(default=\" __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n MODULE_AUTHOR(\"Laxman Dewangan \u003cldewangan@nvidia.com\u003e\");\n MODULE_AUTHOR(\"Luca Ceresoli \u003cluca.ceresoli@bootlin.com\u003e\");\ndiff --git a/drivers/watchdog/mena21_wdt.c b/drivers/watchdog/mena21_wdt.c\nindex 99d2359d5a8a7..a762462c25c54 100644\n--- a/drivers/watchdog/mena21_wdt.c\n+++ b/drivers/watchdog/mena21_wdt.c\n@@ -17,6 +17,7 @@\n #include \u003clinux/delay.h\u003e\n #include \u003clinux/bitops.h\u003e\n #include \u003clinux/of.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define NUM_GPIOS 6\n \n@@ -37,7 +38,7 @@ struct a21_wdt_drv {\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t\t    __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t    __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static unsigned int a21_wdt_get_bootstatus(struct a21_wdt_drv *drv)\n {\ndiff --git a/drivers/watchdog/menf21bmc_wdt.c b/drivers/watchdog/menf21bmc_wdt.c\nindex 81ebdfc371f4d..bb8eda18fbad6 100644\n--- a/drivers/watchdog/menf21bmc_wdt.c\n+++ b/drivers/watchdog/menf21bmc_wdt.c\n@@ -11,6 +11,7 @@\n #include \u003clinux/watchdog.h\u003e\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/i2c.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define DEVNAME \"menf21bmc_wdt\"\n \n@@ -28,7 +29,7 @@\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n struct menf21bmc_wdt {\n \tstruct watchdog_device wdt;\ndiff --git a/drivers/watchdog/menz69_wdt.c b/drivers/watchdog/menz69_wdt.c\nindex 3fe23451135d7..962c6867bc073 100644\n--- a/drivers/watchdog/menz69_wdt.c\n+++ b/drivers/watchdog/menz69_wdt.c\n@@ -8,6 +8,7 @@\n #include \u003clinux/kernel.h\u003e\n #include \u003clinux/mcb.h\u003e\n #include \u003clinux/module.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n struct men_z069_drv {\n@@ -29,7 +30,7 @@ struct men_z069_drv {\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t\t    __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t    __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static int men_z069_wdt_start(struct watchdog_device *wdt)\n {\ndiff --git a/drivers/watchdog/meson_gxbb_wdt.c b/drivers/watchdog/meson_gxbb_wdt.c\nindex a48622d11ad72..fb276060e8314 100644\n--- a/drivers/watchdog/meson_gxbb_wdt.c\n+++ b/drivers/watchdog/meson_gxbb_wdt.c\n@@ -11,6 +11,7 @@\n #include \u003clinux/of.h\u003e\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/slab.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/types.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n@@ -31,12 +32,12 @@\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static unsigned int timeout;\n module_param(timeout, uint, 0);\n MODULE_PARM_DESC(timeout, \"Watchdog heartbeat in seconds=\"\n-\t\t __MODULE_STRING(DEFAULT_TIMEOUT) \")\");\n+\t\t __stringify(DEFAULT_TIMEOUT) \")\");\n \n struct meson_gxbb_wdt {\n \tvoid __iomem *reg_base;\ndiff --git a/drivers/watchdog/meson_wdt.c b/drivers/watchdog/meson_wdt.c\nindex 44db4ebc8599f..80a4f87713359 100644\n--- a/drivers/watchdog/meson_wdt.c\n+++ b/drivers/watchdog/meson_wdt.c\n@@ -15,6 +15,7 @@\n #include \u003clinux/moduleparam.h\u003e\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/property.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/types.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n@@ -218,7 +219,7 @@ MODULE_PARM_DESC(timeout, \"Watchdog heartbeat in seconds\");\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n MODULE_LICENSE(\"GPL\");\n MODULE_AUTHOR(\"Carlo Caione \u003ccarlo@caione.org\u003e\");\ndiff --git a/drivers/watchdog/mixcomwd.c b/drivers/watchdog/mixcomwd.c\nindex 1ecd5c48a005a..db358df2f2228 100644\n--- a/drivers/watchdog/mixcomwd.c\n+++ b/drivers/watchdog/mixcomwd.c\n@@ -52,6 +52,7 @@\n #include \u003clinux/timer.h\u003e\n #include \u003clinux/uaccess.h\u003e\n #include \u003clinux/io.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n /*\n  * We have two types of cards that can be probed:\n@@ -107,7 +108,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static void mixcomwd_ping(void)\n {\ndiff --git a/drivers/watchdog/mpc8xxx_wdt.c b/drivers/watchdog/mpc8xxx_wdt.c\nindex a4b497ecfa205..0d5a360b56292 100644\n--- a/drivers/watchdog/mpc8xxx_wdt.c\n+++ b/drivers/watchdog/mpc8xxx_wdt.c\n@@ -22,6 +22,7 @@\n #include \u003clinux/watchdog.h\u003e\n #include \u003clinux/io.h\u003e\n #include \u003clinux/uaccess.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003csysdev/fsl_soc.h\u003e\n \n #define WATCHDOG_TIMEOUT 10\n@@ -57,7 +58,7 @@ static u16 timeout;\n module_param(timeout, ushort, 0);\n MODULE_PARM_DESC(timeout,\n \t\"Watchdog timeout in seconds. (1\u003ctimeout\u003c65535, default=\"\n-\t__MODULE_STRING(WATCHDOG_TIMEOUT) \")\");\n+\t__stringify(WATCHDOG_TIMEOUT) \")\");\n \n static bool reset = 1;\n module_param(reset, bool, 0);\n@@ -67,7 +68,7 @@ MODULE_PARM_DESC(reset,\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started \"\n-\t\t \"(default=\" __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t \"(default=\" __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static void mpc8xxx_wdt_keepalive(struct mpc8xxx_wdt_ddata *ddata)\n {\ndiff --git a/drivers/watchdog/mt7621_wdt.c b/drivers/watchdog/mt7621_wdt.c\nindex db47b131f7806..9e0ebec43c888 100644\n--- a/drivers/watchdog/mt7621_wdt.c\n+++ b/drivers/watchdog/mt7621_wdt.c\n@@ -16,6 +16,7 @@\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/mfd/syscon.h\u003e\n #include \u003clinux/regmap.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define SYSC_RSTSTAT\t\t\t0x38\n #define WDT_RST_CAUSE\t\t\tBIT(1)\n@@ -41,7 +42,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static inline void rt_wdt_w32(void __iomem *base, unsigned int reg, u32 val)\n {\ndiff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c\nindex d9c30e4c80e3f..46a83660f0988 100644\n--- a/drivers/watchdog/mtk_wdt.c\n+++ b/drivers/watchdog/mtk_wdt.c\n@@ -31,6 +31,7 @@\n #include \u003clinux/types.h\u003e\n #include \u003clinux/watchdog.h\u003e\n #include \u003clinux/interrupt.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define WDT_MAX_TIMEOUT\t\t31\n #define WDT_MIN_TIMEOUT\t\t2\n@@ -526,7 +527,7 @@ MODULE_PARM_DESC(timeout, \"Watchdog heartbeat in seconds\");\n \n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n MODULE_LICENSE(\"GPL\");\n MODULE_AUTHOR(\"Matthias Brugger \u003cmatthias.bgg@gmail.com\u003e\");\ndiff --git a/drivers/watchdog/nct6694_wdt.c b/drivers/watchdog/nct6694_wdt.c\nindex bc3689bd4b6bb..169a6736e9ea0 100644\n--- a/drivers/watchdog/nct6694_wdt.c\n+++ b/drivers/watchdog/nct6694_wdt.c\n@@ -11,6 +11,7 @@\n #include \u003clinux/module.h\u003e\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/slab.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n #define DEVICE_NAME \"nct6694-wdt\"\n@@ -50,7 +51,7 @@ MODULE_PARM_DESC(pretimeout, \"Watchdog pre-timeout in seconds\");\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t\t   __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t   __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n enum {\n \tNCT6694_ACTION_NONE = 0,\ndiff --git a/drivers/watchdog/ni903x_wdt.c b/drivers/watchdog/ni903x_wdt.c\nindex c72a9ee9cb8e1..68b7c485726b2 100644\n--- a/drivers/watchdog/ni903x_wdt.c\n+++ b/drivers/watchdog/ni903x_wdt.c\n@@ -9,6 +9,7 @@\n #include \u003clinux/io.h\u003e\n #include \u003clinux/module.h\u003e\n #include \u003clinux/platform_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n #define NIWD_CONTROL\t0x01\n@@ -46,13 +47,13 @@ static unsigned int timeout;\n module_param(timeout, uint, 0);\n MODULE_PARM_DESC(timeout,\n \t\t \"Watchdog timeout in seconds. (default=\"\n-\t\t __MODULE_STRING(NIWD_DEFAULT_TIMEOUT) \")\");\n+\t\t __stringify(NIWD_DEFAULT_TIMEOUT) \")\");\n \n static int nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, int, S_IRUGO);\n MODULE_PARM_DESC(nowayout,\n \t\t \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static void ni903x_start(struct ni903x_wdt *wdt)\n {\ndiff --git a/drivers/watchdog/nic7018_wdt.c b/drivers/watchdog/nic7018_wdt.c\nindex 8169423801f06..2b122ba8733a5 100644\n--- a/drivers/watchdog/nic7018_wdt.c\n+++ b/drivers/watchdog/nic7018_wdt.c\n@@ -8,6 +8,7 @@\n #include \u003clinux/io.h\u003e\n #include \u003clinux/module.h\u003e\n #include \u003clinux/platform_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/types.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n@@ -34,13 +35,13 @@ static unsigned int timeout;\n module_param(timeout, uint, 0);\n MODULE_PARM_DESC(timeout,\n \t\t \"Watchdog timeout in seconds. (default=\"\n-\t\t __MODULE_STRING(WDT_DEFAULT_TIMEOUT) \")\");\n+\t\t __stringify(WDT_DEFAULT_TIMEOUT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t \"Watchdog cannot be stopped once started. (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n struct nic7018_wdt {\n \tu16 io_base;\ndiff --git a/drivers/watchdog/nv_tco.c b/drivers/watchdog/nv_tco.c\nindex f16cee5173d50..0d671b8bb3914 100644\n--- a/drivers/watchdog/nv_tco.c\n+++ b/drivers/watchdog/nv_tco.c\n@@ -32,6 +32,7 @@\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/uaccess.h\u003e\n #include \u003clinux/io.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #include \"nv_tco.h\"\n \n@@ -55,12 +56,12 @@ static struct platform_device *nv_tco_platform_device;\n static int heartbeat = WATCHDOG_HEARTBEAT;  /* in seconds */\n module_param(heartbeat, int, 0);\n MODULE_PARM_DESC(heartbeat, \"Watchdog heartbeat in seconds. (2\u003cheartbeat\u003c39, \"\n-\t\t\t    \"default=\" __MODULE_STRING(WATCHDOG_HEARTBEAT) \")\");\n+\t\t\t    \"default=\" __stringify(WATCHDOG_HEARTBEAT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started\"\n-\t\t\" (default=\" __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\" (default=\" __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n /*\n  * Some TCO specific functions\ndiff --git a/drivers/watchdog/octeon-wdt-main.c b/drivers/watchdog/octeon-wdt-main.c\nindex 0615bb8160821..171b46d780e6f 100644\n--- a/drivers/watchdog/octeon-wdt-main.c\n+++ b/drivers/watchdog/octeon-wdt-main.c\n@@ -55,6 +55,7 @@\n #include \u003clinux/cpu.h\u003e\n #include \u003clinux/irq.h\u003e\n #include \u003clinux/irqdomain.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #include \u003casm/mipsregs.h\u003e\n #include \u003casm/uasm.h\u003e\n@@ -93,13 +94,13 @@ static int heartbeat = WD_TIMO;\n module_param(heartbeat, int, 0444);\n MODULE_PARM_DESC(heartbeat,\n \t\"Watchdog heartbeat in seconds. (0 \u003c heartbeat, default=\"\n-\t\t\t\t__MODULE_STRING(WD_TIMO) \")\");\n+\t\t\t\t__stringify(WD_TIMO) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0444);\n MODULE_PARM_DESC(nowayout,\n \t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static int disable;\n module_param(disable, int, 0444);\ndiff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c\nindex 95c7e44b7baac..2a6de73e6f0b3 100644\n--- a/drivers/watchdog/omap_wdt.c\n+++ b/drivers/watchdog/omap_wdt.c\n@@ -38,6 +38,7 @@\n #include \u003clinux/io.h\u003e\n #include \u003clinux/slab.h\u003e\n #include \u003clinux/pm_runtime.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/platform_data/omap-wd-timer.h\u003e\n \n #include \"omap_wdt.h\"\n@@ -45,7 +46,7 @@\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started \"\n-\t\"(default=\" __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\"(default=\" __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static unsigned timer_margin;\n module_param(timer_margin, uint, 0);\ndiff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c\nindex 0ea946823b0a7..5d56e93f04064 100644\n--- a/drivers/watchdog/orion_wdt.c\n+++ b/drivers/watchdog/orion_wdt.c\n@@ -22,6 +22,7 @@\n #include \u003clinux/err.h\u003e\n #include \u003clinux/of.h\u003e\n #include \u003clinux/of_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n /* RSTOUT mask register physical address for Orion5x, Kirkwood and Dove */\n #define ORION_RSTOUT_MASK_OFFSET\t0x20108\n@@ -687,7 +688,7 @@ MODULE_PARM_DESC(heartbeat, \"Initial watchdog heartbeat in seconds\");\n \n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n MODULE_LICENSE(\"GPL v2\");\n MODULE_ALIAS(\"platform:orion_wdt\");\ndiff --git a/drivers/watchdog/pc87413_wdt.c b/drivers/watchdog/pc87413_wdt.c\nindex fbf835d112b84..29dab0e669bfb 100644\n--- a/drivers/watchdog/pc87413_wdt.c\n+++ b/drivers/watchdog/pc87413_wdt.c\n@@ -30,6 +30,7 @@\n #include \u003clinux/moduleparam.h\u003e\n #include \u003clinux/io.h\u003e\n #include \u003clinux/uaccess.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n \n /* #define DEBUG 1 */\n@@ -577,15 +578,15 @@ MODULE_LICENSE(\"GPL\");\n \n module_param_hw(io, int, ioport, 0);\n MODULE_PARM_DESC(io, MODNAME \" I/O port (default: \"\n-\t\t\t\t\t__MODULE_STRING(IO_DEFAULT) \").\");\n+\t\t\t\t\t__stringify(IO_DEFAULT) \").\");\n \n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout,\n \t\t\"Watchdog timeout in minutes (default=\"\n-\t\t\t\t__MODULE_STRING(DEFAULT_TIMEOUT) \").\");\n+\t\t\t\t__stringify(DEFAULT_TIMEOUT) \").\");\n \n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \ndiff --git a/drivers/watchdog/pcwd.c b/drivers/watchdog/pcwd.c\nindex d4ea7d6ccd6a7..3370a91552766 100644\n--- a/drivers/watchdog/pcwd.c\n+++ b/drivers/watchdog/pcwd.c\n@@ -72,6 +72,7 @@\n #include \u003clinux/spinlock.h\u003e\t/* For spin_lock/spin_unlock/... */\n #include \u003clinux/uaccess.h\u003e\t/* For copy_to_user/put_user/... */\n #include \u003clinux/io.h\u003e\t\t/* For inb/outb/... */\n+#include \u003clinux/stringify.h\u003e\t/* For __stringify */\n \n /* Module and version information */\n #define WATCHDOG_VERSION \"1.20\"\n@@ -203,13 +204,13 @@ static int heartbeat = WATCHDOG_HEARTBEAT;\n module_param(heartbeat, int, 0);\n MODULE_PARM_DESC(heartbeat, \"Watchdog heartbeat in seconds. \"\n \t\"(2 \u003c= heartbeat \u003c= 7200 or 0=delay-time from dip-switches, default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_HEARTBEAT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_HEARTBEAT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n /*\n  *\tInternal functions\ndiff --git a/drivers/watchdog/pcwd_pci.c b/drivers/watchdog/pcwd_pci.c\nindex a489b426f2ba6..377e5a61faef8 100644\n--- a/drivers/watchdog/pcwd_pci.c\n+++ b/drivers/watchdog/pcwd_pci.c\n@@ -47,6 +47,7 @@\n #include \u003clinux/spinlock.h\u003e\t/* For spin_lock/spin_unlock/... */\n #include \u003clinux/uaccess.h\u003e\t/* For copy_to_user/put_user/... */\n #include \u003clinux/io.h\u003e\t\t/* For inb/outb/... */\n+#include \u003clinux/stringify.h\u003e\t/* For __stringify */\n \n /* Module and version information */\n #define WATCHDOG_VERSION \"1.03\"\n@@ -140,12 +141,12 @@ static int heartbeat = WATCHDOG_HEARTBEAT;\n module_param(heartbeat, int, 0);\n MODULE_PARM_DESC(heartbeat, \"Watchdog heartbeat in seconds. \"\n \t\"(0\u003cheartbeat\u003c65536 or 0=delay-time from dip-switches, default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_HEARTBEAT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_HEARTBEAT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n /*\n  *\tInternal functions\ndiff --git a/drivers/watchdog/pcwd_usb.c b/drivers/watchdog/pcwd_usb.c\nindex d7c18c990649a..15511c816add4 100644\n--- a/drivers/watchdog/pcwd_usb.c\n+++ b/drivers/watchdog/pcwd_usb.c\n@@ -39,6 +39,7 @@\n #include \u003clinux/mutex.h\u003e\t/* For mutex locking */\n #include \u003clinux/hid.h\u003e\t\t/* For HID_REQ_SET_REPORT \u0026 HID_DT_REPORT */\n #include \u003clinux/uaccess.h\u003e\t/* For copy_to_user/put_user/... */\n+#include \u003clinux/stringify.h\u003e\t/* For __stringify */\n \n \n /* Module and Version Information */\n@@ -57,12 +58,12 @@ static int heartbeat = WATCHDOG_HEARTBEAT;\n module_param(heartbeat, int, 0);\n MODULE_PARM_DESC(heartbeat, \"Watchdog heartbeat in seconds. \"\n \t\"(0\u003cheartbeat\u003c65536 or 0=delay-time from dip-switches, default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_HEARTBEAT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_HEARTBEAT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n /* The vendor and product id's for the USB-PC Watchdog card */\n #define USB_PCWD_VENDOR_ID\t0x0c98\ndiff --git a/drivers/watchdog/pika_wdt.c b/drivers/watchdog/pika_wdt.c\nindex 87b8988d25206..09fc76aaa0513 100644\n--- a/drivers/watchdog/pika_wdt.c\n+++ b/drivers/watchdog/pika_wdt.c\n@@ -25,6 +25,7 @@\n #include \u003clinux/io.h\u003e\n #include \u003clinux/of.h\u003e\n #include \u003clinux/of_address.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define DRV_NAME \"PIKA-WDT\"\n \n@@ -39,12 +40,12 @@\n static int heartbeat = WDT_HEARTBEAT;\n module_param(heartbeat, int, 0);\n MODULE_PARM_DESC(heartbeat, \"Watchdog heartbeats in seconds. \"\n-\t\"(default = \" __MODULE_STRING(WDT_HEARTBEAT) \")\");\n+\t\"(default = \" __stringify(WDT_HEARTBEAT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started \"\n-\t\"(default=\" __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\"(default=\" __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static struct {\n \tvoid __iomem *fpga;\ndiff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c\nindex 87a44a5675a14..a7c39849cbfdc 100644\n--- a/drivers/watchdog/pnx4008_wdt.c\n+++ b/drivers/watchdog/pnx4008_wdt.c\n@@ -30,6 +30,7 @@\n #include \u003clinux/of.h\u003e\n #include \u003clinux/delay.h\u003e\n #include \u003clinux/reboot.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n /* WatchDog Timer - Chapter 23 Page 207 */\n \n@@ -237,8 +238,8 @@ MODULE_DESCRIPTION(\"PNX4008 Watchdog Driver\");\n module_param(heartbeat, uint, 0);\n MODULE_PARM_DESC(heartbeat,\n \t\t \"Watchdog heartbeat period in seconds from 1 to \"\n-\t\t __MODULE_STRING(MAX_HEARTBEAT) \", default \"\n-\t\t __MODULE_STRING(DEFAULT_HEARTBEAT));\n+\t\t __stringify(MAX_HEARTBEAT) \", default \"\n+\t\t __stringify(DEFAULT_HEARTBEAT));\n \n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\ndiff --git a/drivers/watchdog/pseries-wdt.c b/drivers/watchdog/pseries-wdt.c\nindex e97b943e1d3c5..5f531a03a0fc6 100644\n--- a/drivers/watchdog/pseries-wdt.c\n+++ b/drivers/watchdog/pseries-wdt.c\n@@ -10,6 +10,7 @@\n #include \u003clinux/module.h\u003e\n #include \u003clinux/moduleparam.h\u003e\n #include \u003clinux/platform_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/time64.h\u003e\n #include \u003clinux/watchdog.h\u003e\n #include \u003casm/papr-watchdog.h\u003e\n@@ -26,18 +27,18 @@ static const unsigned long pseries_wdt_action[] = {\n static unsigned int action = WATCHDOG_ACTION;\n module_param(action, uint, 0444);\n MODULE_PARM_DESC(action, \"Action taken when watchdog expires (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_ACTION) \")\");\n+\t\t __stringify(WATCHDOG_ACTION) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0444);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n #define WATCHDOG_TIMEOUT 60\n static unsigned int timeout = WATCHDOG_TIMEOUT;\n module_param(timeout, uint, 0444);\n MODULE_PARM_DESC(timeout, \"Initial watchdog timeout in seconds (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_TIMEOUT) \")\");\n+\t\t __stringify(WATCHDOG_TIMEOUT) \")\");\n \n struct pseries_wdt {\n \tstruct watchdog_device wd;\ndiff --git a/drivers/watchdog/rc32434_wdt.c b/drivers/watchdog/rc32434_wdt.c\nindex 0e5c5c96af58d..5301a93abf55f 100644\n--- a/drivers/watchdog/rc32434_wdt.c\n+++ b/drivers/watchdog/rc32434_wdt.c\n@@ -27,6 +27,7 @@\n #include \u003clinux/spinlock.h\u003e\t\t/* For spin_lock/spin_unlock/... */\n #include \u003clinux/uaccess.h\u003e\t\t/* For copy_to_user/put_user/... */\n #include \u003clinux/io.h\u003e\t\t\t/* For devm_ioremap */\n+#include \u003clinux/stringify.h\u003e\t\t/* For __stringify */\n \n #include \u003casm/mach-rc32434/integ.h\u003e\t/* For the Watchdog registers */\n \n@@ -57,12 +58,12 @@ extern unsigned int idt_cpu_freq;\n static int timeout = WATCHDOG_TIMEOUT;\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout, \"Watchdog timeout value, in seconds (default=\"\n-\t\t__MODULE_STRING(WATCHDOG_TIMEOUT) \")\");\n+\t\t__stringify(WATCHDOG_TIMEOUT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n /* apply or and nand masks to data read from addr and write back */\n #define SET_BITS(addr, or, nand) \\\ndiff --git a/drivers/watchdog/renesas_wdt.c b/drivers/watchdog/renesas_wdt.c\nindex 97bcd32bade52..8c0041ce55521 100644\n--- a/drivers/watchdog/renesas_wdt.c\n+++ b/drivers/watchdog/renesas_wdt.c\n@@ -16,6 +16,7 @@\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/pm_runtime.h\u003e\n #include \u003clinux/smp.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/sys_soc.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n@@ -44,7 +45,7 @@ static const unsigned int clk_divs[] = { 1, 4, 16, 32, 64, 128, 1024, 4096 };\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n struct rwdt_priv {\n \tvoid __iomem *base;\ndiff --git a/drivers/watchdog/rn5t618_wdt.c b/drivers/watchdog/rn5t618_wdt.c\nindex 87d06d210ac9e..14056af36445c 100644\n--- a/drivers/watchdog/rn5t618_wdt.c\n+++ b/drivers/watchdog/rn5t618_wdt.c\n@@ -9,6 +9,7 @@\n #include \u003clinux/mfd/rn5t618.h\u003e\n #include \u003clinux/module.h\u003e\n #include \u003clinux/platform_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n #define DRIVER_NAME \"rn5t618-wdt\"\n@@ -21,7 +22,7 @@ MODULE_PARM_DESC(timeout, \"Initial watchdog timeout in seconds\");\n \n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n struct rn5t618_wdt {\n \tstruct watchdog_device wdt_dev;\ndiff --git a/drivers/watchdog/rt2880_wdt.c b/drivers/watchdog/rt2880_wdt.c\nindex c8edd83bb502e..38f31d302a4b3 100644\n--- a/drivers/watchdog/rt2880_wdt.c\n+++ b/drivers/watchdog/rt2880_wdt.c\n@@ -15,6 +15,7 @@\n #include \u003clinux/watchdog.h\u003e\n #include \u003clinux/moduleparam.h\u003e\n #include \u003clinux/platform_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #include \u003casm/mach-ralink/ralink_regs.h\u003e\n \n@@ -51,7 +52,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t\"Watchdog cannot be stopped once started (default=\"\n-\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static inline void rt_wdt_w32(void __iomem *base, unsigned int reg, u32 val)\n {\ndiff --git a/drivers/watchdog/rti_wdt.c b/drivers/watchdog/rti_wdt.c\nindex 7c1bd83b056a8..6a64adbe1a8ea 100644\n--- a/drivers/watchdog/rti_wdt.c\n+++ b/drivers/watchdog/rti_wdt.c\n@@ -17,6 +17,7 @@\n #include \u003clinux/of_reserved_mem.h\u003e\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/pm_runtime.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/types.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n@@ -414,8 +415,8 @@ MODULE_DESCRIPTION(\"K3 RTI Watchdog Driver\");\n module_param(heartbeat, int, 0);\n MODULE_PARM_DESC(heartbeat,\n \t\t \"Watchdog heartbeat period in seconds from 1 to \"\n-\t\t __MODULE_STRING(MAX_HEARTBEAT) \", default \"\n-\t\t __MODULE_STRING(DEFAULT_HEARTBEAT));\n+\t\t __stringify(MAX_HEARTBEAT) \", default \"\n+\t\t __stringify(DEFAULT_HEARTBEAT));\n \n MODULE_LICENSE(\"GPL\");\n MODULE_ALIAS(\"platform:rti-wdt\");\ndiff --git a/drivers/watchdog/rzg2l_wdt.c b/drivers/watchdog/rzg2l_wdt.c\nindex 509f9dffdacde..592ea7ce6d69a 100644\n--- a/drivers/watchdog/rzg2l_wdt.c\n+++ b/drivers/watchdog/rzg2l_wdt.c\n@@ -14,6 +14,7 @@\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/pm_domain.h\u003e\n #include \u003clinux/pm_runtime.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/reset.h\u003e\n #include \u003clinux/units.h\u003e\n #include \u003clinux/watchdog.h\u003e\n@@ -41,7 +42,7 @@\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n enum rz_wdt_type {\n \tWDT_RZG2L,\ndiff --git a/drivers/watchdog/rzv2h_wdt.c b/drivers/watchdog/rzv2h_wdt.c\nindex 83540dd9a37b6..a8db85e85c73a 100644\n--- a/drivers/watchdog/rzv2h_wdt.c\n+++ b/drivers/watchdog/rzv2h_wdt.c\n@@ -13,6 +13,7 @@\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/pm_runtime.h\u003e\n #include \u003clinux/reset.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/units.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n@@ -48,7 +49,7 @@\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n enum rzv2h_wdt_count_source {\n \tCOUNT_SOURCE_LOCO,\ndiff --git a/drivers/watchdog/s32g_wdt.c b/drivers/watchdog/s32g_wdt.c\nindex 6422a694fc65f..bd8740153c17f 100644\n--- a/drivers/watchdog/s32g_wdt.c\n+++ b/drivers/watchdog/s32g_wdt.c\n@@ -13,6 +13,7 @@\n #include \u003clinux/moduleparam.h\u003e\n #include \u003clinux/of.h\u003e\n #include \u003clinux/platform_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n #define DRIVER_NAME \"s32g-swt\"\n@@ -42,12 +43,12 @@ struct s32g_wdt_device {\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static unsigned int timeout_param = S32G_WDT_DEFAULT_TIMEOUT;\n module_param(timeout_param, uint, 0);\n MODULE_PARM_DESC(timeout_param, \"Watchdog timeout in seconds (default=\"\n-\t\t __MODULE_STRING(S32G_WDT_DEFAULT_TIMEOUT) \")\");\n+\t\t __stringify(S32G_WDT_DEFAULT_TIMEOUT) \")\");\n \n static bool early_enable;\n module_param(early_enable, bool, 0);\ndiff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c\nindex e31f93db05096..8ae60b919c120 100644\n--- a/drivers/watchdog/s3c2410_wdt.c\n+++ b/drivers/watchdog/s3c2410_wdt.c\n@@ -28,6 +28,7 @@\n #include \u003clinux/regmap.h\u003e\n #include \u003clinux/delay.h\u003e\n #include \u003clinux/math64.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define S3C2410_WTCON\t\t0x00\n #define S3C2410_WTDAT\t\t0x04\n@@ -154,12 +155,12 @@ module_param(nowayout,   bool, 0);\n module_param(soft_noboot, int, 0);\n \n MODULE_PARM_DESC(tmr_margin, \"Watchdog tmr_margin in seconds. (default=\"\n-\t\t__MODULE_STRING(S3C2410_WATCHDOG_DEFAULT_TIME) \")\");\n+\t\t__stringify(S3C2410_WATCHDOG_DEFAULT_TIME) \")\");\n MODULE_PARM_DESC(tmr_atboot,\n \t\t\"Watchdog is started at boot time if set to 1, default=\"\n-\t\t\t__MODULE_STRING(S3C2410_WATCHDOG_ATBOOT));\n+\t\t\t__stringify(S3C2410_WATCHDOG_ATBOOT));\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n MODULE_PARM_DESC(soft_noboot, \"Watchdog action, set to 1 to ignore reboots, 0 to reboot (default 0)\");\n \n /**\ndiff --git a/drivers/watchdog/sama5d4_wdt.c b/drivers/watchdog/sama5d4_wdt.c\nindex ecdd9aeab79cc..85efe4db40f0b 100644\n--- a/drivers/watchdog/sama5d4_wdt.c\n+++ b/drivers/watchdog/sama5d4_wdt.c\n@@ -14,6 +14,7 @@\n #include \u003clinux/of_irq.h\u003e\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/reboot.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n #include \"at91sam9_wdt.h\"\n@@ -42,12 +43,12 @@ static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(wdt_timeout, int, 0);\n MODULE_PARM_DESC(wdt_timeout,\n \t\"Watchdog timeout in seconds. (default = \"\n-\t__MODULE_STRING(WDT_DEFAULT_TIMEOUT) \")\");\n+\t__stringify(WDT_DEFAULT_TIMEOUT) \")\");\n \n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\"Watchdog cannot be stopped once started (default=\"\n-\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static inline bool wdt_enabled(struct sama5d4_wdt *wdt)\n {\ndiff --git a/drivers/watchdog/sbc60xxwdt.c b/drivers/watchdog/sbc60xxwdt.c\nindex 03eaf48c8f0f1..fffe58dcbf934 100644\n--- a/drivers/watchdog/sbc60xxwdt.c\n+++ b/drivers/watchdog/sbc60xxwdt.c\n@@ -58,6 +58,7 @@\n #include \u003clinux/init.h\u003e\n #include \u003clinux/io.h\u003e\n #include \u003clinux/uaccess.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n \n #define OUR_NAME \"sbc60xxwdt\"\n@@ -98,13 +99,13 @@ static int timeout = WATCHDOG_TIMEOUT;\t/* in seconds, multiplied by HZ to\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout,\n \t\"Watchdog timeout in seconds. (1\u003c=timeout\u003c=3600, default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_TIMEOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_TIMEOUT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static void wdt_timer_ping(struct timer_list *);\n static DEFINE_TIMER(timer, wdt_timer_ping);\ndiff --git a/drivers/watchdog/sbc7240_wdt.c b/drivers/watchdog/sbc7240_wdt.c\nindex 21a1f0b32070b..077abbdbf5828 100644\n--- a/drivers/watchdog/sbc7240_wdt.c\n+++ b/drivers/watchdog/sbc7240_wdt.c\n@@ -23,6 +23,7 @@\n #include \u003clinux/io.h\u003e\n #include \u003clinux/uaccess.h\u003e\n #include \u003clinux/atomic.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define SBC7240_ENABLE_PORT\t\t0x443\n #define SBC7240_DISABLE_PORT\t\t0x043\n@@ -34,8 +35,8 @@\n static int timeout = SBC7240_TIMEOUT;\t/* in seconds */\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout, \"Watchdog timeout in seconds. (1\u003c=timeout\u003c=\"\n-\t\t __MODULE_STRING(SBC7240_MAX_TIMEOUT) \", default=\"\n-\t\t __MODULE_STRING(SBC7240_TIMEOUT) \")\");\n+\t\t __stringify(SBC7240_MAX_TIMEOUT) \", default=\"\n+\t\t __stringify(SBC7240_TIMEOUT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\ndiff --git a/drivers/watchdog/sbc8360.c b/drivers/watchdog/sbc8360.c\nindex a9fd1615b4c38..dafef1df97191 100644\n--- a/drivers/watchdog/sbc8360.c\n+++ b/drivers/watchdog/sbc8360.c\n@@ -48,6 +48,7 @@\n #include \u003clinux/moduleparam.h\u003e\n #include \u003clinux/io.h\u003e\n #include \u003clinux/uaccess.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n \n static unsigned long sbc8360_is_open;\n@@ -199,7 +200,7 @@ MODULE_PARM_DESC(timeout, \"Index into timeout table (0-63) (default=27 (60s))\");\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t \"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n /*\n  *\tKernel methods.\ndiff --git a/drivers/watchdog/sbc_epx_c3.c b/drivers/watchdog/sbc_epx_c3.c\nindex 1d291dc0a4a69..b17bd1db7b103 100644\n--- a/drivers/watchdog/sbc_epx_c3.c\n+++ b/drivers/watchdog/sbc_epx_c3.c\n@@ -25,6 +25,7 @@\n #include \u003clinux/ioport.h\u003e\n #include \u003clinux/uaccess.h\u003e\n #include \u003clinux/io.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n static int epx_c3_alive;\n \n@@ -33,7 +34,7 @@ static int epx_c3_alive;\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n #define EPXC3_WATCHDOG_CTL_REG 0x1ee /* write 1 to enable, 0 to disable */\n #define EPXC3_WATCHDOG_PET_REG 0x1ef /* write anything to pet once enabled */\ndiff --git a/drivers/watchdog/sbsa_gwdt.c b/drivers/watchdog/sbsa_gwdt.c\nindex e04d42cc7774d..3d271b1efb560 100644\n--- a/drivers/watchdog/sbsa_gwdt.c\n+++ b/drivers/watchdog/sbsa_gwdt.c\n@@ -46,6 +46,7 @@\n #include \u003clinux/module.h\u003e\n #include \u003clinux/moduleparam.h\u003e\n #include \u003clinux/platform_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/uaccess.h\u003e\n #include \u003clinux/watchdog.h\u003e\n #include \u003casm/arch_timer.h\u003e\n@@ -103,7 +104,7 @@ static unsigned int timeout;\n module_param(timeout, uint, 0);\n MODULE_PARM_DESC(timeout,\n \t\t \"Watchdog timeout in seconds. (\u003e=0, default=\"\n-\t\t __MODULE_STRING(DEFAULT_TIMEOUT) \")\");\n+\t\t __stringify(DEFAULT_TIMEOUT) \")\");\n \n /*\n  * action refers to action taken when watchdog gets WS0\n@@ -120,7 +121,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, S_IRUGO);\n MODULE_PARM_DESC(nowayout,\n \t\t \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n /*\n  * Arm Base System Architecture 1.0 introduces watchdog v1 which\ndiff --git a/drivers/watchdog/sc1200wdt.c b/drivers/watchdog/sc1200wdt.c\nindex 1d3300c98d43e..34cd57420c86d 100644\n--- a/drivers/watchdog/sc1200wdt.c\n+++ b/drivers/watchdog/sc1200wdt.c\n@@ -42,6 +42,7 @@\n #include \u003clinux/semaphore.h\u003e\n #include \u003clinux/io.h\u003e\n #include \u003clinux/uaccess.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define SC1200_MODULE_VER\t\"build 20020303\"\n #define SC1200_MODULE_NAME\t\"sc1200wdt\"\n@@ -92,7 +93,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n \n \ndiff --git a/drivers/watchdog/sch311x_wdt.c b/drivers/watchdog/sch311x_wdt.c\nindex 9670a1ea57cbd..a2a0b5c2b55b7 100644\n--- a/drivers/watchdog/sch311x_wdt.c\n+++ b/drivers/watchdog/sch311x_wdt.c\n@@ -31,6 +31,7 @@\n #include \u003clinux/spinlock.h\u003e\t\t/* For spin_lock/spin_unlock/... */\n #include \u003clinux/uaccess.h\u003e\t\t/* For copy_to_user/put_user/... */\n #include \u003clinux/io.h\u003e\t\t\t/* For inb/outb/... */\n+#include \u003clinux/stringify.h\u003e\t\t/* For __stringify */\n \n /* Module and version information */\n #define DRV_NAME\t\"sch311x_wdt\"\n@@ -68,13 +69,13 @@ static int timeout = WATCHDOG_TIMEOUT;\t/* in seconds */\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout,\n \t\"Watchdog timeout in seconds. 1\u003c= timeout \u003c=15300, default=\"\n-\t\t__MODULE_STRING(WATCHDOG_TIMEOUT) \".\");\n+\t\t__stringify(WATCHDOG_TIMEOUT) \".\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\"Watchdog cannot be stopped once started (default=\"\n-\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n /*\n  *\tSuper-IO functions\ndiff --git a/drivers/watchdog/shwdt.c b/drivers/watchdog/shwdt.c\nindex 719f100aae60d..8adecf54b9bc8 100644\n--- a/drivers/watchdog/shwdt.c\n+++ b/drivers/watchdog/shwdt.c\n@@ -30,6 +30,7 @@\n #include \u003clinux/io.h\u003e\n #include \u003clinux/clk.h\u003e\n #include \u003clinux/err.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003casm/watchdog.h\u003e\n \n #define DRV_NAME \"sh-wdt\"\n@@ -329,14 +330,14 @@ MODULE_ALIAS(\"platform:\" DRV_NAME);\n module_param(clock_division_ratio, int, 0);\n MODULE_PARM_DESC(clock_division_ratio,\n \t\"Clock division ratio. Valid ranges are from 0x5 (1.31ms) \"\n-\t\"to 0x7 (5.25ms). (default=\" __MODULE_STRING(WTCSR_CKS_4096) \")\");\n+\t\"to 0x7 (5.25ms). (default=\" __stringify(WTCSR_CKS_4096) \")\");\n \n module_param(heartbeat, int, 0);\n MODULE_PARM_DESC(heartbeat,\n \t\"Watchdog heartbeat in seconds. (1 \u003c= heartbeat \u003c= 3600, default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_HEARTBEAT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_HEARTBEAT) \")\");\n \n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\ndiff --git a/drivers/watchdog/simatic-ipc-wdt.c b/drivers/watchdog/simatic-ipc-wdt.c\nindex 1e91f0a560ffc..addeecccf2e9b 100644\n--- a/drivers/watchdog/simatic-ipc-wdt.c\n+++ b/drivers/watchdog/simatic-ipc-wdt.c\n@@ -22,6 +22,7 @@\n #include \u003clinux/sizes.h\u003e\n #include \u003clinux/util_macros.h\u003e\n #include \u003clinux/watchdog.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define WD_ENABLE_IOADR\t\t\t0x62\n #define WD_TRIGGER_IOADR\t\t0x66\n@@ -42,7 +43,7 @@\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0000);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static struct resource gp_status_reg_227e_res =\n \tDEFINE_RES_IO_NAMED(GP_STATUS_REG_227E, SZ_1, KBUILD_MODNAME);\ndiff --git a/drivers/watchdog/sl28cpld_wdt.c b/drivers/watchdog/sl28cpld_wdt.c\nindex c0b5e5fff5d7a..e32b757372eb6 100644\n--- a/drivers/watchdog/sl28cpld_wdt.c\n+++ b/drivers/watchdog/sl28cpld_wdt.c\n@@ -10,6 +10,7 @@\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/property.h\u003e\n #include \u003clinux/regmap.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n /*\n@@ -30,7 +31,7 @@\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static int timeout;\n module_param(timeout, int, 0);\ndiff --git a/drivers/watchdog/smsc37b787_wdt.c b/drivers/watchdog/smsc37b787_wdt.c\nindex 9f2c2ab4e2f15..0ee36ae3113e0 100644\n--- a/drivers/watchdog/smsc37b787_wdt.c\n+++ b/drivers/watchdog/smsc37b787_wdt.c\n@@ -55,6 +55,7 @@\n #include \u003clinux/spinlock.h\u003e\n #include \u003clinux/io.h\u003e\n #include \u003clinux/uaccess.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n \n /* enable support for minutes as units? */\n@@ -611,4 +612,4 @@ MODULE_PARM_DESC(timeout, \"range is 1-255 units, default is 60\");\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\ndiff --git a/drivers/watchdog/softdog.c b/drivers/watchdog/softdog.c\nindex 0820e35ad2e3c..0ff125958b8a2 100644\n--- a/drivers/watchdog/softdog.c\n+++ b/drivers/watchdog/softdog.c\n@@ -24,6 +24,7 @@\n #include \u003clinux/module.h\u003e\n #include \u003clinux/moduleparam.h\u003e\n #include \u003clinux/reboot.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/types.h\u003e\n #include \u003clinux/watchdog.h\u003e\n #include \u003clinux/workqueue.h\u003e\n@@ -33,13 +34,13 @@ static unsigned int soft_margin = TIMER_MARGIN;\t/* in seconds */\n module_param(soft_margin, uint, 0);\n MODULE_PARM_DESC(soft_margin,\n \t\"Watchdog soft_margin in seconds. (0 \u003c soft_margin \u003c 65536, default=\"\n-\t\t\t\t\t__MODULE_STRING(TIMER_MARGIN) \")\");\n+\t\t\t\t\t__stringify(TIMER_MARGIN) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static int soft_noboot;\n module_param(soft_noboot, int, 0);\ndiff --git a/drivers/watchdog/sp5100_tco.c b/drivers/watchdog/sp5100_tco.c\nindex 72ad59649ccc4..c4809858a6fe3 100644\n--- a/drivers/watchdog/sp5100_tco.c\n+++ b/drivers/watchdog/sp5100_tco.c\n@@ -39,6 +39,7 @@\n #include \u003clinux/moduleparam.h\u003e\n #include \u003clinux/pci.h\u003e\n #include \u003clinux/platform_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/types.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n@@ -69,18 +70,18 @@ static struct pci_dev *sp5100_tco_pci;\n static bool action = WATCHDOG_ACTION;\n module_param(action, bool, 0);\n MODULE_PARM_DESC(action, \"Action taken when watchdog expires, 0 to reset, 1 to poweroff (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_ACTION) \")\");\n+\t\t __stringify(WATCHDOG_ACTION) \")\");\n \n #define WATCHDOG_HEARTBEAT 60\t/* 60 sec default heartbeat. */\n static int heartbeat = WATCHDOG_HEARTBEAT;  /* in seconds */\n module_param(heartbeat, int, 0);\n MODULE_PARM_DESC(heartbeat, \"Watchdog heartbeat in seconds. (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_HEARTBEAT) \")\");\n+\t\t __stringify(WATCHDOG_HEARTBEAT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started.\"\n-\t\t\" (default=\" __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\" (default=\" __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n /*\n  * Some TCO specific functions\ndiff --git a/drivers/watchdog/starfive-wdt.c b/drivers/watchdog/starfive-wdt.c\nindex 5a3254c83d3bb..044b4fdb73505 100644\n--- a/drivers/watchdog/starfive-wdt.c\n+++ b/drivers/watchdog/starfive-wdt.c\n@@ -12,6 +12,7 @@\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/pm_runtime.h\u003e\n #include \u003clinux/reset.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n /* JH7100 Watchdog register define */\n@@ -72,12 +73,12 @@ module_param(early_enable, bool, 0);\n module_param(nowayout, bool, 0);\n \n MODULE_PARM_DESC(heartbeat, \"Watchdog heartbeat in seconds. (default=\"\n-\t\t __MODULE_STRING(STARFIVE_WDT_DEFAULT_TIME) \")\");\n+\t\t __stringify(STARFIVE_WDT_DEFAULT_TIME) \")\");\n MODULE_PARM_DESC(early_enable,\n \t\t \"Watchdog is started at boot time if set to 1, default=\"\n-\t\t __MODULE_STRING(STARFIVE_WDT_EARLY_ENA));\n+\t\t __stringify(STARFIVE_WDT_EARLY_ENA));\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n struct starfive_wdt_variant {\n \tunsigned int control;\t\t/* Watchdog Control Register for reset enable */\ndiff --git a/drivers/watchdog/stmp3xxx_rtc_wdt.c b/drivers/watchdog/stmp3xxx_rtc_wdt.c\nindex 060447101f486..c9cbf9728a2ae 100644\n--- a/drivers/watchdog/stmp3xxx_rtc_wdt.c\n+++ b/drivers/watchdog/stmp3xxx_rtc_wdt.c\n@@ -13,6 +13,7 @@\n #include \u003clinux/stmp3xxx_rtc_wdt.h\u003e\n #include \u003clinux/notifier.h\u003e\n #include \u003clinux/reboot.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define WDOG_TICK_RATE 1000 /* 1 kHz clock */\n #define STMP3XXX_DEFAULT_TIMEOUT 19\n@@ -21,8 +22,8 @@\n static int heartbeat = STMP3XXX_DEFAULT_TIMEOUT;\n module_param(heartbeat, uint, 0);\n MODULE_PARM_DESC(heartbeat, \"Watchdog heartbeat period in seconds from 1 to \"\n-\t\t __MODULE_STRING(STMP3XXX_MAX_TIMEOUT) \", default \"\n-\t\t __MODULE_STRING(STMP3XXX_DEFAULT_TIMEOUT));\n+\t\t __stringify(STMP3XXX_MAX_TIMEOUT) \", default \"\n+\t\t __stringify(STMP3XXX_DEFAULT_TIMEOUT));\n \n static int wdt_start(struct watchdog_device *wdd)\n {\ndiff --git a/drivers/watchdog/stpmic1_wdt.c b/drivers/watchdog/stpmic1_wdt.c\nindex 45d0c543466fd..17f0cdecd22c3 100644\n--- a/drivers/watchdog/stpmic1_wdt.c\n+++ b/drivers/watchdog/stpmic1_wdt.c\n@@ -9,6 +9,7 @@\n #include \u003clinux/of.h\u003e\n #include \u003clinux/regmap.h\u003e\n #include \u003clinux/slab.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n /* WATCHDOG CONTROL REGISTER bit */\n@@ -25,7 +26,7 @@\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n struct stpmic1_wdt {\n \tstruct stpmic1 *pmic;\ndiff --git a/drivers/watchdog/sun4v_wdt.c b/drivers/watchdog/sun4v_wdt.c\nindex 8db86ad5ee3df..ad56d778776e7 100644\n--- a/drivers/watchdog/sun4v_wdt.c\n+++ b/drivers/watchdog/sun4v_wdt.c\n@@ -15,6 +15,7 @@\n #include \u003clinux/kernel.h\u003e\n #include \u003clinux/module.h\u003e\n #include \u003clinux/moduleparam.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n #include \u003casm/hypervisor.h\u003e\n #include \u003casm/mdesc.h\u003e\n@@ -27,12 +28,12 @@\n static unsigned int timeout;\n module_param(timeout, uint, 0);\n MODULE_PARM_DESC(timeout, \"Watchdog timeout in seconds (default=\"\n-\t__MODULE_STRING(WDT_TIMEOUT) \")\");\n+\t__stringify(WDT_TIMEOUT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, S_IRUGO);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static int sun4v_wdt_stop(struct watchdog_device *wdd)\n {\ndiff --git a/drivers/watchdog/sunplus_wdt.c b/drivers/watchdog/sunplus_wdt.c\nindex ae0c11a15a051..f2e45907d882c 100644\n--- a/drivers/watchdog/sunplus_wdt.c\n+++ b/drivers/watchdog/sunplus_wdt.c\n@@ -11,6 +11,7 @@\n #include \u003clinux/module.h\u003e\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/reset.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n #define WDT_CTRL\t\t0x00\n@@ -38,7 +39,7 @@ MODULE_PARM_DESC(timeout, \"Watchdog timeout in seconds\");\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n struct sp_wdt_priv {\n \tstruct watchdog_device wdev;\ndiff --git a/drivers/watchdog/sunxi_wdt.c b/drivers/watchdog/sunxi_wdt.c\nindex 3db34524ed13b..1e55c5fd43b8a 100644\n--- a/drivers/watchdog/sunxi_wdt.c\n+++ b/drivers/watchdog/sunxi_wdt.c\n@@ -20,6 +20,7 @@\n #include \u003clinux/of.h\u003e\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/types.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n #define WDT_MAX_TIMEOUT         16\n@@ -357,7 +358,7 @@ MODULE_PARM_DESC(timeout, \"Watchdog heartbeat in seconds\");\n \n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started \"\n-\t\t\"(default=\" __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\"(default=\" __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n MODULE_LICENSE(\"GPL\");\n MODULE_AUTHOR(\"Carlo Caione \u003ccarlo.caione@gmail.com\u003e\");\ndiff --git a/drivers/watchdog/tegra_wdt.c b/drivers/watchdog/tegra_wdt.c\nindex d5de6c0657a55..6b3f65c4d593b 100644\n--- a/drivers/watchdog/tegra_wdt.c\n+++ b/drivers/watchdog/tegra_wdt.c\n@@ -9,6 +9,7 @@\n #include \u003clinux/io.h\u003e\n #include \u003clinux/of.h\u003e\n #include \u003clinux/platform_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n /* minimum and maximum watchdog trigger timeout, in seconds */\n@@ -67,13 +68,13 @@ static int heartbeat = WDT_HEARTBEAT;\n module_param(heartbeat, int, 0);\n MODULE_PARM_DESC(heartbeat,\n \t\"Watchdog heartbeats in seconds. (default = \"\n-\t__MODULE_STRING(WDT_HEARTBEAT) \")\");\n+\t__stringify(WDT_HEARTBEAT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\"Watchdog cannot be stopped once started (default=\"\n-\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static int tegra_wdt_start(struct watchdog_device *wdd)\n {\ndiff --git a/drivers/watchdog/tqmx86_wdt.c b/drivers/watchdog/tqmx86_wdt.c\nindex 83860e94ce9d7..1da45a3f8cf3f 100644\n--- a/drivers/watchdog/tqmx86_wdt.c\n+++ b/drivers/watchdog/tqmx86_wdt.c\n@@ -14,6 +14,7 @@\n #include \u003clinux/module.h\u003e\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/timer.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n /* default timeout (secs) */\n@@ -23,7 +24,7 @@ static unsigned int timeout;\n module_param(timeout, uint, 0);\n MODULE_PARM_DESC(timeout,\n \t\"Watchdog timeout in seconds. (1\u003c=timeout\u003c=4096, default=\"\n-\t\t\t\t__MODULE_STRING(WDT_TIMEOUT) \")\");\n+\t\t\t\t__stringify(WDT_TIMEOUT) \")\");\n struct tqmx86_wdt {\n \tstruct watchdog_device wdd;\n \tvoid __iomem *io_base;\ndiff --git a/drivers/watchdog/ts4800_wdt.c b/drivers/watchdog/ts4800_wdt.c\nindex 24b1ad52102e8..1bfc8db323c6a 100644\n--- a/drivers/watchdog/ts4800_wdt.c\n+++ b/drivers/watchdog/ts4800_wdt.c\n@@ -12,13 +12,14 @@\n #include \u003clinux/of.h\u003e\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/regmap.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\"Watchdog cannot be stopped once started (default=\"\n-\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n /* possible feed values */\n #define TS4800_WDT_FEED_2S       0x1\ndiff --git a/drivers/watchdog/twl4030_wdt.c b/drivers/watchdog/twl4030_wdt.c\nindex 69a622646d75c..d5e06dcf74d9a 100644\n--- a/drivers/watchdog/twl4030_wdt.c\n+++ b/drivers/watchdog/twl4030_wdt.c\n@@ -12,13 +12,14 @@\n #include \u003clinux/watchdog.h\u003e\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/mfd/twl.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define TWL4030_WATCHDOG_CFG_REG_OFFS\t0x3\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started \"\n-\t\"(default=\" __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\"(default=\" __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static int twl4030_wdt_write(unsigned char val)\n {\ndiff --git a/drivers/watchdog/txx9wdt.c b/drivers/watchdog/txx9wdt.c\nindex 305349844b4f1..161a779dc74d8 100644\n--- a/drivers/watchdog/txx9wdt.c\n+++ b/drivers/watchdog/txx9wdt.c\n@@ -16,6 +16,7 @@\n #include \u003clinux/clk.h\u003e\n #include \u003clinux/err.h\u003e\n #include \u003clinux/io.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003casm/txx9tmr.h\u003e\n \n #define WD_TIMER_CCD\t7\t\t/* 1/256 */\n@@ -27,14 +28,14 @@ static unsigned int timeout = TIMER_MARGIN;\t/* in seconds */\n module_param(timeout, uint, 0);\n MODULE_PARM_DESC(timeout,\n \t\"Watchdog timeout in seconds. \"\n-\t\"(0\u003ctimeout\u003c((2^\" __MODULE_STRING(TXX9_TIMER_BITS) \")/(IMCLK/256)), \"\n-\t\"default=\" __MODULE_STRING(TIMER_MARGIN) \")\");\n+\t\"(0\u003ctimeout\u003c((2^\" __stringify(TXX9_TIMER_BITS) \")/(IMCLK/256)), \"\n+\t\"default=\" __stringify(TIMER_MARGIN) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\"Watchdog cannot be stopped once started \"\n-\t\"(default=\" __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\"(default=\" __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static struct txx9_tmr_reg __iomem *txx9wdt_reg;\n static struct clk *txx9_imclk;\ndiff --git a/drivers/watchdog/uniphier_wdt.c b/drivers/watchdog/uniphier_wdt.c\nindex 8e9242c230222..d09fb2acfdde3 100644\n--- a/drivers/watchdog/uniphier_wdt.c\n+++ b/drivers/watchdog/uniphier_wdt.c\n@@ -13,6 +13,7 @@\n #include \u003clinux/of.h\u003e\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/regmap.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n /* WDT timer setting register */\n@@ -245,12 +246,12 @@ module_platform_driver(uniphier_wdt_driver);\n module_param(timeout, uint, 0000);\n MODULE_PARM_DESC(timeout,\n \t\"Watchdog timeout seconds in power of 2. (0 \u003c timeout \u003c 128, default=\"\n-\t\t\t\t__MODULE_STRING(WDT_DEFAULT_TIMEOUT) \")\");\n+\t\t\t\t__stringify(WDT_DEFAULT_TIMEOUT) \")\");\n \n module_param(nowayout, bool, 0000);\n MODULE_PARM_DESC(nowayout,\n \t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n MODULE_AUTHOR(\"Keiji Hayashibara \u003chayashibara.keiji@socionext.com\u003e\");\n MODULE_DESCRIPTION(\"UniPhier Watchdog Device Driver\");\ndiff --git a/drivers/watchdog/via_wdt.c b/drivers/watchdog/via_wdt.c\nindex be4ca619da65a..effa9bc8d354d 100644\n--- a/drivers/watchdog/via_wdt.c\n+++ b/drivers/watchdog/via_wdt.c\n@@ -18,6 +18,7 @@\n #include \u003clinux/jiffies.h\u003e\n #include \u003clinux/module.h\u003e\n #include \u003clinux/pci.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/timer.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n@@ -56,12 +57,12 @@\n static int timeout = WDT_TIMEOUT;\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout, \"Watchdog timeout in seconds, between 1 and 1023 \"\n-\t\"(default = \" __MODULE_STRING(WDT_TIMEOUT) \")\");\n+\t\"(default = \" __stringify(WDT_TIMEOUT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started \"\n-\t\"(default = \" __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\"(default = \" __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static struct watchdog_device wdt_dev;\n static struct resource wdt_res;\ndiff --git a/drivers/watchdog/visconti_wdt.c b/drivers/watchdog/visconti_wdt.c\nindex 7795e7fbf67e6..fc4f0d4d3d554 100644\n--- a/drivers/watchdog/visconti_wdt.c\n+++ b/drivers/watchdog/visconti_wdt.c\n@@ -11,6 +11,7 @@\n #include \u003clinux/module.h\u003e\n #include \u003clinux/of.h\u003e\n #include \u003clinux/platform_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n #define WDT_CNT\t\t\t0x00\n@@ -29,7 +30,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(\n \tnowayout,\n-\t\"Watchdog cannot be stopped once started (default=\" __MODULE_STRING(WATCHDOG_NOWAYOUT)\")\");\n+\t\"Watchdog cannot be stopped once started (default=\" __stringify(WATCHDOG_NOWAYOUT)\")\");\n \n struct visconti_wdt_priv {\n \tstruct watchdog_device wdev;\ndiff --git a/drivers/watchdog/w83627hf_wdt.c b/drivers/watchdog/w83627hf_wdt.c\nindex db77599e43a06..5aa4d9c0fc001 100644\n--- a/drivers/watchdog/w83627hf_wdt.c\n+++ b/drivers/watchdog/w83627hf_wdt.c\n@@ -35,6 +35,7 @@\n #include \u003clinux/init.h\u003e\n #include \u003clinux/io.h\u003e\n #include \u003clinux/dmi.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define WATCHDOG_NAME \"w83627hf/thf/hg/dhg WDT\"\n #define WATCHDOG_TIMEOUT 60\t\t/* 60 sec default timeout */\n@@ -55,13 +56,13 @@ static int timeout;\t\t\t/* in seconds */\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout,\n \t\t\"Watchdog timeout in seconds. 1 \u003c= timeout \u003c= 255, default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_TIMEOUT) \".\");\n+\t\t\t\t__stringify(WATCHDOG_TIMEOUT) \".\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static int early_disable;\n module_param(early_disable, int, 0);\ndiff --git a/drivers/watchdog/w83877f_wdt.c b/drivers/watchdog/w83877f_wdt.c\nindex 53db59ef774b8..3187ea9d1b574 100644\n--- a/drivers/watchdog/w83877f_wdt.c\n+++ b/drivers/watchdog/w83877f_wdt.c\n@@ -54,6 +54,7 @@\n #include \u003clinux/init.h\u003e\n #include \u003clinux/io.h\u003e\n #include \u003clinux/uaccess.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define OUR_NAME \"w83877f_wdt\"\n \n@@ -84,14 +85,14 @@ static int timeout = WATCHDOG_TIMEOUT;\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout,\n \t\"Watchdog timeout in seconds. (1\u003c=timeout\u003c=3600, default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_TIMEOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_TIMEOUT) \")\");\n \n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static void wdt_timer_ping(struct timer_list *);\n static DEFINE_TIMER(timer, wdt_timer_ping);\ndiff --git a/drivers/watchdog/w83977f_wdt.c b/drivers/watchdog/w83977f_wdt.c\nindex 3776030fa7c62..019fbf65eeb45 100644\n--- a/drivers/watchdog/w83977f_wdt.c\n+++ b/drivers/watchdog/w83977f_wdt.c\n@@ -25,6 +25,7 @@\n #include \u003clinux/reboot.h\u003e\n #include \u003clinux/uaccess.h\u003e\n #include \u003clinux/io.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n \n #define WATCHDOG_VERSION  \"1.00\"\n@@ -49,7 +50,7 @@ static\tDEFINE_SPINLOCK(spinlock);\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout,\n \t\t\"Watchdog timeout in seconds (15..7635), default=\"\n-\t\t\t\t__MODULE_STRING(DEFAULT_TIMEOUT) \")\");\n+\t\t\t\t__stringify(DEFAULT_TIMEOUT) \")\");\n module_param(testmode, int, 0);\n MODULE_PARM_DESC(testmode, \"Watchdog testmode (1 = no reboot), default=0\");\n \n@@ -57,7 +58,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n /*\n  * Start the watchdog\ndiff --git a/drivers/watchdog/wafer5823wdt.c b/drivers/watchdog/wafer5823wdt.c\nindex 291109349e73a..c564d51fe5a5b 100644\n--- a/drivers/watchdog/wafer5823wdt.c\n+++ b/drivers/watchdog/wafer5823wdt.c\n@@ -36,6 +36,7 @@\n #include \u003clinux/spinlock.h\u003e\n #include \u003clinux/io.h\u003e\n #include \u003clinux/uaccess.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #define WATCHDOG_NAME \"Wafer 5823 WDT\"\n #define PFX WATCHDOG_NAME \": \"\n@@ -61,13 +62,13 @@ static int timeout = WD_TIMO;  /* in seconds */\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout,\n \t\t\"Watchdog timeout in seconds. 1 \u003c= timeout \u003c= 255, default=\"\n-\t\t\t\t__MODULE_STRING(WD_TIMO) \".\");\n+\t\t\t\t__stringify(WD_TIMO) \".\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static void wafwdt_ping(void)\n {\ndiff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c\nindex d7895009a2de3..1e1c3431b0076 100644\n--- a/drivers/watchdog/watchdog_dev.c\n+++ b/drivers/watchdog/watchdog_dev.c\n@@ -44,6 +44,7 @@\n #include \u003clinux/types.h\u003e\t/* For standard types (like size_t) */\n #include \u003clinux/watchdog.h\u003e\t/* For watchdog specific items */\n #include \u003clinux/uaccess.h\u003e\t/* For copy_to_user/put_user/... */\n+#include \u003clinux/stringify.h\u003e\t/* For __stringify */\n \n #include \"watchdog_core.h\"\n #include \"watchdog_pretimeout.h\"\n@@ -1314,9 +1315,9 @@ int watchdog_dev_resume(struct watchdog_device *wdd)\n module_param(handle_boot_enabled, bool, 0444);\n MODULE_PARM_DESC(handle_boot_enabled,\n \t\"Watchdog core auto-updates boot enabled watchdogs before userspace takes over (default=\"\n-\t__MODULE_STRING(IS_ENABLED(CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED)) \")\");\n+\t__stringify(IS_ENABLED(CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED)) \")\");\n \n module_param(open_timeout, uint, 0644);\n MODULE_PARM_DESC(open_timeout,\n \t\"Maximum time (in seconds, 0 means infinity) for userspace to take over a running watchdog (default=\"\n-\t__MODULE_STRING(CONFIG_WATCHDOG_OPEN_TIMEOUT) \")\");\n+\t__stringify(CONFIG_WATCHDOG_OPEN_TIMEOUT) \")\");\ndiff --git a/drivers/watchdog/wdat_wdt.c b/drivers/watchdog/wdat_wdt.c\nindex 55ea16e73652f..a418da46bda2c 100644\n--- a/drivers/watchdog/wdat_wdt.c\n+++ b/drivers/watchdog/wdat_wdt.c\n@@ -13,6 +13,7 @@\n #include \u003clinux/module.h\u003e\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/pm.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n #define MAX_WDAT_ACTIONS ACPI_WDAT_ACTION_RESERVED\n@@ -54,14 +55,14 @@ struct wdat_wdt {\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n #define WDAT_DEFAULT_TIMEOUT\t30\n \n static int timeout = WDAT_DEFAULT_TIMEOUT;\n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout, \"Watchdog timeout in seconds (default=\"\n-\t\t __MODULE_STRING(WDAT_DEFAULT_TIMEOUT) \")\");\n+\t\t __stringify(WDAT_DEFAULT_TIMEOUT) \")\");\n \n static int wdat_wdt_read(struct wdat_wdt *wdat,\n \t const struct wdat_instruction *instr, u32 *value)\ndiff --git a/drivers/watchdog/wdt.c b/drivers/watchdog/wdt.c\nindex 3980d60bacd82..d8681ee547eea 100644\n--- a/drivers/watchdog/wdt.c\n+++ b/drivers/watchdog/wdt.c\n@@ -43,6 +43,7 @@\n #include \u003clinux/init.h\u003e\n #include \u003clinux/io.h\u003e\n #include \u003clinux/uaccess.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #include \"wd501p.h\"\n \n@@ -60,13 +61,13 @@ static int wd_heartbeat;\n module_param(heartbeat, int, 0);\n MODULE_PARM_DESC(heartbeat,\n \t\"Watchdog heartbeat in seconds. (0 \u003c heartbeat \u003c 65536, default=\"\n-\t\t\t\t__MODULE_STRING(WD_TIMO) \")\");\n+\t\t\t\t__stringify(WD_TIMO) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n /* You must set these - there is no sane way to probe for this board. */\n static int io = 0x240;\ndiff --git a/drivers/watchdog/wdt977.c b/drivers/watchdog/wdt977.c\nindex 4f449ac4dda41..f0fb82dc3c93d 100644\n--- a/drivers/watchdog/wdt977.c\n+++ b/drivers/watchdog/wdt977.c\n@@ -34,6 +34,7 @@\n #include \u003clinux/reboot.h\u003e\n #include \u003clinux/io.h\u003e\n #include \u003clinux/uaccess.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #include \u003casm/mach-types.h\u003e\n \n@@ -59,7 +60,7 @@ static\tDEFINE_SPINLOCK(spinlock);\n \n module_param(timeout, int, 0);\n MODULE_PARM_DESC(timeout, \"Watchdog timeout in seconds (60..15300, default=\"\n-\t\t\t\t__MODULE_STRING(DEFAULT_TIMEOUT) \")\");\n+\t\t\t\t__stringify(DEFAULT_TIMEOUT) \")\");\n module_param(testmode, int, 0);\n MODULE_PARM_DESC(testmode, \"Watchdog testmode (1 = no reboot), default=0\");\n \n@@ -67,7 +68,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n /*\n  * Start the watchdog\ndiff --git a/drivers/watchdog/wdt_pci.c b/drivers/watchdog/wdt_pci.c\nindex 3918a600f2a00..4b1ef22d0df28 100644\n--- a/drivers/watchdog/wdt_pci.c\n+++ b/drivers/watchdog/wdt_pci.c\n@@ -49,6 +49,7 @@\n #include \u003clinux/pci.h\u003e\n #include \u003clinux/io.h\u003e\n #include \u003clinux/uaccess.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n \n #define WDT_IS_PCI\n@@ -72,13 +73,13 @@ static int wd_heartbeat;\n module_param(heartbeat, int, 0);\n MODULE_PARM_DESC(heartbeat,\n \t\t\"Watchdog heartbeat in seconds. (0\u003cheartbeat\u003c65536, default=\"\n-\t\t\t\t__MODULE_STRING(WD_TIMO) \")\");\n+\t\t\t\t__stringify(WD_TIMO) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t\"Watchdog cannot be stopped once started (default=\"\n-\t\t\t\t__MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t\t\t__stringify(WATCHDOG_NOWAYOUT) \")\");\n \n /* Support for the Fan Tachometer on the PCI-WDT501 */\n static int tachometer;\ndiff --git a/drivers/watchdog/wm831x_wdt.c b/drivers/watchdog/wm831x_wdt.c\nindex d96ad8f38bd2e..1aeb532dfebae 100644\n--- a/drivers/watchdog/wm831x_wdt.c\n+++ b/drivers/watchdog/wm831x_wdt.c\n@@ -13,6 +13,7 @@\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/watchdog.h\u003e\n #include \u003clinux/uaccess.h\u003e\n+#include \u003clinux/stringify.h\u003e\n \n #include \u003clinux/mfd/wm831x/core.h\u003e\n #include \u003clinux/mfd/wm831x/pdata.h\u003e\n@@ -22,7 +23,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n struct wm831x_wdt_drvdata {\n \tstruct watchdog_device wdt;\ndiff --git a/drivers/watchdog/wm8350_wdt.c b/drivers/watchdog/wm8350_wdt.c\nindex c82c1b77d91b5..5eca195eac188 100644\n--- a/drivers/watchdog/wm8350_wdt.c\n+++ b/drivers/watchdog/wm8350_wdt.c\n@@ -14,13 +14,14 @@\n #include \u003clinux/platform_device.h\u003e\n #include \u003clinux/watchdog.h\u003e\n #include \u003clinux/uaccess.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/mfd/wm8350/core.h\u003e\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout,\n \t\t \"Watchdog cannot be stopped once started (default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static DEFINE_MUTEX(wdt_mutex);\n \ndiff --git a/drivers/watchdog/xen_wdt.c b/drivers/watchdog/xen_wdt.c\nindex b343f421dc72c..3bc323d886d0b 100644\n--- a/drivers/watchdog/xen_wdt.c\n+++ b/drivers/watchdog/xen_wdt.c\n@@ -17,6 +17,7 @@\n #include \u003clinux/module.h\u003e\n #include \u003clinux/moduleparam.h\u003e\n #include \u003clinux/platform_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n #include \u003cxen/xen.h\u003e\n #include \u003casm/xen/hypercall.h\u003e\n@@ -30,12 +31,12 @@ static time64_t wdt_expires;\n static unsigned int timeout;\n module_param(timeout, uint, S_IRUGO);\n MODULE_PARM_DESC(timeout, \"Watchdog timeout in seconds \"\n-\t\"(default=\" __MODULE_STRING(WATCHDOG_TIMEOUT) \")\");\n+\t\"(default=\" __stringify(WATCHDOG_TIMEOUT) \")\");\n \n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, S_IRUGO);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started \"\n-\t\"(default=\" __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\"(default=\" __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static inline time64_t set_timeout(struct watchdog_device *wdd)\n {\ndiff --git a/drivers/watchdog/xilinx_wwdt.c b/drivers/watchdog/xilinx_wwdt.c\nindex 799ce8d22b2f3..b7cdf8140666f 100644\n--- a/drivers/watchdog/xilinx_wwdt.c\n+++ b/drivers/watchdog/xilinx_wwdt.c\n@@ -12,6 +12,7 @@\n #include \u003clinux/math64.h\u003e\n #include \u003clinux/module.h\u003e\n #include \u003clinux/platform_device.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n /* Max timeout is calculated at 100MHz source clock */\n@@ -47,11 +48,11 @@ static int closed_window_percent;\n module_param(wwdt_timeout, int, 0);\n MODULE_PARM_DESC(wwdt_timeout,\n \t\t \"Watchdog time in seconds. (default=\"\n-\t\t __MODULE_STRING(XWWDT_DEFAULT_TIMEOUT) \")\");\n+\t\t __stringify(XWWDT_DEFAULT_TIMEOUT) \")\");\n module_param(closed_window_percent, int, 0);\n MODULE_PARM_DESC(closed_window_percent,\n \t\t \"Watchdog closed window percentage. (default=\"\n-\t\t __MODULE_STRING(XWWDT_CLOSE_WINDOW_PERCENT) \")\");\n+\t\t __stringify(XWWDT_CLOSE_WINDOW_PERCENT) \")\");\n /**\n  * struct xwwdt_device - Watchdog device structure\n  * @base: base io address of WDT device\ndiff --git a/drivers/watchdog/ziirave_wdt.c b/drivers/watchdog/ziirave_wdt.c\nindex f3bb935c08c2e..10d4eaa8592a0 100644\n--- a/drivers/watchdog/ziirave_wdt.c\n+++ b/drivers/watchdog/ziirave_wdt.c\n@@ -18,6 +18,7 @@\n #include \u003clinux/slab.h\u003e\n #include \u003clinux/sysfs.h\u003e\n #include \u003clinux/types.h\u003e\n+#include \u003clinux/stringify.h\u003e\n #include \u003clinux/watchdog.h\u003e\n \n #include \u003clinux/unaligned.h\u003e\n@@ -94,7 +95,7 @@ MODULE_PARM_DESC(reset_duration,\n static bool nowayout = WATCHDOG_NOWAYOUT;\n module_param(nowayout, bool, 0);\n MODULE_PARM_DESC(nowayout, \"Watchdog cannot be stopped once started default=\"\n-\t\t __MODULE_STRING(WATCHDOG_NOWAYOUT) \")\");\n+\t\t __stringify(WATCHDOG_NOWAYOUT) \")\");\n \n static int ziirave_wdt_revision(struct i2c_client *client,\n \t\t\t\tstruct ziirave_wdt_rev *rev, u8 command)\ndiff --git a/include/linux/module.h b/include/linux/module.h\nindex 96cc98568eea5..0d9157a2d487b 100644\n--- a/include/linux/module.h\n+++ b/include/linux/module.h\n@@ -886,10 +886,6 @@ extern const struct kobj_type module_ktype;\n \n #define symbol_request(x) try_then_request_module(symbol_get(x), \"symbol:\" #x)\n \n-/* BELOW HERE ALL THESE ARE OBSOLETE AND WILL VANISH */\n-\n-#define __MODULE_STRING(x) __stringify(x)\n-\n #ifdef CONFIG_GENERIC_BUG\n void module_bug_finalize(const Elf_Ehdr *, const Elf_Shdr *,\n \t\t\t struct module *);\n"
}

Target architecture: amd64

For your convenience, here is the diff of the changes:
commit ca3d3efac47dcf7b3d0ace58513ba6fb59ce1800
Author: syz-cluster <triage@syzkaller.com>
Date:   Thu Sep 24 21:39:07 2026 +0000

    syz-cluster: applied patch under review

diff --git a/drivers/comedi/comedi_fops.c b/drivers/comedi/comedi_fops.c
index c09bbe04be6c1..05d14839c5a6a 100644
--- a/drivers/comedi/comedi_fops.c
+++ b/drivers/comedi/comedi_fops.c
@@ -29,6 +29,7 @@
 #include <linux/io.h>
 #include <linux/uaccess.h>
 #include <linux/compat.h>
+#include <linux/stringify.h>
 
 #include "comedi_internal.h"
 
@@ -82,14 +83,14 @@ unsigned int comedi_default_buf_size_kb = CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB;
 module_param(comedi_default_buf_size_kb, uint, 0644);
 MODULE_PARM_DESC(comedi_default_buf_size_kb,
 		 "default asynchronous buffer size in KiB (default "
-		 __MODULE_STRING(CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB) ")");
+		 __stringify(CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB) ")");
 
 unsigned int comedi_default_buf_maxsize_kb =
 	CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB;
 module_param(comedi_default_buf_maxsize_kb, uint, 0644);
 MODULE_PARM_DESC(comedi_default_buf_maxsize_kb,
 		 "default maximum size of asynchronous buffer in KiB (default "
-		 __MODULE_STRING(CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB) ")");
+		 __stringify(CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB) ")");
 
 static DEFINE_MUTEX(comedi_board_minor_table_lock);
 static struct comedi_device
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index d4664ed468b26..36009bb02c257 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -31,6 +31,7 @@
 
 #include <linux/console.h>
 #include <linux/export.h>
+#include <linux/stringify.h>
 
 #include <drm/drm_atomic.h>
 #include <drm/drm_drv.h>
@@ -54,7 +55,7 @@ static int drm_fbdev_overalloc = CONFIG_DRM_FBDEV_OVERALLOC;
 module_param(drm_fbdev_overalloc, int, 0444);
 MODULE_PARM_DESC(drm_fbdev_overalloc,
 		 "Overallocation of the fbdev buffer (%) [default="
-		 __MODULE_STRING(CONFIG_DRM_FBDEV_OVERALLOC) "]");
+		 __stringify(CONFIG_DRM_FBDEV_OVERALLOC) "]");
 
 /*
  * In order to keep user-space compatibility, we want in certain use-cases
diff --git a/drivers/hwmon/fschmd.c b/drivers/hwmon/fschmd.c
index 019fc32bf3181..df9418a86c835 100644
--- a/drivers/hwmon/fschmd.c
+++ b/drivers/hwmon/fschmd.c
@@ -35,6 +35,7 @@
 #include <linux/miscdevice.h>
 #include <linux/uaccess.h>
 #include <linux/kref.h>
+#include <linux/stringify.h>
 
 /* Addresses to scan */
 static const unsigned short normal_i2c[] = { 0x73, I2C_CLIENT_END };
@@ -43,7 +44,7 @@ static const unsigned short normal_i2c[] = { 0x73, I2C_CLIENT_END };
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
-	__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+	__stringify(WATCHDOG_NOWAYOUT) ")");
 
 enum chips { fscpos, fscher, fscscy, fschrc, fschmd, fschds, fscsyl };
 
diff --git a/drivers/hwmon/nct7904.c b/drivers/hwmon/nct7904.c
index 976b8a008e448..04e1a8e6db37a 100644
--- a/drivers/hwmon/nct7904.c
+++ b/drivers/hwmon/nct7904.c
@@ -23,6 +23,7 @@
 #include <linux/i2c.h>
 #include <linux/hwmon.h>
 #include <linux/watchdog.h>
+#include <linux/stringify.h>
 
 #define VENDOR_ID_REG		0x7A	/* Any bank */
 #define NUVOTON_ID		0x50
@@ -113,12 +114,12 @@
 static int timeout;
 module_param(timeout, int, 0);
 MODULE_PARM_DESC(timeout, "Watchdog timeout in minutes. 1 <= timeout <= 255, default="
-			__MODULE_STRING(WATCHDOG_TIMEOUT) ".");
+			__stringify(WATCHDOG_TIMEOUT) ".");
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
-			__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+			__stringify(WATCHDOG_NOWAYOUT) ")");
 
 static const unsigned short normal_i2c[] = {
 	0x2d, 0x2e, I2C_CLIENT_END
diff --git a/drivers/hwmon/sch56xx-common.c b/drivers/hwmon/sch56xx-common.c
index a385aae3bb0fe..febb8ba7dc2c9 100644
--- a/drivers/hwmon/sch56xx-common.c
+++ b/drivers/hwmon/sch56xx-common.c
@@ -18,13 +18,14 @@
 #include <linux/watchdog.h>
 #include <linux/uaccess.h>
 #include <linux/slab.h>
+#include <linux/stringify.h>
 #include "sch56xx-common.h"
 
 /* Insmod parameters */
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
-	__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+	__stringify(WATCHDOG_NOWAYOUT) ")");
 
 #define SIO_SCH56XX_LD_EM	0x0C	/* Embedded uController Logical Dev */
 #define SIO_UNLOCK_KEY		0x55	/* Key to enable Super-I/O */
diff --git a/drivers/hwmon/w83793.c b/drivers/hwmon/w83793.c
index c6ef04c69856e..e1f2708b5db6a 100644
--- a/drivers/hwmon/w83793.c
+++ b/drivers/hwmon/w83793.c
@@ -34,6 +34,7 @@
 #include <linux/notifier.h>
 #include <linux/reboot.h>
 #include <linux/jiffies.h>
+#include <linux/stringify.h>
 
 /* Default values */
 #define WATCHDOG_TIMEOUT 2	/* 2 minute default timeout */
@@ -57,13 +58,13 @@ static int timeout = WATCHDOG_TIMEOUT;	/* default timeout in minutes */
 module_param(timeout, int, 0);
 MODULE_PARM_DESC(timeout,
 	"Watchdog timeout in minutes. 2<= timeout <=255 (default="
-				__MODULE_STRING(WATCHDOG_TIMEOUT) ")");
+				__stringify(WATCHDOG_TIMEOUT) ")");
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 	"Watchdog cannot be stopped once started (default="
-				__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+				__stringify(WATCHDOG_NOWAYOUT) ")");
 
 /*
  * Address 0x00, 0x0d, 0x0e, 0x0f in all three banks are reserved
diff --git a/drivers/i2c/busses/i2c-kempld.c b/drivers/i2c/busses/i2c-kempld.c
index 9b4c7cba62b64..d0438960c2726 100644
--- a/drivers/i2c/busses/i2c-kempld.c
+++ b/drivers/i2c/busses/i2c-kempld.c
@@ -13,6 +13,7 @@
 #include <linux/i2c.h>
 #include <linux/delay.h>
 #include <linux/mfd/kempld.h>
+#include <linux/stringify.h>
 
 #define KEMPLD_I2C_PRELOW	0x0b
 #define KEMPLD_I2C_PREHIGH	0x0c
@@ -66,7 +67,7 @@ struct kempld_i2c_data {
 static unsigned int bus_frequency = KEMPLD_I2C_FREQ_STD;
 module_param(bus_frequency, uint, 0);
 MODULE_PARM_DESC(bus_frequency, "Set I2C bus frequency in kHz (default="
-				__MODULE_STRING(KEMPLD_I2C_FREQ_STD)")");
+				__stringify(KEMPLD_I2C_FREQ_STD)")");
 
 static int i2c_bus = -1;
 module_param(i2c_bus, int, 0);
diff --git a/drivers/net/ethernet/atheros/atl1e/atl1e_param.c b/drivers/net/ethernet/atheros/atl1e/atl1e_param.c
index 6b1d6df8da97c..ff3423a4dc2e5 100644
--- a/drivers/net/ethernet/atheros/atl1e/atl1e_param.c
+++ b/drivers/net/ethernet/atheros/atl1e/atl1e_param.c
@@ -7,6 +7,7 @@
  */
 
 #include <linux/netdevice.h>
+#include <linux/stringify.h>
 
 #include "atl1e.h"
 
@@ -181,7 +182,7 @@ void atl1e_check_options(struct atl1e_adapter *adapter)
 			.type = range_option,
 			.name = "Transmit Ddescription Count",
 			.err  = "using default of "
-				__MODULE_STRING(ATL1E_DEFAULT_TX_DESC_CNT),
+				__stringify(ATL1E_DEFAULT_TX_DESC_CNT),
 			.def  = ATL1E_DEFAULT_TX_DESC_CNT,
 			.arg  = { .r = { .min = ATL1E_MIN_TX_DESC_CNT,
 					 .max = ATL1E_MAX_TX_DESC_CNT} }
@@ -200,7 +201,7 @@ void atl1e_check_options(struct atl1e_adapter *adapter)
 			.type = range_option,
 			.name = "Memory size of rx buffer(KB)",
 			.err  = "using default of "
-				__MODULE_STRING(ATL1E_DEFAULT_RX_MEM_SIZE),
+				__stringify(ATL1E_DEFAULT_RX_MEM_SIZE),
 			.def  = ATL1E_DEFAULT_RX_MEM_SIZE,
 			.arg  = { .r = { .min = ATL1E_MIN_RX_MEM_SIZE,
 					 .max = ATL1E_MAX_RX_MEM_SIZE} }
@@ -220,7 +221,7 @@ void atl1e_check_options(struct atl1e_adapter *adapter)
 			.type = range_option,
 			.name = "Interrupt Moderate Timer",
 			.err  = "using default of "
-				__MODULE_STRING(INT_MOD_DEFAULT_CNT),
+				__stringify(INT_MOD_DEFAULT_CNT),
 			.def  = INT_MOD_DEFAULT_CNT,
 			.arg  = { .r = { .min = INT_MOD_MIN_CNT,
 					 .max = INT_MOD_MAX_CNT} }
@@ -239,7 +240,7 @@ void atl1e_check_options(struct atl1e_adapter *adapter)
 			.type = range_option,
 			.name = "Speed/Duplex Selection",
 			.err  = "using default of "
-				__MODULE_STRING(MEDIA_TYPE_AUTO_SENSOR),
+				__stringify(MEDIA_TYPE_AUTO_SENSOR),
 			.def  = MEDIA_TYPE_AUTO_SENSOR,
 			.arg  = { .r = { .min = MEDIA_TYPE_AUTO_SENSOR,
 					 .max = MEDIA_TYPE_10M_HALF} }
diff --git a/drivers/net/ethernet/atheros/atlx/atl1.c b/drivers/net/ethernet/atheros/atlx/atl1.c
index 98a4d089270e4..aef5de6287dcf 100644
--- a/drivers/net/ethernet/atheros/atlx/atl1.c
+++ b/drivers/net/ethernet/atheros/atlx/atl1.c
@@ -56,6 +56,7 @@
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/string.h>
+#include <linux/stringify.h>
 #include <linux/tcp.h>
 #include <linux/timer.h>
 #include <linux/types.h>
@@ -198,7 +199,7 @@ static void atl1_check_options(struct atl1_adapter *adapter)
 			.type = range_option,
 			.name = "Interrupt Moderator Timer",
 			.err = "using default of "
-				__MODULE_STRING(DEFAULT_INT_MOD_CNT),
+				__stringify(DEFAULT_INT_MOD_CNT),
 			.def = DEFAULT_INT_MOD_CNT,
 			.arg = {.r = {.min = MIN_INT_MOD_CNT,
 					.max = MAX_INT_MOD_CNT} }
diff --git a/drivers/net/ethernet/atheros/atlx/atl2.c b/drivers/net/ethernet/atheros/atlx/atl2.c
index 5560d5cc31692..853d2e1eb9541 100644
--- a/drivers/net/ethernet/atheros/atlx/atl2.c
+++ b/drivers/net/ethernet/atheros/atlx/atl2.c
@@ -29,6 +29,7 @@
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/string.h>
+#include <linux/stringify.h>
 #include <linux/tcp.h>
 #include <linux/timer.h>
 #include <linux/types.h>
@@ -2921,7 +2922,7 @@ static void atl2_check_options(struct atl2_adapter *adapter)
 	/* Bytes of Transmit Memory */
 	opt.type = range_option;
 	opt.name = "Bytes of Transmit Memory";
-	opt.err = "using default of " __MODULE_STRING(ATL2_DEFAULT_TX_MEMSIZE);
+	opt.err = "using default of " __stringify(ATL2_DEFAULT_TX_MEMSIZE);
 	opt.def = ATL2_DEFAULT_TX_MEMSIZE;
 	opt.arg.r.min = ATL2_MIN_TX_MEMSIZE;
 	opt.arg.r.max = ATL2_MAX_TX_MEMSIZE;
@@ -2939,7 +2940,7 @@ static void atl2_check_options(struct atl2_adapter *adapter)
 	/* Receive Memory Block Count */
 	opt.type = range_option;
 	opt.name = "Number of receive memory block";
-	opt.err = "using default of " __MODULE_STRING(ATL2_DEFAULT_RXD_COUNT);
+	opt.err = "using default of " __stringify(ATL2_DEFAULT_RXD_COUNT);
 	opt.def = ATL2_DEFAULT_RXD_COUNT;
 	opt.arg.r.min = ATL2_MIN_RXD_COUNT;
 	opt.arg.r.max = ATL2_MAX_RXD_COUNT;
@@ -2960,7 +2961,7 @@ static void atl2_check_options(struct atl2_adapter *adapter)
 	/* Interrupt Moderate Timer */
 	opt.type = range_option;
 	opt.name = "Interrupt Moderate Timer";
-	opt.err = "using default of " __MODULE_STRING(INT_MOD_DEFAULT_CNT);
+	opt.err = "using default of " __stringify(INT_MOD_DEFAULT_CNT);
 	opt.def = INT_MOD_DEFAULT_CNT;
 	opt.arg.r.min = INT_MOD_MIN_CNT;
 	opt.arg.r.max = INT_MOD_MAX_CNT;
@@ -2973,7 +2974,7 @@ static void atl2_check_options(struct atl2_adapter *adapter)
 	/* Flash Vendor */
 	opt.type = range_option;
 	opt.name = "SPI Flash Vendor";
-	opt.err = "using default of " __MODULE_STRING(FLASH_VENDOR_DEFAULT);
+	opt.err = "using default of " __stringify(FLASH_VENDOR_DEFAULT);
 	opt.def = FLASH_VENDOR_DEFAULT;
 	opt.arg.r.min = FLASH_VENDOR_MIN;
 	opt.arg.r.max = FLASH_VENDOR_MAX;
@@ -2986,7 +2987,7 @@ static void atl2_check_options(struct atl2_adapter *adapter)
 	/* MediaType */
 	opt.type = range_option;
 	opt.name = "Speed/Duplex Selection";
-	opt.err = "using default of " __MODULE_STRING(MEDIA_TYPE_AUTO_SENSOR);
+	opt.err = "using default of " __stringify(MEDIA_TYPE_AUTO_SENSOR);
 	opt.def = MEDIA_TYPE_AUTO_SENSOR;
 	opt.arg.r.min = MEDIA_TYPE_AUTO_SENSOR;
 	opt.arg.r.max = MEDIA_TYPE_10M_HALF;
diff --git a/drivers/net/ethernet/intel/e1000/e1000_param.c b/drivers/net/ethernet/intel/e1000/e1000_param.c
index f4154ca7fcb41..5faf6d6280c89 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_param.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_param.c
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 /* Copyright(c) 1999 - 2006 Intel Corporation. */
 
+#include <linux/stringify.h>
 #include "e1000.h"
 
 /* This is the only thing that needs to be changed to adjust the
@@ -259,7 +260,7 @@ void e1000_check_options(struct e1000_adapter *adapter)
 			.type = range_option,
 			.name = "Transmit Descriptors",
 			.err  = "using default of "
-				__MODULE_STRING(E1000_DEFAULT_TXD),
+				__stringify(E1000_DEFAULT_TXD),
 			.def  = E1000_DEFAULT_TXD,
 			.arg  = { .r = {
 				.min = E1000_MIN_TXD,
@@ -287,7 +288,7 @@ void e1000_check_options(struct e1000_adapter *adapter)
 			.type = range_option,
 			.name = "Receive Descriptors",
 			.err  = "using default of "
-				__MODULE_STRING(E1000_DEFAULT_RXD),
+				__stringify(E1000_DEFAULT_RXD),
 			.def  = E1000_DEFAULT_RXD,
 			.arg  = { .r = {
 				.min = E1000_MIN_RXD,
@@ -354,7 +355,7 @@ void e1000_check_options(struct e1000_adapter *adapter)
 		opt = (struct e1000_option) {
 			.type = range_option,
 			.name = "Transmit Interrupt Delay",
-			.err  = "using default of " __MODULE_STRING(DEFAULT_TIDV),
+			.err  = "using default of " __stringify(DEFAULT_TIDV),
 			.def  = DEFAULT_TIDV,
 			.arg  = { .r = { .min = MIN_TXDELAY,
 					 .max = MAX_TXDELAY }}
@@ -372,7 +373,7 @@ void e1000_check_options(struct e1000_adapter *adapter)
 		opt = (struct e1000_option) {
 			.type = range_option,
 			.name = "Transmit Absolute Interrupt Delay",
-			.err  = "using default of " __MODULE_STRING(DEFAULT_TADV),
+			.err  = "using default of " __stringify(DEFAULT_TADV),
 			.def  = DEFAULT_TADV,
 			.arg  = { .r = { .min = MIN_TXABSDELAY,
 					 .max = MAX_TXABSDELAY }}
@@ -390,7 +391,7 @@ void e1000_check_options(struct e1000_adapter *adapter)
 		opt = (struct e1000_option) {
 			.type = range_option,
 			.name = "Receive Interrupt Delay",
-			.err  = "using default of " __MODULE_STRING(DEFAULT_RDTR),
+			.err  = "using default of " __stringify(DEFAULT_RDTR),
 			.def  = DEFAULT_RDTR,
 			.arg  = { .r = { .min = MIN_RXDELAY,
 					 .max = MAX_RXDELAY }}
@@ -408,7 +409,7 @@ void e1000_check_options(struct e1000_adapter *adapter)
 		opt = (struct e1000_option) {
 			.type = range_option,
 			.name = "Receive Absolute Interrupt Delay",
-			.err  = "using default of " __MODULE_STRING(DEFAULT_RADV),
+			.err  = "using default of " __stringify(DEFAULT_RADV),
 			.def  = DEFAULT_RADV,
 			.arg  = { .r = { .min = MIN_RXABSDELAY,
 					 .max = MAX_RXABSDELAY }}
@@ -426,7 +427,7 @@ void e1000_check_options(struct e1000_adapter *adapter)
 		opt = (struct e1000_option) {
 			.type = range_option,
 			.name = "Interrupt Throttling Rate (ints/sec)",
-			.err  = "using default of " __MODULE_STRING(DEFAULT_ITR),
+			.err  = "using default of " __stringify(DEFAULT_ITR),
 			.def  = DEFAULT_ITR,
 			.arg  = { .r = { .min = MIN_ITR,
 					 .max = MAX_ITR }}
diff --git a/drivers/net/ethernet/intel/e1000e/param.c b/drivers/net/ethernet/intel/e1000e/param.c
index 3132d8f2f207d..c6f400e6cdea8 100644
--- a/drivers/net/ethernet/intel/e1000e/param.c
+++ b/drivers/net/ethernet/intel/e1000e/param.c
@@ -4,6 +4,7 @@
 #include <linux/netdevice.h>
 #include <linux/module.h>
 #include <linux/pci.h>
+#include <linux/stringify.h>
 
 #include "e1000.h"
 
@@ -238,8 +239,7 @@ void e1000e_check_options(struct e1000_adapter *adapter)
 		static const struct e1000_option opt = {
 			.type = range_option,
 			.name = "Transmit Interrupt Delay",
-			.err  = "using default of "
-				__MODULE_STRING(DEFAULT_TIDV),
+			.err  = "using default of " __stringify(DEFAULT_TIDV),
 			.def  = DEFAULT_TIDV,
 			.arg  = { .r = { .min = MIN_TXDELAY,
 					 .max = MAX_TXDELAY } }
@@ -258,8 +258,7 @@ void e1000e_check_options(struct e1000_adapter *adapter)
 		static const struct e1000_option opt = {
 			.type = range_option,
 			.name = "Transmit Absolute Interrupt Delay",
-			.err  = "using default of "
-				__MODULE_STRING(DEFAULT_TADV),
+			.err  = "using default of " __stringify(DEFAULT_TADV),
 			.def  = DEFAULT_TADV,
 			.arg  = { .r = { .min = MIN_TXABSDELAY,
 					 .max = MAX_TXABSDELAY } }
@@ -278,8 +277,7 @@ void e1000e_check_options(struct e1000_adapter *adapter)
 		static struct e1000_option opt = {
 			.type = range_option,
 			.name = "Receive Interrupt Delay",
-			.err  = "using default of "
-				__MODULE_STRING(DEFAULT_RDTR),
+			.err  = "using default of " __stringify(DEFAULT_RDTR),
 			.def  = DEFAULT_RDTR,
 			.arg  = { .r = { .min = MIN_RXDELAY,
 					 .max = MAX_RXDELAY } }
@@ -301,8 +299,7 @@ void e1000e_check_options(struct e1000_adapter *adapter)
 		static struct e1000_option opt = {
 			.type = range_option,
 			.name = "Receive Absolute Interrupt Delay",
-			.err  = "using default of "
-				__MODULE_STRING(DEFAULT_RADV),
+			.err  = "using default of " __stringify(DEFAULT_RADV),
 			.def  = DEFAULT_RADV,
 			.arg  = { .r = { .min = MIN_RXABSDELAY,
 					 .max = MAX_RXABSDELAY } }
@@ -324,8 +321,7 @@ void e1000e_check_options(struct e1000_adapter *adapter)
 		static const struct e1000_option opt = {
 			.type = range_option,
 			.name = "Interrupt Throttling Rate (ints/sec)",
-			.err  = "using default of "
-				__MODULE_STRING(DEFAULT_ITR),
+			.err  = "using default of " __stringify(DEFAULT_ITR),
 			.def  = DEFAULT_ITR,
 			.arg  = { .r = { .min = MIN_ITR,
 					 .max = MAX_ITR } }
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c
index 81fc5a6e32219..6a1a6678bd1a5 100644
--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c
@@ -7,7 +7,8 @@
  */
 
 #include "pch_gbe.h"
-#include <linux/module.h>	/* for __MODULE_STRING */
+#include <linux/module.h>
+#include <linux/stringify.h>
 
 #define OPTION_UNSET   -1
 #define OPTION_DISABLED 0
@@ -440,7 +441,7 @@ void pch_gbe_check_options(struct pch_gbe_adapter *adapter)
 			.type = range_option,
 			.name = "Transmit Descriptors",
 			.err  = "using default of "
-				__MODULE_STRING(PCH_GBE_DEFAULT_TXD),
+				__stringify(PCH_GBE_DEFAULT_TXD),
 			.def  = PCH_GBE_DEFAULT_TXD,
 			.arg  = { .r = { .min = PCH_GBE_MIN_TXD,
 					 .max = PCH_GBE_MAX_TXD } }
@@ -456,7 +457,7 @@ void pch_gbe_check_options(struct pch_gbe_adapter *adapter)
 			.type = range_option,
 			.name = "Receive Descriptors",
 			.err  = "using default of "
-				__MODULE_STRING(PCH_GBE_DEFAULT_RXD),
+				__stringify(PCH_GBE_DEFAULT_RXD),
 			.def  = PCH_GBE_DEFAULT_RXD,
 			.arg  = { .r = { .min = PCH_GBE_MIN_RXD,
 					 .max = PCH_GBE_MAX_RXD } }
diff --git a/drivers/platform/cznic/turris-omnia-mcu-watchdog.c b/drivers/platform/cznic/turris-omnia-mcu-watchdog.c
index 3ad146ec1d809..daabd88eb9133 100644
--- a/drivers/platform/cznic/turris-omnia-mcu-watchdog.c
+++ b/drivers/platform/cznic/turris-omnia-mcu-watchdog.c
@@ -9,6 +9,7 @@
 #include <linux/device.h>
 #include <linux/i2c.h>
 #include <linux/moduleparam.h>
+#include <linux/stringify.h>
 #include <linux/types.h>
 #include <linux/units.h>
 #include <linux/watchdog.h>
@@ -25,7 +26,7 @@ MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds");
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
-			   __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+			   __stringify(WATCHDOG_NOWAYOUT) ")");
 
 static int omnia_wdt_start(struct watchdog_device *wdt)
 {
diff --git a/drivers/rtc/rtc-ds1374.c b/drivers/rtc/rtc-ds1374.c
index 8c247215d6116..2ed6777e7035e 100644
--- a/drivers/rtc/rtc-ds1374.c
+++ b/drivers/rtc/rtc-ds1374.c
@@ -26,6 +26,7 @@
 #include <linux/workqueue.h>
 #include <linux/slab.h>
 #include <linux/pm.h>
+#include <linux/stringify.h>
 #ifdef CONFIG_RTC_DRV_DS1374_WDT
 #include <linux/fs.h>
 #include <linux/ioctl.h>
@@ -381,7 +382,7 @@ MODULE_PARM_DESC(wdt_margin, "Watchdog timeout in seconds (default 32s)");
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default ="
-		__MODULE_STRING(WATCHDOG_NOWAYOUT)")");
+		__stringify(WATCHDOG_NOWAYOUT)")");
 
 static const struct watchdog_info ds1374_wdt_info = {
 	.identity       = "DS1374 Watchdog",
diff --git a/drivers/thunderbolt/tb.c b/drivers/thunderbolt/tb.c
index 47753a5c0f2eb..a2459e44e3205 100644
--- a/drivers/thunderbolt/tb.c
+++ b/drivers/thunderbolt/tb.c
@@ -11,6 +11,7 @@
 #include <linux/delay.h>
 #include <linux/pm_runtime.h>
 #include <linux/platform_data/x86/apple.h>
+#include <linux/stringify.h>
 
 #include "tb.h"
 #include "tb_regs.h"
@@ -47,7 +48,7 @@ static unsigned int asym_threshold = TB_ASYM_THRESHOLD;
 module_param_named(asym_threshold, asym_threshold, uint, 0444);
 MODULE_PARM_DESC(asym_threshold,
 		"threshold (Mb/s) when to Gen 4 switch link symmetry. 0 disables. (default: "
-		__MODULE_STRING(TB_ASYM_THRESHOLD) ")");
+		__stringify(TB_ASYM_THRESHOLD) ")");
 
 /**
  * struct tb_cm - Simple Thunderbolt connection manager
diff --git a/drivers/thunderbolt/tunnel.c b/drivers/thunderbolt/tunnel.c
index 7e8284575dffb..ad4916748789b 100644
--- a/drivers/thunderbolt/tunnel.c
+++ b/drivers/thunderbolt/tunnel.c
@@ -11,6 +11,7 @@
 #include <linux/list.h>
 #include <linux/ktime.h>
 #include <linux/string_helpers.h>
+#include <linux/stringify.h>
 
 #include "tunnel.h"
 #include "tb.h"
@@ -89,12 +90,12 @@ static int dprx_timeout = TB_DPRX_TIMEOUT;
 module_param(dprx_timeout, int, 0444);
 MODULE_PARM_DESC(dprx_timeout,
 		 "DPRX capability read timeout in ms, -1 waits forever (default: "
-		 __MODULE_STRING(TB_DPRX_TIMEOUT) ")");
+		 __stringify(TB_DPRX_TIMEOUT) ")");
 
 static unsigned int dma_credits = TB_DMA_CREDITS;
 module_param(dma_credits, uint, 0444);
 MODULE_PARM_DESC(dma_credits, "specify custom credits for DMA tunnels (default: "
-                __MODULE_STRING(TB_DMA_CREDITS) ")");
+		 __stringify(TB_DMA_CREDITS) ")");
 
 static bool bw_alloc_mode = true;
 module_param(bw_alloc_mode, bool, 0444);
diff --git a/drivers/tty/serial/8250/8250_platform.c b/drivers/tty/serial/8250/8250_platform.c
index af946d12e7648..e060e0427fc9a 100644
--- a/drivers/tty/serial/8250/8250_platform.c
+++ b/drivers/tty/serial/8250/8250_platform.c
@@ -16,6 +16,7 @@
 #include <linux/moduleparam.h>
 #include <linux/once.h>
 #include <linux/platform_device.h>
+#include <linux/stringify.h>
 
 #include <linux/serial_8250.h>
 
@@ -382,6 +383,6 @@ module_param_hw(share_irqs, bool, other, 0644);
 MODULE_PARM_DESC(share_irqs, "Share IRQs with other non-8250/16x50 devices (unsafe)");
 
 module_param(nr_uarts, uint, 0644);
-MODULE_PARM_DESC(nr_uarts, "Maximum number of UARTs supported. (1-" __MODULE_STRING(CONFIG_SERIAL_8250_NR_UARTS) ")");
+MODULE_PARM_DESC(nr_uarts, "Maximum number of UARTs supported. (1-" __stringify(CONFIG_SERIAL_8250_NR_UARTS) ")");
 
 MODULE_ALIAS_CHARDEV_MAJOR(TTY_MAJOR);
diff --git a/drivers/usb/atm/speedtch.c b/drivers/usb/atm/speedtch.c
index 9d28c652bcd80..95cd8ce99a645 100644
--- a/drivers/usb/atm/speedtch.c
+++ b/drivers/usb/atm/speedtch.c
@@ -19,6 +19,7 @@
 #include <linux/moduleparam.h>
 #include <linux/slab.h>
 #include <linux/stat.h>
+#include <linux/stringify.h>
 #include <linux/timer.h>
 #include <linux/types.h>
 #include <linux/usb/ch9.h>
@@ -77,31 +78,31 @@ static unsigned int num_ModemOption;
 module_param(altsetting, uint, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(altsetting,
 		"Alternative setting for data interface (bulk_default: "
-		__MODULE_STRING(DEFAULT_BULK_ALTSETTING) "; isoc_default: "
-		__MODULE_STRING(DEFAULT_ISOC_ALTSETTING) ")");
+		__stringify(DEFAULT_BULK_ALTSETTING) "; isoc_default: "
+		__stringify(DEFAULT_ISOC_ALTSETTING) ")");
 
 module_param(dl_512_first, bool, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(dl_512_first,
 		 "Read 512 bytes before sending firmware (default: "
-		 __MODULE_STRING(DEFAULT_DL_512_FIRST) ")");
+		 __stringify(DEFAULT_DL_512_FIRST) ")");
 
 module_param(enable_isoc, bool, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(enable_isoc,
 		"Use isochronous transfers if available (default: "
-		__MODULE_STRING(DEFAULT_ENABLE_ISOC) ")");
+		__stringify(DEFAULT_ENABLE_ISOC) ")");
 
 module_param(sw_buffering, bool, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(sw_buffering,
 		 "Enable software buffering (default: "
-		 __MODULE_STRING(DEFAULT_SW_BUFFERING) ")");
+		 __stringify(DEFAULT_SW_BUFFERING) ")");
 
 module_param(BMaxDSL, uint, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(BMaxDSL,
-		"default: " __MODULE_STRING(DEFAULT_B_MAX_DSL));
+		"default: " __stringify(DEFAULT_B_MAX_DSL));
 
 module_param(ModemMode, byte, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(ModemMode,
-		"default: " __MODULE_STRING(DEFAULT_MODEM_MODE));
+		"default: " __stringify(DEFAULT_MODEM_MODE));
 
 module_param_array(ModemOption, byte, &num_ModemOption, S_IRUGO);
 MODULE_PARM_DESC(ModemOption, "default: 0x10,0x00,0x00,0x00,0x20");
diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
index 7b0c791399eaa..d4052d206e006 100644
--- a/drivers/usb/atm/usbatm.c
+++ b/drivers/usb/atm/usbatm.c
@@ -64,6 +64,7 @@
 #include <linux/signal.h>
 #include <linux/slab.h>
 #include <linux/stat.h>
+#include <linux/stringify.h>
 #include <linux/timer.h>
 #include <linux/wait.h>
 #include <linux/kthread.h>
@@ -103,26 +104,26 @@ static unsigned int snd_buf_bytes = UDSL_DEFAULT_SND_BUF_SIZE;
 module_param(num_rcv_urbs, uint, S_IRUGO);
 MODULE_PARM_DESC(num_rcv_urbs,
 		 "Number of urbs used for reception (range: 0-"
-		 __MODULE_STRING(UDSL_MAX_RCV_URBS) ", default: "
-		 __MODULE_STRING(UDSL_DEFAULT_RCV_URBS) ")");
+		 __stringify(UDSL_MAX_RCV_URBS) ", default: "
+		 __stringify(UDSL_DEFAULT_RCV_URBS) ")");
 
 module_param(num_snd_urbs, uint, S_IRUGO);
 MODULE_PARM_DESC(num_snd_urbs,
 		 "Number of urbs used for transmission (range: 0-"
-		 __MODULE_STRING(UDSL_MAX_SND_URBS) ", default: "
-		 __MODULE_STRING(UDSL_DEFAULT_SND_URBS) ")");
+		 __stringify(UDSL_MAX_SND_URBS) ", default: "
+		 __stringify(UDSL_DEFAULT_SND_URBS) ")");
 
 module_param(rcv_buf_bytes, uint, S_IRUGO);
 MODULE_PARM_DESC(rcv_buf_bytes,
 		 "Size of the buffers used for reception, in bytes (range: 1-"
-		 __MODULE_STRING(UDSL_MAX_BUF_SIZE) ", default: "
-		 __MODULE_STRING(UDSL_DEFAULT_RCV_BUF_SIZE) ")");
+		 __stringify(UDSL_MAX_BUF_SIZE) ", default: "
+		 __stringify(UDSL_DEFAULT_RCV_BUF_SIZE) ")");
 
 module_param(snd_buf_bytes, uint, S_IRUGO);
 MODULE_PARM_DESC(snd_buf_bytes,
 		 "Size of the buffers used for transmission, in bytes (range: 1-"
-		 __MODULE_STRING(UDSL_MAX_BUF_SIZE) ", default: "
-		 __MODULE_STRING(UDSL_DEFAULT_SND_BUF_SIZE) ")");
+		 __stringify(UDSL_MAX_BUF_SIZE) ", default: "
+		 __stringify(UDSL_DEFAULT_SND_BUF_SIZE) ")");
 
 
 /* receive */
diff --git a/drivers/watchdog/acquirewdt.c b/drivers/watchdog/acquirewdt.c
index 052f65c48a703..cb62800e89ed4 100644
--- a/drivers/watchdog/acquirewdt.c
+++ b/drivers/watchdog/acquirewdt.c
@@ -64,6 +64,7 @@
 #include <linux/init.h>			/* For __init/__exit/... */
 #include <linux/uaccess.h>		/* For copy_to_user/put_user/... */
 #include <linux/io.h>			/* For inb/outb/... */
+#include <linux/stringify.h>		/* For __stringify */
 
 /* Module information */
 #define DRV_NAME "acquirewdt"
@@ -92,7 +93,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 	"Watchdog cannot be stopped once started (default="
-	__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+	__stringify(WATCHDOG_NOWAYOUT) ")");
 
 /*
  *	Watchdog Operations
diff --git a/drivers/watchdog/advantech_ec_wdt.c b/drivers/watchdog/advantech_ec_wdt.c
index 7c380f90ca583..2470c43032672 100644
--- a/drivers/watchdog/advantech_ec_wdt.c
+++ b/drivers/watchdog/advantech_ec_wdt.c
@@ -14,6 +14,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
+#include <linux/stringify.h>
 #include <linux/watchdog.h>
 
 #define DRIVER_NAME		"advantech_ec_wdt"
@@ -49,7 +50,7 @@ static ktime_t ec_timestamp;
 
 module_param(timeout, uint, 0);
 MODULE_PARM_DESC(timeout,
-		 "Default Watchdog timer setting (" __MODULE_STRING(DEFAULT_TIME) "s). The range is from " __MODULE_STRING(MIN_TIME) " to " __MODULE_STRING(MAX_TIME) ".");
+		 "Default Watchdog timer setting (" __stringify(DEFAULT_TIME) "s). The range is from " __stringify(MIN_TIME) " to " __stringify(MAX_TIME) ".");
 
 static void adv_ec_wdt_timing_gate(void)
 {
diff --git a/drivers/watchdog/advantechwdt.c b/drivers/watchdog/advantechwdt.c
index 42d3f37717810..6d24a6bc8f908 100644
--- a/drivers/watchdog/advantechwdt.c
+++ b/drivers/watchdog/advantechwdt.c
@@ -37,6 +37,7 @@
 #include <linux/init.h>
 #include <linux/io.h>
 #include <linux/uaccess.h>
+#include <linux/stringify.h>
 
 
 #define DRV_NAME "advantechwdt"
@@ -71,13 +72,13 @@ static int timeout = WATCHDOG_TIMEOUT;	/* in seconds */
 module_param(timeout, int, 0);
 MODULE_PARM_DESC(timeout,
 	"Watchdog timeout in seconds. 1<= timeout <=63, default="
-		__MODULE_STRING(WATCHDOG_TIMEOUT) ".");
+		__stringify(WATCHDOG_TIMEOUT) ".");
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 	"Watchdog cannot be stopped once started (default="
-		__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+		__stringify(WATCHDOG_NOWAYOUT) ")");
 
 /*
  *	Watchdog Operations
diff --git a/drivers/watchdog/airoha_wdt.c b/drivers/watchdog/airoha_wdt.c
index 4bd333189b87e..c535c48ab6a86 100644
--- a/drivers/watchdog/airoha_wdt.c
+++ b/drivers/watchdog/airoha_wdt.c
@@ -20,6 +20,7 @@
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/watchdog.h>
+#include <linux/stringify.h>
 
 /* Base address of timer and watchdog registers */
 #define TIMER_CTRL			0x0
@@ -44,12 +45,12 @@ struct airoha_wdt_desc {
 static int heartbeat = WDT_HEARTBEAT;
 module_param(heartbeat, int, 0);
 MODULE_PARM_DESC(heartbeat, "Watchdog heartbeats in seconds. (default="
-		 __MODULE_STRING(WDT_HEARTBEAT) ")");
+		 __stringify(WDT_HEARTBEAT) ")");
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
-		 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+		 __stringify(WATCHDOG_NOWAYOUT) ")");
 
 static int airoha_wdt_start(struct watchdog_device *wdog_dev)
 {
diff --git a/drivers/watchdog/alim1535_wdt.c b/drivers/watchdog/alim1535_wdt.c
index 1ecbd1ac5c3a0..d2f8d3331fe40 100644
--- a/drivers/watchdog/alim1535_wdt.c
+++ b/drivers/watchdog/alim1535_wdt.c
@@ -18,6 +18,7 @@
 #include <linux/pci.h>
 #include <linux/uaccess.h>
 #include <linux/io.h>
+#include <linux/stringify.h>
 
 #define WATCHDOG_NAME "ALi_M1535"
 #define WATCHDOG_TIMEOUT 60	/* 60 sec default timeout */
@@ -34,13 +35,13 @@ static int timeout = WATCHDOG_TIMEOUT;
 module_param(timeout, int, 0);
 MODULE_PARM_DESC(timeout,
 		"Watchdog timeout in seconds. (0 < timeout < 18000, default="
-				__MODULE_STRING(WATCHDOG_TIMEOUT) ")");
+				__stringify(WATCHDOG_TIMEOUT) ")");
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 		"Watchdog cannot be stopped once started (default="
-				__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+				__stringify(WATCHDOG_NOWAYOUT) ")");
 
 /*
  *	ali_start	-	start watchdog countdown
diff --git a/drivers/watchdog/alim7101_wdt.c b/drivers/watchdog/alim7101_wdt.c
index 03a559b41f5b8..e9611c76a2696 100644
--- a/drivers/watchdog/alim7101_wdt.c
+++ b/drivers/watchdog/alim7101_wdt.c
@@ -36,6 +36,7 @@
 #include <linux/pci.h>
 #include <linux/io.h>
 #include <linux/uaccess.h>
+#include <linux/stringify.h>
 
 
 #define WDT_ENABLE 0x9C
@@ -64,7 +65,7 @@ static int timeout = WATCHDOG_TIMEOUT;
 module_param(timeout, int, 0);
 MODULE_PARM_DESC(timeout,
 		"Watchdog timeout in seconds. (1<=timeout<=3600, default="
-				__MODULE_STRING(WATCHDOG_TIMEOUT) ")");
+				__stringify(WATCHDOG_TIMEOUT) ")");
 
 static int use_gpio; /* Use the pic (for a1d revision alim7101) */
 module_param(use_gpio, int, 0);
@@ -82,7 +83,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 		"Watchdog cannot be stopped once started (default="
-				__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+				__stringify(WATCHDOG_NOWAYOUT) ")");
 
 /*
  *	Whack the dog
diff --git a/drivers/watchdog/arm_smc_wdt.c b/drivers/watchdog/arm_smc_wdt.c
index bbba23ace7b85..c73ed1dcdfcb0 100644
--- a/drivers/watchdog/arm_smc_wdt.c
+++ b/drivers/watchdog/arm_smc_wdt.c
@@ -13,6 +13,7 @@
 #include <linux/moduleparam.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
+#include <linux/stringify.h>
 #include <linux/types.h>
 #include <linux/watchdog.h>
 #include <uapi/linux/psci.h>
@@ -191,7 +192,7 @@ MODULE_PARM_DESC(timeout, "Watchdog heartbeat in seconds");
 
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
-			__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+			__stringify(WATCHDOG_NOWAYOUT) ")");
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Julius Werner <jwerner@chromium.org>");
diff --git a/drivers/watchdog/armada_37xx_wdt.c b/drivers/watchdog/armada_37xx_wdt.c
index a17a7911771ac..d62b02c40b0eb 100644
--- a/drivers/watchdog/armada_37xx_wdt.c
+++ b/drivers/watchdog/armada_37xx_wdt.c
@@ -16,6 +16,7 @@
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
+#include <linux/stringify.h>
 #include <linux/types.h>
 #include <linux/watchdog.h>
 
@@ -70,7 +71,7 @@ MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds");
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
-			   __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+			   __stringify(WATCHDOG_NOWAYOUT) ")");
 
 struct armada_37xx_watchdog {
 	struct watchdog_device wdt;
diff --git a/drivers/watchdog/aspeed_wdt.c b/drivers/watchdog/aspeed_wdt.c
index 48454ac860746..d4bd41cb801e6 100644
--- a/drivers/watchdog/aspeed_wdt.c
+++ b/drivers/watchdog/aspeed_wdt.c
@@ -17,12 +17,13 @@
 #include <linux/of_irq.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
+#include <linux/stringify.h>
 #include <linux/watchdog.h>
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
-				__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+				__stringify(WATCHDOG_NOWAYOUT) ")");
 struct aspeed_wdt_scu {
 	const char *compatible;
 	u32 reset_status_reg;
diff --git a/drivers/watchdog/at91rm9200_wdt.c b/drivers/watchdog/at91rm9200_wdt.c
index d5afcc6342215..8c292d2469813 100644
--- a/drivers/watchdog/at91rm9200_wdt.c
+++ b/drivers/watchdog/at91rm9200_wdt.c
@@ -23,6 +23,7 @@
 #include <linux/platform_device.h>
 #include <linux/reboot.h>
 #include <linux/regmap.h>
+#include <linux/stringify.h>
 #include <linux/types.h>
 #include <linux/watchdog.h>
 #include <linux/uaccess.h>
@@ -36,13 +37,13 @@ static struct regmap *regmap_st;
 
 module_param(wdt_time, int, 0);
 MODULE_PARM_DESC(wdt_time, "Watchdog time in seconds. (default="
-				__MODULE_STRING(WDT_DEFAULT_TIME) ")");
+				__stringify(WDT_DEFAULT_TIME) ")");
 
 #ifdef CONFIG_WATCHDOG_NOWAYOUT
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 		"Watchdog cannot be stopped once started (default="
-				__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+				__stringify(WATCHDOG_NOWAYOUT) ")");
 #endif
 
 
diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c
index 80ba04df54adf..f966da6020111 100644
--- a/drivers/watchdog/at91sam9_wdt.c
+++ b/drivers/watchdog/at91sam9_wdt.c
@@ -32,6 +32,7 @@
 #include <linux/uaccess.h>
 #include <linux/of.h>
 #include <linux/of_irq.h>
+#include <linux/stringify.h>
 
 #include "at91sam9_wdt.h"
 
@@ -70,12 +71,12 @@
 static int heartbeat;
 module_param(heartbeat, int, 0);
 MODULE_PARM_DESC(heartbeat, "Watchdog heartbeats in seconds. "
-	"(default = " __MODULE_STRING(WDT_HEARTBEAT) ")");
+	"(default = " __stringify(WDT_HEARTBEAT) ")");
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started "
-	"(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+	"(default=" __stringify(WATCHDOG_NOWAYOUT) ")");
 
 #define to_wdt(wdd) container_of(wdd, struct at91wdt, wdd)
 struct at91wdt {
diff --git a/drivers/watchdog/atcwdt200_wdt.c b/drivers/watchdog/atcwdt200_wdt.c
index 7e757c217b0b5..ceedc3f676320 100644
--- a/drivers/watchdog/atcwdt200_wdt.c
+++ b/drivers/watchdog/atcwdt200_wdt.c
@@ -19,6 +19,7 @@
 #include <linux/pm.h>
 #include <linux/pm_runtime.h>
 #include <linux/regmap.h>
+#include <linux/stringify.h>
 #include <linux/watchdog.h>
 
 /* Register definitions */
@@ -570,11 +571,11 @@ module_platform_driver(atcwdt_driver);
 
 module_param(timeout, uint, 0);
 MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds (default="
-		 __MODULE_STRING(ATCWDT_TIMEOUT) ")");
+		 __stringify(ATCWDT_TIMEOUT) ")");
 
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
-		 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+		 __stringify(WATCHDOG_NOWAYOUT) ")");
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("CL Wang <cl634@andestech.com>");
diff --git a/drivers/watchdog/ath79_wdt.c b/drivers/watchdog/ath79_wdt.c
index 7df703e9852a6..02783c1ec5264 100644
--- a/drivers/watchdog/ath79_wdt.c
+++ b/drivers/watchdog/ath79_wdt.c
@@ -32,6 +32,7 @@
 #include <linux/of.h>
 #include <linux/of_platform.h>
 #include <linux/uaccess.h>
+#include <linux/stringify.h>
 
 #define DRIVER_NAME	"ath79-wdt"
 
@@ -50,12 +51,12 @@
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started "
-			   "(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+			   "(default=" __stringify(WATCHDOG_NOWAYOUT) ")");
 
 static int timeout = WDT_TIMEOUT;
 module_param(timeout, int, 0);
 MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds "
-			  "(default=" __MODULE_STRING(WDT_TIMEOUT) "s)");
+			  "(default=" __stringify(WDT_TIMEOUT) "s)");
 
 static unsigned long wdt_flags;
 
diff --git a/drivers/watchdog/bcm2835_wdt.c b/drivers/watchdog/bcm2835_wdt.c
index 6fd8b1b8e386a..1a0fc66cc0930 100644
--- a/drivers/watchdog/bcm2835_wdt.c
+++ b/drivers/watchdog/bcm2835_wdt.c
@@ -20,6 +20,7 @@
 #include <linux/of_address.h>
 #include <linux/of_platform.h>
 #include <linux/reboot.h>
+#include <linux/stringify.h>
 
 #define PM_RSTC				0x1c
 #define PM_RSTS				0x20
@@ -229,7 +230,7 @@ MODULE_PARM_DESC(heartbeat, "Initial watchdog heartbeat in seconds");
 
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
-				__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+				__stringify(WATCHDOG_NOWAYOUT) ")");
 
 MODULE_ALIAS("platform:bcm2835-wdt");
 MODULE_AUTHOR("Lubomir Rintel <lkundrak@v3.sk>");
diff --git a/drivers/watchdog/bcm47xx_wdt.c b/drivers/watchdog/bcm47xx_wdt.c
index e13ec0975bef3..0d7e8a87074a5 100644
--- a/drivers/watchdog/bcm47xx_wdt.c
+++ b/drivers/watchdog/bcm47xx_wdt.c
@@ -21,6 +21,7 @@
 #include <linux/watchdog.h>
 #include <linux/timer.h>
 #include <linux/jiffies.h>
+#include <linux/stringify.h>
 
 #define DRV_NAME		"bcm47xx_wdt"
 
@@ -33,12 +34,12 @@ static bool nowayout = WATCHDOG_NOWAYOUT;
 
 module_param(timeout, int, 0);
 MODULE_PARM_DESC(timeout, "Watchdog time in seconds. (default="
-				__MODULE_STRING(WDT_DEFAULT_TIME) ")");
+				__stringify(WDT_DEFAULT_TIME) ")");
 
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 		"Watchdog cannot be stopped once started (default="
-				__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+				__stringify(WATCHDOG_NOWAYOUT) ")");
 
 static inline struct bcm47xx_wdt *bcm47xx_wdt_get(struct watchdog_device *wdd)
 {
diff --git a/drivers/watchdog/bcm7038_wdt.c b/drivers/watchdog/bcm7038_wdt.c
index e038dd66b8198..1117026cf9594 100644
--- a/drivers/watchdog/bcm7038_wdt.c
+++ b/drivers/watchdog/bcm7038_wdt.c
@@ -12,6 +12,7 @@
 #include <linux/platform_device.h>
 #include <linux/platform_data/bcm7038_wdt.h>
 #include <linux/pm.h>
+#include <linux/stringify.h>
 #include <linux/watchdog.h>
 
 #define WDT_START_1		0xff00
@@ -228,7 +229,7 @@ module_platform_driver(bcm7038_wdt_driver);
 
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
-	__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+	__stringify(WATCHDOG_NOWAYOUT) ")");
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Driver for Broadcom 7038 SoCs Watchdog");
 MODULE_AUTHOR("Justin Chen");
diff --git a/drivers/watchdog/booke_wdt.c b/drivers/watchdog/booke_wdt.c
index 1b1fb389b89ba..1224d1737e87b 100644
--- a/drivers/watchdog/booke_wdt.c
+++ b/drivers/watchdog/booke_wdt.c
@@ -12,6 +12,7 @@
 
 #include <linux/module.h>
 #include <linux/smp.h>
+#include <linux/stringify.h>
 #include <linux/watchdog.h>
 
 #include <asm/reg_booke.h>
@@ -43,7 +44,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 		"Watchdog cannot be stopped once started (default="
-				__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+				__stringify(WATCHDOG_NOWAYOUT) ")");
 
 #ifdef CONFIG_PPC_E500
 
diff --git a/drivers/watchdog/cadence_wdt.c b/drivers/watchdog/cadence_wdt.c
index ad46b33ce5f2e..0d635fb8b0f7c 100644
--- a/drivers/watchdog/cadence_wdt.c
+++ b/drivers/watchdog/cadence_wdt.c
@@ -15,6 +15,7 @@
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
+#include <linux/stringify.h>
 #include <linux/watchdog.h>
 
 #define CDNS_WDT_DEFAULT_TIMEOUT	10
@@ -52,12 +53,12 @@ static int nowayout = WATCHDOG_NOWAYOUT;
 module_param(wdt_timeout, int, 0644);
 MODULE_PARM_DESC(wdt_timeout,
 		 "Watchdog time in seconds. (default="
-		 __MODULE_STRING(CDNS_WDT_DEFAULT_TIMEOUT) ")");
+		 __stringify(CDNS_WDT_DEFAULT_TIMEOUT) ")");
 
 module_param(nowayout, int, 0644);
 MODULE_PARM_DESC(nowayout,
 		 "Watchdog cannot be stopped once started (default="
-		 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+		 __stringify(WATCHDOG_NOWAYOUT) ")");
 
 /**
  * struct cdns_wdt - Watchdog device structure
diff --git a/drivers/watchdog/cgbc_wdt.c b/drivers/watchdog/cgbc_wdt.c
index 702b055ba6f4b..a90e6af13bed3 100644
--- a/drivers/watchdog/cgbc_wdt.c
+++ b/drivers/watchdog/cgbc_wdt.c
@@ -11,6 +11,7 @@
 #include <linux/limits.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
+#include <linux/stringify.h>
 #include <linux/watchdog.h>
 
 #include <linux/mfd/cgbc.h>
@@ -38,19 +39,19 @@ static unsigned int timeout;
 module_param(timeout, uint, 0);
 MODULE_PARM_DESC(timeout,
 		 "Watchdog timeout in seconds. (>=0, default="
-		 __MODULE_STRING(CGBC_WDT_DEFAULT_TIMEOUT) ")");
+		 __stringify(CGBC_WDT_DEFAULT_TIMEOUT) ")");
 
 static unsigned int pretimeout = CGBC_WDT_DEFAULT_PRETIMEOUT;
 module_param(pretimeout, uint, 0);
 MODULE_PARM_DESC(pretimeout,
 		 "Watchdog pretimeout in seconds. (>=0, default="
-		 __MODULE_STRING(CGBC_WDT_DEFAULT_PRETIMEOUT) ")");
+		 __stringify(CGBC_WDT_DEFAULT_PRETIMEOUT) ")");
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 		 "Watchdog cannot be stopped once started (default="
-		 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+		 __stringify(WATCHDOG_NOWAYOUT) ")");
 
 struct cgbc_wdt_data {
 	struct cgbc_device_data	*cgbc;
diff --git a/drivers/watchdog/da9052_wdt.c b/drivers/watchdog/da9052_wdt.c
index afb7887c3a1e8..959cba0a88195 100644
--- a/drivers/watchdog/da9052_wdt.c
+++ b/drivers/watchdog/da9052_wdt.c
@@ -17,6 +17,7 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/jiffies.h>
+#include <linux/stringify.h>
 
 #include <linux/mfd/da9052/reg.h>
 #include <linux/mfd/da9052/da9052.h>
@@ -34,13 +35,13 @@ static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 		 "Watchdog cannot be stopped once started (default="
-		 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+		 __stringify(WATCHDOG_NOWAYOUT) ")");
 
 static int timeout;
 module_param(timeout, int, 0);
 MODULE_PARM_DESC(timeout,
 	"Watchdog timeout in seconds. (default = "
-	__MODULE_STRING(WDT_DEFAULT_TIMEOUT) ")");
+	__stringify(WDT_DEFAULT_TIMEOUT) ")");
 
 static const struct {
 	u8 reg_val;
diff --git a/drivers/watchdog/da9055_wdt.c b/drivers/watchdog/da9055_wdt.c
index 9d5a2009466f7..cbb87855bd6a4 100644
--- a/drivers/watchdog/da9055_wdt.c
+++ b/drivers/watchdog/da9055_wdt.c
@@ -15,6 +15,7 @@
 #include <linux/platform_device.h>
 #include <linux/watchdog.h>
 #include <linux/delay.h>
+#include <linux/stringify.h>
 
 #include <linux/mfd/da9055/core.h>
 #include <linux/mfd/da9055/reg.h>
@@ -23,7 +24,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 		 "Watchdog cannot be stopped once started (default="
-		 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+		 __stringify(WATCHDOG_NOWAYOUT) ")");
 
 #define DA9055_DEF_TIMEOUT	4
 #define DA9055_TWDMIN		256
diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c
index 6ea0434f45c22..fcee686315c34 100644
--- a/drivers/watchdog/davinci_wdt.c
+++ b/drivers/watchdog/davinci_wdt.c
@@ -19,6 +19,7 @@
 #include <linux/device.h>
 #include <linux/clk.h>
 #include <linux/err.h>
+#include <linux/stringify.h>
 
 #define MODULE_NAME "DAVINCI-WDT: "
 
@@ -250,8 +251,8 @@ MODULE_DESCRIPTION("DaVinci Watchdog Driver");
 module_param(heartbeat, int, 0);
 MODULE_PARM_DESC(heartbeat,
 		 "Watchdog heartbeat period in seconds from 1 to "
-		 __MODULE_STRING(MAX_HEARTBEAT) ", default "
-		 __MODULE_STRING(DEFAULT_HEARTBEAT));
+		 __stringify(MAX_HEARTBEAT) ", default "
+		 __stringify(DEFAULT_HEARTBEAT));
 
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("platform:davinci-wdt");
diff --git a/drivers/watchdog/db8500_wdt.c b/drivers/watchdog/db8500_wdt.c
index 70ccea13288d8..7e11c28997ec6 100644
--- a/drivers/watchdog/db8500_wdt.c
+++ b/drivers/watchdog/db8500_wdt.c
@@ -15,6 +15,7 @@
 #include <linux/uaccess.h>
 #include <linux/watchdog.h>
 #include <linux/platform_device.h>
+#include <linux/stringify.h>
 
 #include <linux/mfd/db8500-prcmu.h>
 
@@ -27,13 +28,13 @@ static unsigned int timeout = WATCHDOG_TIMEOUT;
 module_param(timeout, uint, 0);
 MODULE_PARM_DESC(timeout,
 	"Watchdog timeout in seconds. default="
-				__MODULE_STRING(WATCHDOG_TIMEOUT) ".");
+				__stringify(WATCHDOG_TIMEOUT) ".");
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 	"Watchdog cannot be stopped once started (default="
-				__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+				__stringify(WATCHDOG_NOWAYOUT) ")");
 
 static int db8500_wdt_start(struct watchdog_device *wdd)
 {
diff --git a/drivers/watchdog/dw_wdt.c b/drivers/watchdog/dw_wdt.c
index 39031445d754b..c1d40d7b2165f 100644
--- a/drivers/watchdog/dw_wdt.c
+++ b/drivers/watchdog/dw_wdt.c
@@ -27,6 +27,7 @@
 #include <linux/platform_device.h>
 #include <linux/pm.h>
 #include <linux/reset.h>
+#include <linux/stringify.h>
 #include <linux/watchdog.h>
 
 #define WDOG_CONTROL_REG_OFFSET		    0x00
@@ -66,7 +67,7 @@ static const u32 dw_wdt_fix_tops[DW_WDT_NUM_TOPS] = {
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started "
-		 "(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+		 "(default=" __stringify(WATCHDOG_NOWAYOUT) ")");
 
 enum dw_wdt_rmod {
 	DW_WDT_RMOD_RESET = 1,
diff --git a/drivers/watchdog/ebc-c384_wdt.c b/drivers/watchdog/ebc-c384_wdt.c
index 8ef4b0df3855f..39cc1f7e1cdb0 100644
--- a/drivers/watchdog/ebc-c384_wdt.c
+++ b/drivers/watchdog/ebc-c384_wdt.c
@@ -13,6 +13,7 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/types.h>
+#include <linux/stringify.h>
 #include <linux/watchdog.h>
 
 #define MODULE_NAME		"ebc-c384_wdt"
@@ -30,12 +31,12 @@
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
-	__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+	__stringify(WATCHDOG_NOWAYOUT) ")");
 
 static unsigned timeout;
 module_param(timeout, uint, 0);
 MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds (default="
-	__MODULE_STRING(WATCHDOG_TIMEOUT) ")");
+	__stringify(WATCHDOG_TIMEOUT) ")");
 
 static int ebc_c384_wdt_start(struct watchdog_device *wdev)
 {
diff --git a/drivers/watchdog/eurotechwdt.c b/drivers/watchdog/eurotechwdt.c
index 10c647b1226af..4d671c4e148af 100644
--- a/drivers/watchdog/eurotechwdt.c
+++ b/drivers/watchdog/eurotechwdt.c
@@ -56,6 +56,7 @@
 #include <linux/init.h>
 #include <linux/io.h>
 #include <linux/uaccess.h>
+#include <linux/stringify.h>
 
 
 static unsigned long eurwdt_is_open;
@@ -77,7 +78,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 		"Watchdog cannot be stopped once started (default="
-				__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+				__stringify(WATCHDOG_NOWAYOUT) ")");
 
 /*
  * Some symbolic names
diff --git a/drivers/watchdog/exar_wdt.c b/drivers/watchdog/exar_wdt.c
index db62c9797406f..553be158a7252 100644
--- a/drivers/watchdog/exar_wdt.c
+++ b/drivers/watchdog/exar_wdt.c
@@ -14,6 +14,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
+#include <linux/stringify.h>
 #include <linux/watchdog.h>
 
 #define DRV_NAME	"exar_wdt"
@@ -70,13 +71,13 @@ static int timeout = WATCHDOG_TIMEOUT;
 module_param(timeout, int, 0);
 MODULE_PARM_DESC(timeout,
 		 "Watchdog timeout in seconds. 1<=timeout<=15300, default="
-		 __MODULE_STRING(WATCHDOG_TIMEOUT) ".");
+		 __stringify(WATCHDOG_TIMEOUT) ".");
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 		 "Watchdog cannot be stopped once started (default="
-		 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+		 __stringify(WATCHDOG_NOWAYOUT) ")");
 
 static int exar_sio_enter(const unsigned short config_port,
 			  const unsigned char key)
diff --git a/drivers/watchdog/f71808e_wdt.c b/drivers/watchdog/f71808e_wdt.c
index 6a16d3d0bb1e6..2790061a68f34 100644
--- a/drivers/watchdog/f71808e_wdt.c
+++ b/drivers/watchdog/f71808e_wdt.c
@@ -14,6 +14,7 @@
 #include <linux/ioport.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
+#include <linux/stringify.h>
 #include <linux/watchdog.h>
 
 #define DRVNAME "f71808e_wdt"
@@ -81,20 +82,20 @@ static int timeout = WATCHDOG_TIMEOUT;	/* default timeout in seconds */
 module_param(timeout, int, 0);
 MODULE_PARM_DESC(timeout,
 	"Watchdog timeout in seconds. 1<= timeout <="
-			__MODULE_STRING(WATCHDOG_MAX_TIMEOUT) " (default="
-			__MODULE_STRING(WATCHDOG_TIMEOUT) ")");
+			__stringify(WATCHDOG_MAX_TIMEOUT) " (default="
+			__stringify(WATCHDOG_TIMEOUT) ")");
 
 static unsigned int pulse_width = WATCHDOG_PULSE_WIDTH;
 module_param(pulse_width, uint, 0);
 MODULE_PARM_DESC(pulse_width,
 	"Watchdog signal pulse width. 0(=level), 1, 25, 30, 125, 150, 5000 or 6000 ms"
-			" (default=" __MODULE_STRING(WATCHDOG_PULSE_WIDTH) ")");
+			" (default=" __stringify(WATCHDOG_PULSE_WIDTH) ")");
 
 static unsigned int f71862fg_pin = WATCHDOG_F71862FG_PIN;
 module_param(f71862fg_pin, uint, 0);
 MODULE_PARM_DESC(f71862fg_pin,
 	"Watchdog f71862fg reset output pin configuration. Choose pin 56 or 63"
-			" (default=" __MODULE_STRING(WATCHDOG_F71862FG_PIN)")");
+			" (default=" __stringify(WATCHDOG_F71862FG_PIN)")");
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0444);
diff --git a/drivers/watchdog/gef_wdt.c b/drivers/watchdog/gef_wdt.c
index bf6f733dfb5f7..4d39588a49c32 100644
--- a/drivers/watchdog/gef_wdt.c
+++ b/drivers/watchdog/gef_wdt.c
@@ -34,6 +34,7 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/uaccess.h>
+#include <linux/stringify.h>
 
 #include <sysdev/fsl_soc.h>
 
@@ -70,7 +71,7 @@ static DEFINE_SPINLOCK(gef_wdt_spinlock);
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
-	__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+	__stringify(WATCHDOG_NOWAYOUT) ")");
 
 
 static int gef_wdt_toggle_wdc(int enabled_predicate, int field_shift)
diff --git a/drivers/watchdog/geodewdt.c b/drivers/watchdog/geodewdt.c
index 5b80ade1c6814..437cc0a536545 100644
--- a/drivers/watchdog/geodewdt.c
+++ b/drivers/watchdog/geodewdt.c
@@ -16,6 +16,7 @@
 #include <linux/platform_device.h>
 #include <linux/reboot.h>
 #include <linux/uaccess.h>
+#include <linux/stringify.h>
 
 #include <linux/cs5535.h>
 
@@ -34,13 +35,13 @@ static int timeout = WATCHDOG_TIMEOUT;
 module_param(timeout, int, 0);
 MODULE_PARM_DESC(timeout,
 	"Watchdog timeout in seconds. 1<= timeout <=131, default="
-				__MODULE_STRING(WATCHDOG_TIMEOUT) ".");
+				__stringify(WATCHDOG_TIMEOUT) ".");
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 	"Watchdog cannot be stopped once started (default="
-				__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+				__stringify(WATCHDOG_NOWAYOUT) ")");
 
 static struct platform_device *geodewdt_platform_device;
 static unsigned long wdt_flags;
diff --git a/drivers/watchdog/gpio_wdt.c b/drivers/watchdog/gpio_wdt.c
index 1abc7d0b78a62..2cd79c8f60dcd 100644
--- a/drivers/watchdog/gpio_wdt.c
+++ b/drivers/watchdog/gpio_wdt.c
@@ -11,13 +11,14 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
+#include <linux/stringify.h>
 #include <linux/watchdog.h>
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 		"Watchdog cannot be stopped once started (default="
-				__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+				__stringify(WATCHDOG_NOWAYOUT) ")");
 
 #define SOFT_TIMEOUT_MIN	1
 #define SOFT_TIMEOUT_DEF	60
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
index 8af1fad2de0bd..7b9eb4e4b6e7c 100644
--- a/drivers/watchdog/hpwdt.c
+++ b/drivers/watchdog/hpwdt.c
@@ -20,6 +20,7 @@
 #include <linux/pci.h>
 #include <linux/pci_ids.h>
 #include <linux/types.h>
+#include <linux/stringify.h>
 #include <linux/watchdog.h>
 #ifdef CONFIG_HPWDT_NMI_DECODING
 #include <asm/nmi.h>
@@ -432,7 +433,7 @@ MODULE_PARM_DESC(timeout, "Alias of soft_margin");
 
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
-		__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+		__stringify(WATCHDOG_NOWAYOUT) ")");
 
 module_param(kdumptimeout, int, 0444);
 MODULE_PARM_DESC(kdumptimeout, "Timeout applied for crash kernel transition in seconds");
diff --git a/drivers/watchdog/i6300esb.c b/drivers/watchdog/i6300esb.c
index a30835f547b32..006d263cf1356 100644
--- a/drivers/watchdog/i6300esb.c
+++ b/drivers/watchdog/i6300esb.c
@@ -37,6 +37,7 @@
 #include <linux/ioport.h>
 #include <linux/uaccess.h>
 #include <linux/io.h>
+#include <linux/stringify.h>
 
 /* Module and version information */
 #define ESB_MODULE_NAME "i6300ESB timer"
@@ -74,19 +75,19 @@
 #define ESB_HEARTBEAT_MIN	1
 #define ESB_HEARTBEAT_MAX	2046
 #define ESB_HEARTBEAT_DEFAULT	30
-#define ESB_HEARTBEAT_RANGE __MODULE_STRING(ESB_HEARTBEAT_MIN) \
-	"<heartbeat<" __MODULE_STRING(ESB_HEARTBEAT_MAX)
+#define ESB_HEARTBEAT_RANGE __stringify(ESB_HEARTBEAT_MIN) \
+	"<heartbeat<" __stringify(ESB_HEARTBEAT_MAX)
 static int heartbeat; /* in seconds */
 module_param(heartbeat, int, 0);
 MODULE_PARM_DESC(heartbeat,
 	"Watchdog heartbeat in seconds. (" ESB_HEARTBEAT_RANGE
-	", default=" __MODULE_STRING(ESB_HEARTBEAT_DEFAULT) ")");
+	", default=" __stringify(ESB_HEARTBEAT_DEFAULT) ")");
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 		"Watchdog cannot be stopped once started (default="
-				__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+				__stringify(WATCHDOG_NOWAYOUT) ")");
 
 /* internal variables */
 struct esb_dev {
diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c
index 1dec9cd155b11..0a8bf28f57688 100644
--- a/drivers/watchdog/iTCO_wdt.c
+++ b/drivers/watchdog/iTCO_wdt.c
@@ -60,6 +60,7 @@
 #include <linux/ioport.h>		/* For io-port access */
 #include <linux/uaccess.h>		/* For copy_to_user/put_user/... */
 #include <linux/io.h>			/* For inb/outb/... */
+#include <linux/stringify.h>		/* For __stringify */
 #include <linux/platform_data/itco_wdt.h>
 #include <linux/mfd/intel_pmc_bxt.h>
 
@@ -115,13 +116,13 @@ static int heartbeat = WATCHDOG_TIMEOUT;  /* in seconds */
 module_param(heartbeat, int, 0);
 MODULE_PARM_DESC(heartbeat, "Watchdog timeout in seconds. "
 	"5..76 (TCO v1) or 3..614 (TCO v2), default="
-				__MODULE_STRING(WATCHDOG_TIMEOUT) ")");
+				__stringify(WATCHDOG_TIMEOUT) ")");
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 	"Watchdog cannot be stopped once started (default="
-				__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+				__stringify(WATCHDOG_NOWAYOUT) ")");
 
 static int turn_SMI_watchdog_clear_off = 1;
 module_param(turn_SMI_watchdog_clear_off, int, 0);
diff --git a/drivers/watchdog/ib700wdt.c b/drivers/watchdog/ib700wdt.c
index 5ce6101d236d7..3806d86eb36ad 100644
--- a/drivers/watchdog/ib700wdt.c
+++ b/drivers/watchdog/ib700wdt.c
@@ -41,6 +41,7 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/uaccess.h>
+#include <linux/stringify.h>
 
 
 static struct platform_device *ibwdt_platform_device;
@@ -96,13 +97,13 @@ static int timeout = WATCHDOG_TIMEOUT;	/* in seconds */
 module_param(timeout, int, 0);
 MODULE_PARM_DESC(timeout,
 	"Watchdog timeout in seconds. 0<= timeout <=30, default="
-		__MODULE_STRING(WATCHDOG_TIMEOUT) ".");
+		__stringify(WATCHDOG_TIMEOUT) ".");
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 		"Watchdog cannot be stopped once started (default="
-				__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+				__stringify(WATCHDOG_NOWAYOUT) ")");
 
 
 /*
diff --git a/drivers/watchdog/ibmasr.c b/drivers/watchdog/ibmasr.c
index cf845f865945d..53bd84e6d57f1 100644
--- a/drivers/watchdog/ibmasr.c
+++ b/drivers/watchdog/ibmasr.c
@@ -21,6 +21,7 @@
 #include <linux/dmi.h>
 #include <linux/io.h>
 #include <linux/uaccess.h>
+#include <linux/stringify.h>
 
 
 enum {
@@ -413,7 +414,7 @@ module_exit(ibmasr_exit);
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 	"Watchdog cannot be stopped once started (default="
-				__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+				__stringify(WATCHDOG_NOWAYOUT) ")");
 
 MODULE_DESCRIPTION("IBM Automatic Server Restart driver");
 MODULE_AUTHOR("Andrey Panin");
diff --git a/drivers/watchdog/ie6xx_wdt.c b/drivers/watchdog/ie6xx_wdt.c
index 5a7bb7e84653f..eda515b917cc4 100644
--- a/drivers/watchdog/ie6xx_wdt.c
+++ b/drivers/watchdog/ie6xx_wdt.c
@@ -17,6 +17,7 @@
 #include <linux/debugfs.h>
 #include <linux/uaccess.h>
 #include <linux/spinlock.h>
+#include <linux/stringify.h>
 
 #define DRIVER_NAME "ie6xx_wdt"
 
@@ -49,14 +50,14 @@ static unsigned int timeout = DEFAULT_TIME;
 module_param(timeout, uint, 0);
 MODULE_PARM_DESC(timeout,
 		"Default Watchdog timer setting ("
-		__MODULE_STRING(DEFAULT_TIME) "s)."
+		__stringify(DEFAULT_TIME) "s)."
 		"The range is from 1 to 600");
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 	"Watchdog cannot be stopped once started (default="
-		__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+		__stringify(WATCHDOG_NOWAYOUT) ")");
 
 static u8 resetmode = 0x10;
 module_param(resetmode, byte, 0);
diff --git a/drivers/watchdog/imgpdc_wdt.c b/drivers/watchdog/imgpdc_wdt.c
index 65cc8396aa595..bb6227c40de43 100644
--- a/drivers/watchdog/imgpdc_wdt.c
+++ b/drivers/watchdog/imgpdc_wdt.c
@@ -43,6 +43,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
+#include <linux/stringify.h>
 #include <linux/watchdog.h>
 
 /* registers */
@@ -71,12 +72,12 @@
 static int heartbeat;
 module_param(heartbeat, int, 0);
 MODULE_PARM_DESC(heartbeat, "Watchdog heartbeats in seconds "
-	"(default=" __MODULE_STRING(PDC_WDT_DEF_TIMEOUT) ")");
+	"(default=" __stringify(PDC_WDT_DEF_TIMEOUT) ")");
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started "
-	"(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+	"(default=" __stringify(WATCHDOG_NOWAYOUT) ")");
 
 struct pdc_wdt_dev {
 	struct watchdog_device wdt_dev;
diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c
index 4b3a192ee3e82..58aa5f999f4fe 100644
--- a/drivers/watchdog/imx2_wdt.c
+++ b/drivers/watchdog/imx2_wdt.c
@@ -29,6 +29,7 @@
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
+#include <linux/stringify.h>
 #include <linux/watchdog.h>
 
 #define DRIVER_NAME "imx2-wdt"
@@ -79,12 +80,12 @@ struct imx2_wdt_device {
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
-				__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+				__stringify(WATCHDOG_NOWAYOUT) ")");
 
 static unsigned timeout;
 module_param(timeout, uint, 0);
 MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds (default="
-				__MODULE_STRING(IMX2_WDT_DEFAULT_TIME) ")");
+				__stringify(IMX2_WDT_DEFAULT_TIME) ")");
 
 static const struct watchdog_info imx2_wdt_info = {
 	.identity = "imx2+ watchdog",
diff --git a/drivers/watchdog/imx7ulp_wdt.c b/drivers/watchdog/imx7ulp_wdt.c
index 855dc9d5083a5..f61936194aea8 100644
--- a/drivers/watchdog/imx7ulp_wdt.c
+++ b/drivers/watchdog/imx7ulp_wdt.c
@@ -11,6 +11,7 @@
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/reboot.h>
+#include <linux/stringify.h>
 #include <linux/watchdog.h>
 
 #define WDOG_CS			0x0
@@ -51,7 +52,7 @@
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0000);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
-		 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+		 __stringify(WATCHDOG_NOWAYOUT) ")");
 
 struct imx_wdt_hw_feature {
 	bool prescaler_enable;
diff --git a/drivers/watchdog/imx_sc_wdt.c b/drivers/watchdog/imx_sc_wdt.c
index 1280b9b1ec2ac..fc39f9db4c06f 100644
--- a/drivers/watchdog/imx_sc_wdt.c
+++ b/drivers/watchdog/imx_sc_wdt.c
@@ -11,6 +11,7 @@
 #include <linux/moduleparam.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
+#include <linux/stringify.h>
 #include <linux/watchdog.h>
 
 #define DEFAULT_TIMEOUT 60
@@ -39,7 +40,7 @@
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0000);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
-		 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+		 __stringify(WATCHDOG_NOWAYOUT) ")");
 
 struct imx_sc_wdt_device {
 	struct watchdog_device wdd;
diff --git a/drivers/watchdog/indydog.c b/drivers/watchdog/indydog.c
index d3092d2613452..5268b1feb7ce7 100644
--- a/drivers/watchdog/indydog.c
+++ b/drivers/watchdog/indydog.c
@@ -22,6 +22,7 @@
 #include <linux/reboot.h>
 #include <linux/init.h>
 #include <linux/uaccess.h>
+#include <linux/stringify.h>
 #include <asm/sgi/mc.h>
 
 static unsigned long indydog_alive;
@@ -33,7 +34,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 		"Watchdog cannot be stopped once started (default="
-				__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+				__stringify(WATCHDOG_NOWAYOUT) ")");
 
 static void indydog_start(void)
 {
diff --git a/drivers/watchdog/intel_oc_wdt.c b/drivers/watchdog/intel_oc_wdt.c
index a39892c10770e..d1e9a3f62369f 100644
--- a/drivers/watchdog/intel_oc_wdt.c
+++ b/drivers/watchdog/intel_oc_wdt.c
@@ -14,6 +14,7 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/platform_device.h>
+#include <linux/stringify.h>
 #include <linux/watchdog.h>
 
 #define INTEL_OC_WDT_TOV		GENMASK(9, 0)
@@ -48,12 +49,12 @@ struct intel_oc_wdt {
 static int heartbeat;
 module_param(heartbeat, uint, 0);
 MODULE_PARM_DESC(heartbeat, "Watchdog heartbeats in seconds. (default="
-		 __MODULE_STRING(WDT_HEARTBEAT) ")");
+		 __stringify(WDT_HEARTBEAT) ")");
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
-		 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+		 __stringify(WATCHDOG_NOWAYOUT) ")");
 
 static int intel_oc_wdt_start(struct watchdog_device *wdd)
 {
diff --git a/drivers/watchdog/it87_wdt.c b/drivers/watchdog/it87_wdt.c
index 1d9f8591f38d8..087250ab036a9 100644
--- a/drivers/watchdog/it87_wdt.c
+++ b/drivers/watchdog/it87_wdt.c
@@ -29,6 +29,7 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/printk.h>
+#include <linux/stringify.h>
 #include <linux/types.h>
 #include <linux/watchdog.h>
 
@@ -105,13 +106,13 @@ static bool nowayout = DEFAULT_NOWAYOUT;
 
 module_param(timeout, int, 0);
 MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds, default="
-		__MODULE_STRING(DEFAULT_TIMEOUT));
+		__stringify(DEFAULT_TIMEOUT));
 module_param(testmode, int, 0);
 MODULE_PARM_DESC(testmode, "Watchdog test mode (1 = no reboot), default="
-		__MODULE_STRING(DEFAULT_TESTMODE));
+		__stringify(DEFAULT_TESTMODE));
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started, default="
-		__MODULE_STRING(WATCHDOG_NOWAYOUT));
+		__stringify(WATCHDOG_NOWAYOUT));
 
 /* Superio Chip */
 
diff --git a/drivers/watchdog/jz4740_wdt.c b/drivers/watchdog/jz4740_wdt.c
index 395bde79e2920..9dec1b8224101 100644
--- a/drivers/watchdog/jz4740_wdt.c
+++ b/drivers/watchdog/jz4740_wdt.c
@@ -19,6 +19,7 @@
 #include <linux/err.h>
 #include <linux/of.h>
 #include <linux/regmap.h>
+#include <linux/stringify.h>
 
 #define DEFAULT_HEARTBEAT 5
 #define MAX_HEARTBEAT     2048
@@ -27,14 +28,14 @@ static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 		 "Watchdog cannot be stopped once started (default="
-		 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+		 __stringify(WATCHDOG_NOWAYOUT) ")");
 
 static unsigned int heartbeat = DEFAULT_HEARTBEAT;
 module_param(heartbeat, uint, 0);
 MODULE_PARM_DESC(heartbeat,
 		"Watchdog heartbeat period in seconds from 1 to "
-		__MODULE_STRING(MAX_HEARTBEAT) ", default "
-		__MODULE_STRING(DEFAULT_HEARTBEAT));
+		__stringify(MAX_HEARTBEAT) ", default "
+		__stringify(DEFAULT_HEARTBEAT));
 
 struct jz4740_wdt_drvdata {
 	struct watchdog_device wdt;
diff --git a/drivers/watchdog/keembay_wdt.c b/drivers/watchdog/keembay_wdt.c
index 7c8e53921e407..11b4b26f7b88e 100644
--- a/drivers/watchdog/keembay_wdt.c
+++ b/drivers/watchdog/keembay_wdt.c
@@ -14,6 +14,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/reboot.h>
+#include <linux/stringify.h>
 #include <linux/watchdog.h>
 
 /* Non-secure watchdog register offsets */
@@ -39,12 +40,12 @@
 static unsigned int timeout = WDT_TIMEOUT;
 module_param(timeout, int, 0);
 MODULE_PARM_DESC(timeout, "Watchdog timeout period in seconds (default = "
-		 __MODULE_STRING(WDT_TIMEOUT) ")");
+		 __stringify(WDT_TIMEOUT) ")");
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default = "
-		 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+		 __stringify(WATCHDOG_NOWAYOUT) ")");
 
 struct keembay_wdt {
 	struct watchdog_device	wdd;
diff --git a/drivers/watchdog/kempld_wdt.c b/drivers/watchdog/kempld_wdt.c
index e6c7a29066804..b4cde48d2b10a 100644
--- a/drivers/watchdog/kempld_wdt.c
+++ b/drivers/watchdog/kempld_wdt.c
@@ -21,6 +21,7 @@
 #include <linux/uaccess.h>
 #include <linux/watchdog.h>
 #include <linux/platform_device.h>
+#include <linux/stringify.h>
 #include <linux/mfd/kempld.h>
 
 #define KEMPLD_WDT_STAGE_TIMEOUT(x)	(0x1b + (x) * 4)
@@ -85,19 +86,19 @@ static unsigned int timeout = DEFAULT_TIMEOUT;
 module_param(timeout, uint, 0);
 MODULE_PARM_DESC(timeout,
 	"Watchdog timeout in seconds. (>=0, default="
-	__MODULE_STRING(DEFAULT_TIMEOUT) ")");
+	__stringify(DEFAULT_TIMEOUT) ")");
 
 static unsigned int pretimeout = DEFAULT_PRETIMEOUT;
 module_param(pretimeout, uint, 0);
 MODULE_PARM_DESC(pretimeout,
 	"Watchdog pretimeout in seconds. (>=0, default="
-	__MODULE_STRING(DEFAULT_PRETIMEOUT) ")");
+	__stringify(DEFAULT_PRETIMEOUT) ")");
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 	"Watchdog cannot be stopped once started (default="
-	__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+	__stringify(WATCHDOG_NOWAYOUT) ")");
 
 static int kempld_wdt_set_stage_action(struct kempld_wdt_data *wdt_data,
 					struct kempld_wdt_stage *stage,
diff --git a/drivers/watchdog/lenovo_se10_wdt.c b/drivers/watchdog/lenovo_se10_wdt.c
index 503e220263f95..1eaf86c85cc0e 100644
--- a/drivers/watchdog/lenovo_se10_wdt.c
+++ b/drivers/watchdog/lenovo_se10_wdt.c
@@ -10,6 +10,7 @@
 #include <linux/moduleparam.h>
 #include <linux/platform_device.h>
 #include <linux/string.h>
+#include <linux/stringify.h>
 #include <linux/types.h>
 #include <linux/watchdog.h>
 
@@ -48,13 +49,13 @@ static int timeout; /* in seconds */
 module_param(timeout, int, 0);
 MODULE_PARM_DESC(timeout,
 		 "Watchdog timeout in seconds. 1 <= timeout <= 255, default="
-		 __MODULE_STRING(WATCHDOG_TIMEOUT) ".");
+		 __stringify(WATCHDOG_TIMEOUT) ".");
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 		 "Watchdog cannot be stopped once started (default="
-		 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+		 __stringify(WATCHDOG_NOWAYOUT) ")");
 
 struct se10_wdt {
 	struct watchdog_device wdd;
diff --git a/drivers/watchdog/lenovo_se30_wdt.c b/drivers/watchdog/lenovo_se30_wdt.c
index 1c73bb7eeeeed..127ea9a1933ff 100644
--- a/drivers/watchdog/lenovo_se30_wdt.c
+++ b/drivers/watchdog/lenovo_se30_wdt.c
@@ -13,6 +13,7 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/platform_device.h>
+#include <linux/stringify.h>
 #include <linux/watchdog.h>
 
 #define IOREGION_OFFSET	4 /* Use EC port 1 */
@@ -28,13 +29,13 @@ static int timeout; /* in seconds */
 module_param(timeout, int, 0);
 MODULE_PARM_DESC(timeout,
 		 "Watchdog timeout in seconds. 1 <= timeout <= 255, default="
-		 __MODULE_STRING(WATCHDOG_TIMEOUT) ".");
+		 __stringify(WATCHDOG_TIMEOUT) ".");
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 		 "Watchdog cannot be stopped once started (default="
-		 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+		 __stringify(WATCHDOG_NOWAYOUT) ")");
 
 #define LNV_SE30_NAME	"lenovo-se30-wdt"
 #define LNV_SE30_ID	0x0110
diff --git a/drivers/watchdog/lenovo_se30g2_se60_wdt.c b/drivers/watchdog/lenovo_se30g2_se60_wdt.c
index f31ecdb82ad05..c87abdb1a1b2d 100644
--- a/drivers/watchdog/lenovo_se30g2_se60_wdt.c
+++ b/drivers/watchdog/lenovo_se30g2_se60_wdt.c
@@ -10,6 +10,7 @@
 #include <linux/moduleparam.h>
 #include <linux/platform_device.h>
 #include <linux/string.h>
+#include <linux/stringify.h>
 #include <linux/types.h>
 #include <linux/watchdog.h>
 
@@ -37,13 +38,13 @@ static int timeout; /* in seconds */
 module_param(timeout, int, 0);
 MODULE_PARM_DESC(timeout,
 		 "Watchdog timeout in seconds. 1 <= timeout <= 255, default="
-		 __MODULE_STRING(WATCHDOG_TIMEOUT) ".");
+		 __stringify(WATCHDOG_TIMEOUT) ".");
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 		 "Watchdog cannot be stopped once started (default="
-		 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+		 __stringify(WATCHDOG_NOWAYOUT) ")");
 
 struct se_30g2_60_wdt {
 	struct watchdog_device wdd;
diff --git a/drivers/watchdog/loongson1_wdt.c b/drivers/watchdog/loongson1_wdt.c
index 2417519717cc4..7f8de11f1b4ab 100644
--- a/drivers/watchdog/loongson1_wdt.c
+++ b/drivers/watchdog/loongson1_wdt.c
@@ -9,6 +9,7 @@
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
+#include <linux/stringify.h>
 #include <linux/watchdog.h>
 
 /* Loongson Watchdog Register Definitions */
@@ -19,12 +20,12 @@
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
-		 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+		 __stringify(WATCHDOG_NOWAYOUT) ")");
 
 static unsigned int heartbeat;
 module_param(heartbeat, uint, 0);
 MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. (default="
-		 __MODULE_STRING(DEFAULT_HEARTBEAT) ")");
+		 __stringify(DEFAULT_HEARTBEAT) ")");
 
 struct ls1x_wdt_pdata {
 	u32 timer_offset;
diff --git a/drivers/watchdog/lpc18xx_wdt.c b/drivers/watchdog/lpc18xx_wdt.c
index 3e8e80bbcb93b..633119e4b126d 100644
--- a/drivers/watchdog/lpc18xx_wdt.c
+++ b/drivers/watchdog/lpc18xx_wdt.c
@@ -15,6 +15,7 @@
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
+#include <linux/stringify.h>
 #include <linux/watchdog.h>
 
 /* Registers */
@@ -41,12 +42,12 @@
 static int heartbeat;
 module_param(heartbeat, int, 0);
 MODULE_PARM_DESC(heartbeat, "Watchdog heartbeats in seconds (default="
-		 __MODULE_STRING(LPC18XX_WDT_DEF_TIMEOUT) ")");
+		 __stringify(LPC18XX_WDT_DEF_TIMEOUT) ")");
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
-		 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+		 __stringify(WATCHDOG_NOWAYOUT) ")");
 
 struct lpc18xx_wdt_dev {
 	struct watchdog_device	wdt_dev;
diff --git a/drivers/watchdog/ma35d1_wdt.c b/drivers/watchdog/ma35d1_wdt.c
index 119d58f338bf0..ede4bee594f1f 100644
--- a/drivers/watchdog/ma35d1_wdt.c
+++ b/drivers/watchdog/ma35d1_wdt.c
@@ -20,6 +20,7 @@
 #include <linux/platform_device.h>
 #include <linux/pm_wakeirq.h>
 #include <linux/property.h>
+#include <linux/stringify.h>
 #include <linux/types.h>
 #include <linux/watchdog.h>
 
@@ -355,7 +356,7 @@ MODULE_PARM_DESC(timeout, "Watchdog heartbeat in seconds");
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(
 	nowayout,
-	"Watchdog cannot be stopped once started (default=" __MODULE_STRING(
+	"Watchdog cannot be stopped once started (default=" __stringify(
 		WATCHDOG_NOWAYOUT) ")");
 
 MODULE_AUTHOR("Zi-Yu Chen <zychennvt@gmail.com>");
diff --git a/drivers/watchdog/max63xx_wdt.c b/drivers/watchdog/max63xx_wdt.c
index e9073df1a7de3..aefda26bbcec9 100644
--- a/drivers/watchdog/max63xx_wdt.c
+++ b/drivers/watchdog/max63xx_wdt.c
@@ -23,6 +23,7 @@
 #include <linux/io.h>
 #include <linux/slab.h>
 #include <linux/property.h>
+#include <linux/stringify.h>
 
 #define DEFAULT_HEARTBEAT 60
 #define MAX_HEARTBEAT     60
@@ -283,12 +284,12 @@ MODULE_DESCRIPTION("max63xx Watchdog Driver");
 module_param(heartbeat, int, 0);
 MODULE_PARM_DESC(heartbeat,
 		 "Watchdog heartbeat period in seconds from 1 to "
-		 __MODULE_STRING(MAX_HEARTBEAT) ", default "
-		 __MODULE_STRING(DEFAULT_HEARTBEAT));
+		 __stringify(MAX_HEARTBEAT) ", default "
+		 __stringify(DEFAULT_HEARTBEAT));
 
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
-		 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+		 __stringify(WATCHDOG_NOWAYOUT) ")");
 
 module_param(nodelay, int, 0);
 MODULE_PARM_DESC(nodelay,
diff --git a/drivers/watchdog/max77620_wdt.c b/drivers/watchdog/max77620_wdt.c
index ed5a98cea525d..79148cbad4f26 100644
--- a/drivers/watchdog/max77620_wdt.c
+++ b/drivers/watchdog/max77620_wdt.c
@@ -18,6 +18,7 @@
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
 #include <linux/slab.h>
+#include <linux/stringify.h>
 #include <linux/watchdog.h>
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
@@ -255,7 +256,7 @@ MODULE_DESCRIPTION("Max77620 watchdog timer driver");
 
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started "
-	"(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+	"(default=" __stringify(WATCHDOG_NOWAYOUT) ")");
 
 MODULE_AUTHOR("Laxman Dewangan <ldewangan@nvidia.com>");
 MODULE_AUTHOR("Luca Ceresoli <luca.ceresoli@bootlin.com>");
diff --git a/drivers/watchdog/mena21_wdt.c b/drivers/watchdog/mena21_wdt.c
index 99d2359d5a8a7..a762462c25c54 100644
--- a/drivers/watchdog/mena21_wdt.c
+++ b/drivers/watchdog/mena21_wdt.c
@@ -17,6 +17,7 @@
 #include <linux/delay.h>
 #include <linux/bitops.h>
 #include <linux/of.h>
+#include <linux/stringify.h>
 
 #define NUM_GPIOS 6
 
@@ -37,7 +38,7 @@ struct a21_wdt_drv {
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
-			    __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+			    __stringify(WATCHDOG_NOWAYOUT) ")");
 
 static unsigned int a21_wdt_get_bootstatus(struct a21_wdt_drv *drv)
 {
diff --git a/drivers/watchdog/menf21bmc_wdt.c b/drivers/watchdog/menf21bmc_wdt.c
index 81ebdfc371f4d..bb8eda18fbad6 100644
--- a/drivers/watchdog/menf21bmc_wdt.c
+++ b/drivers/watchdog/menf21bmc_wdt.c
@@ -11,6 +11,7 @@
 #include <linux/watchdog.h>
 #include <linux/platform_device.h>
 #include <linux/i2c.h>
+#include <linux/stringify.h>
 
 #define DEVNAME "menf21bmc_wdt"
 
@@ -28,7 +29,7 @@
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
-				__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+				__stringify(WATCHDOG_NOWAYOUT) ")");
 
 struct menf21bmc_wdt {
 	struct watchdog_device wdt;
diff --git a/drivers/watchdog/menz69_wdt.c b/drivers/watchdog/menz69_wdt.c
index 3fe23451135d7..962c6867bc073 100644
--- a/drivers/watchdog/menz69_wdt.c
+++ b/drivers/watchdog/menz69_wdt.c
@@ -8,6 +8,7 @@
 #include <linux/kernel.h>
 #include <linux/mcb.h>
 #include <linux/module.h>
+#include <linux/stringify.h>
 #include <linux/watchdog.h>
 
 struct men_z069_drv {
@@ -29,7 +30,7 @@ struct men_z069_drv {
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
-			    __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+			    __stringify(WATCHDOG_NOWAYOUT) ")");
 
 static int men_z069_wdt_start(struct watchdog_device *wdt)
 {
diff --git a/drivers/watchdog/meson_gxbb_wdt.c b/drivers/watchdog/meson_gxbb_wdt.c
index a48622d11ad72..fb276060e8314 100644
--- a/drivers/watchdog/meson_gxbb_wdt.c
+++ b/drivers/watchdog/meson_gxbb_wdt.c
@@ -11,6 +11,7 @@
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
+#include <linux/stringify.h>
 #include <linux/types.h>
 #include <linux/watchdog.h>
 
@@ -31,12 +32,12 @@
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started default="
-		 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+		 __stringify(WATCHDOG_NOWAYOUT) ")");
 
 static unsigned int timeout;
 module_param(timeout, uint, 0);
 MODULE_PARM_DESC(timeout, "Watchdog heartbeat in seconds="
-		 __MODULE_STRING(DEFAULT_TIMEOUT) ")");
+		 __stringify(DEFAULT_TIMEOUT) ")");
 
 struct meson_gxbb_wdt {
 	void __iomem *reg_base;
diff --git a/drivers/watchdog/meson_wdt.c b/drivers/watchdog/meson_wdt.c
index 44db4ebc8599f..80a4f87713359 100644
--- a/drivers/watchdog/meson_wdt.c
+++ b/drivers/watchdog/meson_wdt.c
@@ -15,6 +15,7 @@
 #include <linux/moduleparam.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
+#include <linux/stringify.h>
 #include <linux/types.h>
 #include <linux/watchdog.h>
 
@@ -218,7 +219,7 @@ MODULE_PARM_DESC(timeout, "Watchdog heartbeat in seconds");
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 		 "Watchdog cannot be stopped once started (default="
-		 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+		 __stringify(WATCHDOG_NOWAYOUT) ")");
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Carlo Caione <carlo@caione.org>");
diff --git a/drivers/watchdog/mixcomwd.c b/drivers/watchdog/mixcomwd.c
index 1ecd5c48a005a..db358df2f2228 100644
--- a/drivers/watchdog/mixcomwd.c
+++ b/drivers/watchdog/mixcomwd.c
@@ -52,6 +52,7 @@
 #include <linux/timer.h>
 #include <linux/uaccess.h>
 #include <linux/io.h>
+#include <linux/stringify.h>
 
 /*
  * We have two types of cards that can be probed:
@@ -107,7 +108,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 		"Watchdog cannot be stopped once started (default="
-				__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+				__stringify(WATCHDOG_NOWAYOUT) ")");
 
 static void mixcomwd_ping(void)
 {
diff --git a/drivers/watchdog/mpc8xxx_wdt.c b/drivers/watchdog/mpc8xxx_wdt.c
index a4b497ecfa205..0d5a360b56292 100644
--- a/drivers/watchdog/mpc8xxx_wdt.c
+++ b/drivers/watchdog/mpc8xxx_wdt.c
@@ -22,6 +22,7 @@
 #include <linux/watchdog.h>
 #include <linux/io.h>
 #include <linux/uaccess.h>
+#include <linux/stringify.h>
 #include <sysdev/fsl_soc.h>
 
 #define WATCHDOG_TIMEOUT 10
@@ -57,7 +58,7 @@ static u16 timeout;
 module_param(timeout, ushort, 0);
 MODULE_PARM_DESC(timeout,
 	"Watchdog timeout in seconds. (1<timeout<65535, default="
-	__MODULE_STRING(WATCHDOG_TIMEOUT) ")");
+	__stringify(WATCHDOG_TIMEOUT) ")");
 
 static bool reset = 1;
 module_param(reset, bool, 0);
@@ -67,7 +68,7 @@ MODULE_PARM_DESC(reset,
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started "
-		 "(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+		 "(default=" __stringify(WATCHDOG_NOWAYOUT) ")");
 
 static void mpc8xxx_wdt_keepalive(struct mpc8xxx_wdt_ddata *ddata)
 {
diff --git a/drivers/watchdog/mt7621_wdt.c b/drivers/watchdog/mt7621_wdt.c
index db47b131f7806..9e0ebec43c888 100644
--- a/drivers/watchdog/mt7621_wdt.c
+++ b/drivers/watchdog/mt7621_wdt.c
@@ -16,6 +16,7 @@
 #include <linux/platform_device.h>
 #include <linux/mfd/syscon.h>
 #include <linux/regmap.h>
+#include <linux/stringify.h>
 
 #define SYSC_RSTSTAT			0x38
 #define WDT_RST_CAUSE			BIT(1)
@@ -41,7 +42,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 		 "Watchdog cannot be stopped once started (default="
-		 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+		 __stringify(WATCHDOG_NOWAYOUT) ")");
 
 static inline void rt_wdt_w32(void __iomem *base, unsigned int reg, u32 val)
 {
diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c
index d9c30e4c80e3f..46a83660f0988 100644
--- a/drivers/watchdog/mtk_wdt.c
+++ b/drivers/watchdog/mtk_wdt.c
@@ -31,6 +31,7 @@
 #include <linux/types.h>
 #include <linux/watchdog.h>
 #include <linux/interrupt.h>
+#include <linux/stringify.h>
 
 #define WDT_MAX_TIMEOUT		31
 #define WDT_MIN_TIMEOUT		2
@@ -526,7 +527,7 @@ MODULE_PARM_DESC(timeout, "Watchdog heartbeat in seconds");
 
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
-			__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+			__stringify(WATCHDOG_NOWAYOUT) ")");
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Matthias Brugger <matthias.bgg@gmail.com>");
diff --git a/drivers/watchdog/nct6694_wdt.c b/drivers/watchdog/nct6694_wdt.c
index bc3689bd4b6bb..169a6736e9ea0 100644
--- a/drivers/watchdog/nct6694_wdt.c
+++ b/drivers/watchdog/nct6694_wdt.c
@@ -11,6 +11,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
+#include <linux/stringify.h>
 #include <linux/watchdog.h>
 
 #define DEVICE_NAME "nct6694-wdt"
@@ -50,7 +51,7 @@ MODULE_PARM_DESC(pretimeout, "Watchdog pre-timeout in seconds");
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
-			   __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+			   __stringify(WATCHDOG_NOWAYOUT) ")");
 
 enum {
 	NCT6694_ACTION_NONE = 0,
diff --git a/drivers/watchdog/ni903x_wdt.c b/drivers/watchdog/ni903x_wdt.c
index c72a9ee9cb8e1..68b7c485726b2 100644
--- a/drivers/watchdog/ni903x_wdt.c
+++ b/drivers/watchdog/ni903x_wdt.c
@@ -9,6 +9,7 @@
 #include <linux/io.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
+#include <linux/stringify.h>
 #include <linux/watchdog.h>
 
 #define NIWD_CONTROL	0x01
@@ -46,13 +47,13 @@ static unsigned int timeout;
 module_param(timeout, uint, 0);
 MODULE_PARM_DESC(timeout,
 		 "Watchdog timeout in seconds. (default="
-		 __MODULE_STRING(NIWD_DEFAULT_TIMEOUT) ")");
+		 __stringify(NIWD_DEFAULT_TIMEOUT) ")");
 
 static int nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, int, S_IRUGO);
 MODULE_PARM_DESC(nowayout,
 		 "Watchdog cannot be stopped once started (default="
-		 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+		 __stringify(WATCHDOG_NOWAYOUT) ")");
 
 static void ni903x_start(struct ni903x_wdt *wdt)
 {
diff --git a/drivers/watchdog/nic7018_wdt.c b/drivers/watchdog/nic7018_wdt.c
index 8169423801f06..2b122ba8733a5 100644
--- a/drivers/watchdog/nic7018_wdt.c
+++ b/drivers/watchdog/nic7018_wdt.c
@@ -8,6 +8,7 @@
 #include <linux/io.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
+#include <linux/stringify.h>
 #include <linux/types.h>
 #include <linux/watchdog.h>
 
@@ -34,13 +35,13 @@ static unsigned int timeout;
 module_param(timeout, uint, 0);
 MODULE_PARM_DESC(timeout,
 		 "Watchdog timeout in seconds. (default="
-		 __MODULE_STRING(WDT_DEFAULT_TIMEOUT) ")");
+		 __stringify(WDT_DEFAULT_TIMEOUT) ")");
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 		 "Watchdog cannot be stopped once started. (default="
-		 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+		 __stringify(WATCHDOG_NOWAYOUT) ")");
 
 struct nic7018_wdt {
 	u16 io_base;
diff --git a/drivers/watchdog/nv_tco.c b/drivers/watchdog/nv_tco.c
index f16cee5173d50..0d671b8bb3914 100644
--- a/drivers/watchdog/nv_tco.c
+++ b/drivers/watchdog/nv_tco.c
@@ -32,6 +32,7 @@
 #include <linux/platform_device.h>
 #include <linux/uaccess.h>
 #include <linux/io.h>
+#include <linux/stringify.h>
 
 #include "nv_tco.h"
 
@@ -55,12 +56,12 @@ static struct platform_device *nv_tco_platform_device;
 static int heartbeat = WATCHDOG_HEARTBEAT;  /* in seconds */
 module_param(heartbeat, int, 0);
 MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. (2<heartbeat<39, "
-			    "default=" __MODULE_STRING(WATCHDOG_HEARTBEAT) ")");
+			    "default=" __stringify(WATCHDOG_HEARTBEAT) ")");
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started"
-		" (default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+		" (default=" __stringify(WATCHDOG_NOWAYOUT) ")");
 
 /*
  * Some TCO specific functions
diff --git a/drivers/watchdog/octeon-wdt-main.c b/drivers/watchdog/octeon-wdt-main.c
index 0615bb8160821..171b46d780e6f 100644
--- a/drivers/watchdog/octeon-wdt-main.c
+++ b/drivers/watchdog/octeon-wdt-main.c
@@ -55,6 +55,7 @@
 #include <linux/cpu.h>
 #include <linux/irq.h>
 #include <linux/irqdomain.h>
+#include <linux/stringify.h>
 
 #include <asm/mipsregs.h>
 #include <asm/uasm.h>
@@ -93,13 +94,13 @@ static int heartbeat = WD_TIMO;
 module_param(heartbeat, int, 0444);
 MODULE_PARM_DESC(heartbeat,
 	"Watchdog heartbeat in seconds. (0 < heartbeat, default="
-				__MODULE_STRING(WD_TIMO) ")");
+				__stringify(WD_TIMO) ")");
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0444);
 MODULE_PARM_DESC(nowayout,
 	"Watchdog cannot be stopped once started (default="
-				__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+				__stringify(WATCHDOG_NOWAYOUT) ")");
 
 static int disable;
 module_param(disable, int, 0444);
diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
index 95c7e44b7baac..2a6de73e6f0b3 100644
--- a/drivers/watchdog/omap_wdt.c
+++ b/drivers/watchdog/omap_wdt.c
@@ -38,6 +38,7 @@
 #include <linux/io.h>
 #include <linux/slab.h>
 #include <linux/pm_runtime.h>
+#include <linux/stringify.h>
 #include <linux/platform_data/omap-wd-timer.h>
 
 #include "omap_wdt.h"
@@ -45,7 +46,7 @@
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started "
-	"(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+	"(default=" __stringify(WATCHDOG_NOWAYOUT) ")");
 
 static unsigned timer_margin;
 module_param(timer_margin, uint, 0);
diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c
index 0ea946823b0a7..5d56e93f04064 100644
--- a/drivers/watchdog/orion_wdt.c
+++ b/drivers/watchdog/orion_wdt.c
@@ -22,6 +22,7 @@
 #include <linux/err.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
+#include <linux/stringify.h>
 
 /* RSTOUT mask register physical address for Orion5x, Kirkwood and Dove */
 #define ORION_RSTOUT_MASK_OFFSET	0x20108
@@ -687,7 +688,7 @@ MODULE_PARM_DESC(heartbeat, "Initial watchdog heartbeat in seconds");
 
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
-				__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+				__stringify(WATCHDOG_NOWAYOUT) ")");
 
 MODULE_LICENSE("GPL v2");
 MODULE_ALIAS("platform:orion_wdt");
diff --git a/drivers/watchdog/pc87413_wdt.c b/drivers/watchdog/pc87413_wdt.c
index fbf835d112b84..29dab0e669bfb 100644
--- a/drivers/watchdog/pc87413_wdt.c
+++ b/drivers/watchdog/pc87413_wdt.c
@@ -30,6 +30,7 @@
 #include <linux/moduleparam.h>
 #include <linux/io.h>
 #include <linux/uaccess.h>
+#include <linux/stringify.h>
 
 
 /* #define DEBUG 1 */
@@ -577,15 +578,15 @@ MODULE_LICENSE("GPL");
 
 module_param_hw(io, int, ioport, 0);
 MODULE_PARM_DESC(io, MODNAME " I/O port (default: "
-					__MODULE_STRING(IO_DEFAULT) ").");
+					__stringify(IO_DEFAULT) ").");
 
 module_param(timeout, int, 0);
 MODULE_PARM_DESC(timeout,
 		"Watchdog timeout in minutes (default="
-				__MODULE_STRING(DEFAULT_TIMEOUT) ").");
+				__stringify(DEFAULT_TIMEOUT) ").");
 
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 		"Watchdog cannot be stopped once started (default="
-				__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+				__stringify(WATCHDOG_NOWAYOUT) ")");
 
diff --git a/drivers/watchdog/pcwd.c b/drivers/watchdog/pcwd.c
index d4ea7d6ccd6a7..3370a91552766 100644
--- a/drivers/watchdog/pcwd.c
+++ b/drivers/watchdog/pcwd.c
@@ -72,6 +72,7 @@
 #include <linux/spinlock.h>	/* For spin_lock/spin_unlock/... */
 #include <linux/uaccess.h>	/* For copy_to_user/put_user/... */
 #include <linux/io.h>		/* For inb/outb/... */
+#include <linux/stringify.h>	/* For __stringify */
 
 /* Module and version information */
 #define WATCHDOG_VERSION "1.20"
@@ -203,13 +204,13 @@ static int heartbeat = WATCHDOG_HEARTBEAT;
 module_param(heartbeat, int, 0);
 MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. "
 	"(2 <= heartbeat <= 7200 or 0=delay-time from dip-switches, default="
-				__MODULE_STRING(WATCHDOG_HEARTBEAT) ")");
+				__stringify(WATCHDOG_HEARTBEAT) ")");
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 		"Watchdog cannot be stopped once started (default="
-				__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+				__stringify(WATCHDOG_NOWAYOUT) ")");
 
 /*
  *	Internal functions
diff --git a/drivers/watchdog/pcwd_pci.c b/drivers/watchdog/pcwd_pci.c
index a489b426f2ba6..377e5a61faef8 100644
--- a/drivers/watchdog/pcwd_pci.c
+++ b/drivers/watchdog/pcwd_pci.c
@@ -47,6 +47,7 @@
 #include <linux/spinlock.h>	/* For spin_lock/spin_unlock/... */
 #include <linux/uaccess.h>	/* For copy_to_user/put_user/... */
 #include <linux/io.h>		/* For inb/outb/... */
+#include <linux/stringify.h>	/* For __stringify */
 
 /* Module and version information */
 #define WATCHDOG_VERSION "1.03"
@@ -140,12 +141,12 @@ static int heartbeat = WATCHDOG_HEARTBEAT;
 module_param(heartbeat, int, 0);
 MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. "
 	"(0<heartbeat<65536 or 0=delay-time from dip-switches, default="
-				__MODULE_STRING(WATCHDOG_HEARTBEAT) ")");
+				__stringify(WATCHDOG_HEARTBEAT) ")");
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
-					__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+					__stringify(WATCHDOG_NOWAYOUT) ")");
 
 /*
  *	Internal functions
diff --git a/drivers/watchdog/pcwd_usb.c b/drivers/watchdog/pcwd_usb.c
index d7c18c990649a..15511c816add4 100644
--- a/drivers/watchdog/pcwd_usb.c
+++ b/drivers/watchdog/pcwd_usb.c
@@ -39,6 +39,7 @@
 #include <linux/mutex.h>	/* For mutex locking */
 #include <linux/hid.h>		/* For HID_REQ_SET_REPORT & HID_DT_REPORT */
 #include <linux/uaccess.h>	/* For copy_to_user/put_user/... */
+#include <linux/stringify.h>	/* For __stringify */
 
 
 /* Module and Version Information */
@@ -57,12 +58,12 @@ static int heartbeat = WATCHDOG_HEARTBEAT;
 module_param(heartbeat, int, 0);
 MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. "
 	"(0<heartbeat<65536 or 0=delay-time from dip-switches, default="
-				__MODULE_STRING(WATCHDOG_HEARTBEAT) ")");
+				__stringify(WATCHDOG_HEARTBEAT) ")");
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
-				__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+				__stringify(WATCHDOG_NOWAYOUT) ")");
 
 /* The vendor and product id's for the USB-PC Watchdog card */
 #define USB_PCWD_VENDOR_ID	0x0c98
diff --git a/drivers/watchdog/pika_wdt.c b/drivers/watchdog/pika_wdt.c
index 87b8988d25206..09fc76aaa0513 100644
--- a/drivers/watchdog/pika_wdt.c
+++ b/drivers/watchdog/pika_wdt.c
@@ -25,6 +25,7 @@
 #include <linux/io.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
+#include <linux/stringify.h>
 
 #define DRV_NAME "PIKA-WDT"
 
@@ -39,12 +40,12 @@
 static int heartbeat = WDT_HEARTBEAT;
 module_param(heartbeat, int, 0);
 MODULE_PARM_DESC(heartbeat, "Watchdog heartbeats in seconds. "
-	"(default = " __MODULE_STRING(WDT_HEARTBEAT) ")");
+	"(default = " __stringify(WDT_HEARTBEAT) ")");
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started "
-	"(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+	"(default=" __stringify(WATCHDOG_NOWAYOUT) ")");
 
 static struct {
 	void __iomem *fpga;
diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c
index 87a44a5675a14..a7c39849cbfdc 100644
--- a/drivers/watchdog/pnx4008_wdt.c
+++ b/drivers/watchdog/pnx4008_wdt.c
@@ -30,6 +30,7 @@
 #include <linux/of.h>
 #include <linux/delay.h>
 #include <linux/reboot.h>
+#include <linux/stringify.h>
 
 /* WatchDog Timer - Chapter 23 Page 207 */
 
@@ -237,8 +238,8 @@ MODULE_DESCRIPTION("PNX4008 Watchdog Driver");
 module_param(heartbeat, uint, 0);
 MODULE_PARM_DESC(heartbeat,
 		 "Watchdog heartbeat period in seconds from 1 to "
-		 __MODULE_STRING(MAX_HEARTBEAT) ", default "
-		 __MODULE_STRING(DEFAULT_HEARTBEAT));
+		 __stringify(MAX_HEARTBEAT) ", default "
+		 __stringify(DEFAULT_HEARTBEAT));
 
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
diff --git a/drivers/watchdog/pseries-wdt.c b/drivers/watchdog/pseries-wdt.c
index e97b943e1d3c5..5f531a03a0fc6 100644
--- a/drivers/watchdog/pseries-wdt.c
+++ b/drivers/watchdog/pseries-wdt.c
@@ -10,6 +10,7 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/platform_device.h>
+#include <linux/stringify.h>
 #include <linux/time64.h>
 #include <linux/watchdog.h>
 #include <asm/papr-watchdog.h>
@@ -26,18 +27,18 @@ static const unsigned long pseries_wdt_action[] = {
 static unsigned int action = WATCHDOG_ACTION;
 module_param(action, uint, 0444);
 MODULE_PARM_DESC(action, "Action taken when watchdog expires (default="
-		 __MODULE_STRING(WATCHDOG_ACTION) ")");
+		 __stringify(WATCHDOG_ACTION) ")");
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0444);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
-		 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+		 __stringify(WATCHDOG_NOWAYOUT) ")");
 
 #define WATCHDOG_TIMEOUT 60
 static unsigned int timeout = WATCHDOG_TIMEOUT;
 module_param(timeout, uint, 0444);
 MODULE_PARM_DESC(timeout, "Initial watchdog timeout in seconds (default="
-		 __MODULE_STRING(WATCHDOG_TIMEOUT) ")");
+		 __stringify(WATCHDOG_TIMEOUT) ")");
 
 struct pseries_wdt {
 	struct watchdog_device wd;
diff --git a/drivers/watchdog/rc32434_wdt.c b/drivers/watchdog/rc32434_wdt.c
index 0e5c5c96af58d..5301a93abf55f 100644
--- a/drivers/watchdog/rc32434_wdt.c
+++ b/drivers/watchdog/rc32434_wdt.c
@@ -27,6 +27,7 @@
 #include <linux/spinlock.h>		/* For spin_lock/spin_unlock/... */
 #include <linux/uaccess.h>		/* For copy_to_user/put_user/... */
 #include <linux/io.h>			/* For devm_ioremap */
+#include <linux/stringify.h>		/* For __stringify */
 
 #include <asm/mach-rc32434/integ.h>	/* For the Watchdog registers */
 
@@ -57,12 +58,12 @@ extern unsigned int idt_cpu_freq;
 static int timeout = WATCHDOG_TIMEOUT;
 module_param(timeout, int, 0);
 MODULE_PARM_DESC(timeout, "Watchdog timeout value, in seconds (default="
-		__MODULE_STRING(WATCHDOG_TIMEOUT) ")");
+		__stringify(WATCHDOG_TIMEOUT) ")");
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
-	__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+	__stringify(WATCHDOG_NOWAYOUT) ")");
 
 /* apply or and nand masks to data read from addr and write back */
 #define SET_BITS(addr, or, nand) \
diff --git a/drivers/watchdog/renesas_wdt.c b/drivers/watchdog/renesas_wdt.c
index 97bcd32bade52..8c0041ce55521 100644
--- a/drivers/watchdog/renesas_wdt.c
+++ b/drivers/watchdog/renesas_wdt.c
@@ -16,6 +16,7 @@
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/smp.h>
+#include <linux/stringify.h>
 #include <linux/sys_soc.h>
 #include <linux/watchdog.h>
 
@@ -44,7 +45,7 @@ static const unsigned int clk_divs[] = { 1, 4, 16, 32, 64, 128, 1024, 4096 };
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
-				__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+				__stringify(WATCHDOG_NOWAYOUT) ")");
 
 struct rwdt_priv {
 	void __iomem *base;
diff --git a/drivers/watchdog/rn5t618_wdt.c b/drivers/watchdog/rn5t618_wdt.c
index 87d06d210ac9e..14056af36445c 100644
--- a/drivers/watchdog/rn5t618_wdt.c
+++ b/drivers/watchdog/rn5t618_wdt.c
@@ -9,6 +9,7 @@
 #include <linux/mfd/rn5t618.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
+#include <linux/stringify.h>
 #include <linux/watchdog.h>
 
 #define DRIVER_NAME "rn5t618-wdt"
@@ -21,7 +22,7 @@ MODULE_PARM_DESC(timeout, "Initial watchdog timeout in seconds");
 
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
-		 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+		 __stringify(WATCHDOG_NOWAYOUT) ")");
 
 struct rn5t618_wdt {
 	struct watchdog_device wdt_dev;
diff --git a/drivers/watchdog/rt2880_wdt.c b/drivers/watchdog/rt2880_wdt.c
index c8edd83bb502e..38f31d302a4b3 100644
--- a/drivers/watchdog/rt2880_wdt.c
+++ b/drivers/watchdog/rt2880_wdt.c
@@ -15,6 +15,7 @@
 #include <linux/watchdog.h>
 #include <linux/moduleparam.h>
 #include <linux/platform_device.h>
+#include <linux/stringify.h>
 
 #include <asm/mach-ralink/ralink_regs.h>
 
@@ -51,7 +52,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 		"Watchdog cannot be stopped once started (default="
-		__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+		__stringify(WATCHDOG_NOWAYOUT) ")");
 
 static inline void rt_wdt_w32(void __iomem *base, unsigned int reg, u32 val)
 {
diff --git a/drivers/watchdog/rti_wdt.c b/drivers/watchdog/rti_wdt.c
index 7c1bd83b056a8..6a64adbe1a8ea 100644
--- a/drivers/watchdog/rti_wdt.c
+++ b/drivers/watchdog/rti_wdt.c
@@ -17,6 +17,7 @@
 #include <linux/of_reserved_mem.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
+#include <linux/stringify.h>
 #include <linux/types.h>
 #include <linux/watchdog.h>
 
@@ -414,8 +415,8 @@ MODULE_DESCRIPTION("K3 RTI Watchdog Driver");
 module_param(heartbeat, int, 0);
 MODULE_PARM_DESC(heartbeat,
 		 "Watchdog heartbeat period in seconds from 1 to "
-		 __MODULE_STRING(MAX_HEARTBEAT) ", default "
-		 __MODULE_STRING(DEFAULT_HEARTBEAT));
+		 __stringify(MAX_HEARTBEAT) ", default "
+		 __stringify(DEFAULT_HEARTBEAT));
 
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("platform:rti-wdt");
diff --git a/drivers/watchdog/rzg2l_wdt.c b/drivers/watchdog/rzg2l_wdt.c
index 509f9dffdacde..592ea7ce6d69a 100644
--- a/drivers/watchdog/rzg2l_wdt.c
+++ b/drivers/watchdog/rzg2l_wdt.c
@@ -14,6 +14,7 @@
 #include <linux/platform_device.h>
 #include <linux/pm_domain.h>
 #include <linux/pm_runtime.h>
+#include <linux/stringify.h>
 #include <linux/reset.h>
 #include <linux/units.h>
 #include <linux/watchdog.h>
@@ -41,7 +42,7 @@
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
-				__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+				__stringify(WATCHDOG_NOWAYOUT) ")");
 
 enum rz_wdt_type {
 	WDT_RZG2L,
diff --git a/drivers/watchdog/rzv2h_wdt.c b/drivers/watchdog/rzv2h_wdt.c
index 83540dd9a37b6..a8db85e85c73a 100644
--- a/drivers/watchdog/rzv2h_wdt.c
+++ b/drivers/watchdog/rzv2h_wdt.c
@@ -13,6 +13,7 @@
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/reset.h>
+#include <linux/stringify.h>
 #include <linux/units.h>
 #include <linux/watchdog.h>
 
@@ -48,7 +49,7 @@
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
-		 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+		 __stringify(WATCHDOG_NOWAYOUT) ")");
 
 enum rzv2h_wdt_count_source {
 	COUNT_SOURCE_LOCO,
diff --git a/drivers/watchdog/s32g_wdt.c b/drivers/watchdog/s32g_wdt.c
index 6422a694fc65f..bd8740153c17f 100644
--- a/drivers/watchdog/s32g_wdt.c
+++ b/drivers/watchdog/s32g_wdt.c
@@ -13,6 +13,7 @@
 #include <linux/moduleparam.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
+#include <linux/stringify.h>
 #include <linux/watchdog.h>
 
 #define DRIVER_NAME "s32g-swt"
@@ -42,12 +43,12 @@ struct s32g_wdt_device {
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
-		 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+		 __stringify(WATCHDOG_NOWAYOUT) ")");
 
 static unsigned int timeout_param = S32G_WDT_DEFAULT_TIMEOUT;
 module_param(timeout_param, uint, 0);
 MODULE_PARM_DESC(timeout_param, "Watchdog timeout in seconds (default="
-		 __MODULE_STRING(S32G_WDT_DEFAULT_TIMEOUT) ")");
+		 __stringify(S32G_WDT_DEFAULT_TIMEOUT) ")");
 
 static bool early_enable;
 module_param(early_enable, bool, 0);
diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
index e31f93db05096..8ae60b919c120 100644
--- a/drivers/watchdog/s3c2410_wdt.c
+++ b/drivers/watchdog/s3c2410_wdt.c
@@ -28,6 +28,7 @@
 #include <linux/regmap.h>
 #include <linux/delay.h>
 #include <linux/math64.h>
+#include <linux/stringify.h>
 
 #define S3C2410_WTCON		0x00
 #define S3C2410_WTDAT		0x04
@@ -154,12 +155,12 @@ module_param(nowayout,   bool, 0);
 module_param(soft_noboot, int, 0);
 
 MODULE_PARM_DESC(tmr_margin, "Watchdog tmr_margin in seconds. (default="
-		__MODULE_STRING(S3C2410_WATCHDOG_DEFAULT_TIME) ")");
+		__stringify(S3C2410_WATCHDOG_DEFAULT_TIME) ")");
 MODULE_PARM_DESC(tmr_atboot,
 		"Watchdog is started at boot time if set to 1, default="
-			__MODULE_STRING(S3C2410_WATCHDOG_ATBOOT));
+			__stringify(S3C2410_WATCHDOG_ATBOOT));
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
-			__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+			__stringify(WATCHDOG_NOWAYOUT) ")");
 MODULE_PARM_DESC(soft_noboot, "Watchdog action, set to 1 to ignore reboots, 0 to reboot (default 0)");
 
 /**
diff --git a/drivers/watchdog/sama5d4_wdt.c b/drivers/watchdog/sama5d4_wdt.c
index ecdd9aeab79cc..85efe4db40f0b 100644
--- a/drivers/watchdog/sama5d4_wdt.c
+++ b/drivers/watchdog/sama5d4_wdt.c
@@ -14,6 +14,7 @@
 #include <linux/of_irq.h>
 #include <linux/platform_device.h>
 #include <linux/reboot.h>
+#include <linux/stringify.h>
 #include <linux/watchdog.h>
 
 #include "at91sam9_wdt.h"
@@ -42,12 +43,12 @@ static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(wdt_timeout, int, 0);
 MODULE_PARM_DESC(wdt_timeout,
 	"Watchdog timeout in seconds. (default = "
-	__MODULE_STRING(WDT_DEFAULT_TIMEOUT) ")");
+	__stringify(WDT_DEFAULT_TIMEOUT) ")");
 
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 	"Watchdog cannot be stopped once started (default="
-	__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+	__stringify(WATCHDOG_NOWAYOUT) ")");
 
 static inline bool wdt_enabled(struct sama5d4_wdt *wdt)
 {
diff --git a/drivers/watchdog/sbc60xxwdt.c b/drivers/watchdog/sbc60xxwdt.c
index 03eaf48c8f0f1..fffe58dcbf934 100644
--- a/drivers/watchdog/sbc60xxwdt.c
+++ b/drivers/watchdog/sbc60xxwdt.c
@@ -58,6 +58,7 @@
 #include <linux/init.h>
 #include <linux/io.h>
 #include <linux/uaccess.h>
+#include <linux/stringify.h>
 
 
 #define OUR_NAME "sbc60xxwdt"
@@ -98,13 +99,13 @@ static int timeout = WATCHDOG_TIMEOUT;	/* in seconds, multiplied by HZ to
 module_param(timeout, int, 0);
 MODULE_PARM_DESC(timeout,
 	"Watchdog timeout in seconds. (1<=timeout<=3600, default="
-				__MODULE_STRING(WATCHDOG_TIMEOUT) ")");
+				__stringify(WATCHDOG_TIMEOUT) ")");
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 	"Watchdog cannot be stopped once started (default="
-				__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+				__stringify(WATCHDOG_NOWAYOUT) ")");
 
 static void wdt_timer_ping(struct timer_list *);
 static DEFINE_TIMER(timer, wdt_timer_ping);
diff --git a/drivers/watchdog/sbc7240_wdt.c b/drivers/watchdog/sbc7240_wdt.c
index 21a1f0b32070b..077abbdbf5828 100644
--- a/drivers/watchdog/sbc7240_wdt.c
+++ b/drivers/watchdog/sbc7240_wdt.c
@@ -23,6 +23,7 @@
 #include <linux/io.h>
 #include <linux/uaccess.h>
 #include <linux/atomic.h>
+#include <linux/stringify.h>
 
 #define SBC7240_ENABLE_PORT		0x443
 #define SBC7240_DISABLE_PORT		0x043
@@ -34,8 +35,8 @@
 static int timeout = SBC7240_TIMEOUT;	/* in seconds */
 module_param(timeout, int, 0);
 MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. (1<=timeout<="
-		 __MODULE_STRING(SBC7240_MAX_TIMEOUT) ", default="
-		 __MODULE_STRING(SBC7240_TIMEOUT) ")");
+		 __stringify(SBC7240_MAX_TIMEOUT) ", default="
+		 __stringify(SBC7240_TIMEOUT) ")");
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
diff --git a/drivers/watchdog/sbc8360.c b/drivers/watchdog/sbc8360.c
index a9fd1615b4c38..dafef1df97191 100644
--- a/drivers/watchdog/sbc8360.c
+++ b/drivers/watchdog/sbc8360.c
@@ -48,6 +48,7 @@
 #include <linux/moduleparam.h>
 #include <linux/io.h>
 #include <linux/uaccess.h>
+#include <linux/stringify.h>
 
 
 static unsigned long sbc8360_is_open;
@@ -199,7 +200,7 @@ MODULE_PARM_DESC(timeout, "Index into timeout table (0-63) (default=27 (60s))");
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 		 "Watchdog cannot be stopped once started (default="
-				__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+				__stringify(WATCHDOG_NOWAYOUT) ")");
 
 /*
  *	Kernel methods.
diff --git a/drivers/watchdog/sbc_epx_c3.c b/drivers/watchdog/sbc_epx_c3.c
index 1d291dc0a4a69..b17bd1db7b103 100644
--- a/drivers/watchdog/sbc_epx_c3.c
+++ b/drivers/watchdog/sbc_epx_c3.c
@@ -25,6 +25,7 @@
 #include <linux/ioport.h>
 #include <linux/uaccess.h>
 #include <linux/io.h>
+#include <linux/stringify.h>
 
 static int epx_c3_alive;
 
@@ -33,7 +34,7 @@ static int epx_c3_alive;
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
-					__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+					__stringify(WATCHDOG_NOWAYOUT) ")");
 
 #define EPXC3_WATCHDOG_CTL_REG 0x1ee /* write 1 to enable, 0 to disable */
 #define EPXC3_WATCHDOG_PET_REG 0x1ef /* write anything to pet once enabled */
diff --git a/drivers/watchdog/sbsa_gwdt.c b/drivers/watchdog/sbsa_gwdt.c
index e04d42cc7774d..3d271b1efb560 100644
--- a/drivers/watchdog/sbsa_gwdt.c
+++ b/drivers/watchdog/sbsa_gwdt.c
@@ -46,6 +46,7 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/platform_device.h>
+#include <linux/stringify.h>
 #include <linux/uaccess.h>
 #include <linux/watchdog.h>
 #include <asm/arch_timer.h>
@@ -103,7 +104,7 @@ static unsigned int timeout;
 module_param(timeout, uint, 0);
 MODULE_PARM_DESC(timeout,
 		 "Watchdog timeout in seconds. (>=0, default="
-		 __MODULE_STRING(DEFAULT_TIMEOUT) ")");
+		 __stringify(DEFAULT_TIMEOUT) ")");
 
 /*
  * action refers to action taken when watchdog gets WS0
@@ -120,7 +121,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, S_IRUGO);
 MODULE_PARM_DESC(nowayout,
 		 "Watchdog cannot be stopped once started (default="
-		 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+		 __stringify(WATCHDOG_NOWAYOUT) ")");
 
 /*
  * Arm Base System Architecture 1.0 introduces watchdog v1 which
diff --git a/drivers/watchdog/sc1200wdt.c b/drivers/watchdog/sc1200wdt.c
index 1d3300c98d43e..34cd57420c86d 100644
--- a/drivers/watchdog/sc1200wdt.c
+++ b/drivers/watchdog/sc1200wdt.c
@@ -42,6 +42,7 @@
 #include <linux/semaphore.h>
 #include <linux/io.h>
 #include <linux/uaccess.h>
+#include <linux/stringify.h>
 
 #define SC1200_MODULE_VER	"build 20020303"
 #define SC1200_MODULE_NAME	"sc1200wdt"
@@ -92,7 +93,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 	"Watchdog cannot be stopped once started (default="
-				__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+				__stringify(WATCHDOG_NOWAYOUT) ")");
 
 
 
diff --git a/drivers/watchdog/sch311x_wdt.c b/drivers/watchdog/sch311x_wdt.c
index 9670a1ea57cbd..a2a0b5c2b55b7 100644
--- a/drivers/watchdog/sch311x_wdt.c
+++ b/drivers/watchdog/sch311x_wdt.c
@@ -31,6 +31,7 @@
 #include <linux/spinlock.h>		/* For spin_lock/spin_unlock/... */
 #include <linux/uaccess.h>		/* For copy_to_user/put_user/... */
 #include <linux/io.h>			/* For inb/outb/... */
+#include <linux/stringify.h>		/* For __stringify */
 
 /* Module and version information */
 #define DRV_NAME	"sch311x_wdt"
@@ -68,13 +69,13 @@ static int timeout = WATCHDOG_TIMEOUT;	/* in seconds */
 module_param(timeout, int, 0);
 MODULE_PARM_DESC(timeout,
 	"Watchdog timeout in seconds. 1<= timeout <=15300, default="
-		__MODULE_STRING(WATCHDOG_TIMEOUT) ".");
+		__stringify(WATCHDOG_TIMEOUT) ".");
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 	"Watchdog cannot be stopped once started (default="
-		__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+		__stringify(WATCHDOG_NOWAYOUT) ")");
 
 /*
  *	Super-IO functions
diff --git a/drivers/watchdog/shwdt.c b/drivers/watchdog/shwdt.c
index 719f100aae60d..8adecf54b9bc8 100644
--- a/drivers/watchdog/shwdt.c
+++ b/drivers/watchdog/shwdt.c
@@ -30,6 +30,7 @@
 #include <linux/io.h>
 #include <linux/clk.h>
 #include <linux/err.h>
+#include <linux/stringify.h>
 #include <asm/watchdog.h>
 
 #define DRV_NAME "sh-wdt"
@@ -329,14 +330,14 @@ MODULE_ALIAS("platform:" DRV_NAME);
 module_param(clock_division_ratio, int, 0);
 MODULE_PARM_DESC(clock_division_ratio,
 	"Clock division ratio. Valid ranges are from 0x5 (1.31ms) "
-	"to 0x7 (5.25ms). (default=" __MODULE_STRING(WTCSR_CKS_4096) ")");
+	"to 0x7 (5.25ms). (default=" __stringify(WTCSR_CKS_4096) ")");
 
 module_param(heartbeat, int, 0);
 MODULE_PARM_DESC(heartbeat,
 	"Watchdog heartbeat in seconds. (1 <= heartbeat <= 3600, default="
-				__MODULE_STRING(WATCHDOG_HEARTBEAT) ")");
+				__stringify(WATCHDOG_HEARTBEAT) ")");
 
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 	"Watchdog cannot be stopped once started (default="
-				__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+				__stringify(WATCHDOG_NOWAYOUT) ")");
diff --git a/drivers/watchdog/simatic-ipc-wdt.c b/drivers/watchdog/simatic-ipc-wdt.c
index 1e91f0a560ffc..addeecccf2e9b 100644
--- a/drivers/watchdog/simatic-ipc-wdt.c
+++ b/drivers/watchdog/simatic-ipc-wdt.c
@@ -22,6 +22,7 @@
 #include <linux/sizes.h>
 #include <linux/util_macros.h>
 #include <linux/watchdog.h>
+#include <linux/stringify.h>
 
 #define WD_ENABLE_IOADR			0x62
 #define WD_TRIGGER_IOADR		0x66
@@ -42,7 +43,7 @@
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0000);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
-		 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+		 __stringify(WATCHDOG_NOWAYOUT) ")");
 
 static struct resource gp_status_reg_227e_res =
 	DEFINE_RES_IO_NAMED(GP_STATUS_REG_227E, SZ_1, KBUILD_MODNAME);
diff --git a/drivers/watchdog/sl28cpld_wdt.c b/drivers/watchdog/sl28cpld_wdt.c
index c0b5e5fff5d7a..e32b757372eb6 100644
--- a/drivers/watchdog/sl28cpld_wdt.c
+++ b/drivers/watchdog/sl28cpld_wdt.c
@@ -10,6 +10,7 @@
 #include <linux/platform_device.h>
 #include <linux/property.h>
 #include <linux/regmap.h>
+#include <linux/stringify.h>
 #include <linux/watchdog.h>
 
 /*
@@ -30,7 +31,7 @@
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
-				__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+				__stringify(WATCHDOG_NOWAYOUT) ")");
 
 static int timeout;
 module_param(timeout, int, 0);
diff --git a/drivers/watchdog/smsc37b787_wdt.c b/drivers/watchdog/smsc37b787_wdt.c
index 9f2c2ab4e2f15..0ee36ae3113e0 100644
--- a/drivers/watchdog/smsc37b787_wdt.c
+++ b/drivers/watchdog/smsc37b787_wdt.c
@@ -55,6 +55,7 @@
 #include <linux/spinlock.h>
 #include <linux/io.h>
 #include <linux/uaccess.h>
+#include <linux/stringify.h>
 
 
 /* enable support for minutes as units? */
@@ -611,4 +612,4 @@ MODULE_PARM_DESC(timeout, "range is 1-255 units, default is 60");
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 		"Watchdog cannot be stopped once started (default="
-				__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+				__stringify(WATCHDOG_NOWAYOUT) ")");
diff --git a/drivers/watchdog/softdog.c b/drivers/watchdog/softdog.c
index 0820e35ad2e3c..0ff125958b8a2 100644
--- a/drivers/watchdog/softdog.c
+++ b/drivers/watchdog/softdog.c
@@ -24,6 +24,7 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/reboot.h>
+#include <linux/stringify.h>
 #include <linux/types.h>
 #include <linux/watchdog.h>
 #include <linux/workqueue.h>
@@ -33,13 +34,13 @@ static unsigned int soft_margin = TIMER_MARGIN;	/* in seconds */
 module_param(soft_margin, uint, 0);
 MODULE_PARM_DESC(soft_margin,
 	"Watchdog soft_margin in seconds. (0 < soft_margin < 65536, default="
-					__MODULE_STRING(TIMER_MARGIN) ")");
+					__stringify(TIMER_MARGIN) ")");
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 		"Watchdog cannot be stopped once started (default="
-				__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+				__stringify(WATCHDOG_NOWAYOUT) ")");
 
 static int soft_noboot;
 module_param(soft_noboot, int, 0);
diff --git a/drivers/watchdog/sp5100_tco.c b/drivers/watchdog/sp5100_tco.c
index 72ad59649ccc4..c4809858a6fe3 100644
--- a/drivers/watchdog/sp5100_tco.c
+++ b/drivers/watchdog/sp5100_tco.c
@@ -39,6 +39,7 @@
 #include <linux/moduleparam.h>
 #include <linux/pci.h>
 #include <linux/platform_device.h>
+#include <linux/stringify.h>
 #include <linux/types.h>
 #include <linux/watchdog.h>
 
@@ -69,18 +70,18 @@ static struct pci_dev *sp5100_tco_pci;
 static bool action = WATCHDOG_ACTION;
 module_param(action, bool, 0);
 MODULE_PARM_DESC(action, "Action taken when watchdog expires, 0 to reset, 1 to poweroff (default="
-		 __MODULE_STRING(WATCHDOG_ACTION) ")");
+		 __stringify(WATCHDOG_ACTION) ")");
 
 #define WATCHDOG_HEARTBEAT 60	/* 60 sec default heartbeat. */
 static int heartbeat = WATCHDOG_HEARTBEAT;  /* in seconds */
 module_param(heartbeat, int, 0);
 MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. (default="
-		 __MODULE_STRING(WATCHDOG_HEARTBEAT) ")");
+		 __stringify(WATCHDOG_HEARTBEAT) ")");
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started."
-		" (default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+		" (default=" __stringify(WATCHDOG_NOWAYOUT) ")");
 
 /*
  * Some TCO specific functions
diff --git a/drivers/watchdog/starfive-wdt.c b/drivers/watchdog/starfive-wdt.c
index 5a3254c83d3bb..044b4fdb73505 100644
--- a/drivers/watchdog/starfive-wdt.c
+++ b/drivers/watchdog/starfive-wdt.c
@@ -12,6 +12,7 @@
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/reset.h>
+#include <linux/stringify.h>
 #include <linux/watchdog.h>
 
 /* JH7100 Watchdog register define */
@@ -72,12 +73,12 @@ module_param(early_enable, bool, 0);
 module_param(nowayout, bool, 0);
 
 MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. (default="
-		 __MODULE_STRING(STARFIVE_WDT_DEFAULT_TIME) ")");
+		 __stringify(STARFIVE_WDT_DEFAULT_TIME) ")");
 MODULE_PARM_DESC(early_enable,
 		 "Watchdog is started at boot time if set to 1, default="
-		 __MODULE_STRING(STARFIVE_WDT_EARLY_ENA));
+		 __stringify(STARFIVE_WDT_EARLY_ENA));
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
-		 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+		 __stringify(WATCHDOG_NOWAYOUT) ")");
 
 struct starfive_wdt_variant {
 	unsigned int control;		/* Watchdog Control Register for reset enable */
diff --git a/drivers/watchdog/stmp3xxx_rtc_wdt.c b/drivers/watchdog/stmp3xxx_rtc_wdt.c
index 060447101f486..c9cbf9728a2ae 100644
--- a/drivers/watchdog/stmp3xxx_rtc_wdt.c
+++ b/drivers/watchdog/stmp3xxx_rtc_wdt.c
@@ -13,6 +13,7 @@
 #include <linux/stmp3xxx_rtc_wdt.h>
 #include <linux/notifier.h>
 #include <linux/reboot.h>
+#include <linux/stringify.h>
 
 #define WDOG_TICK_RATE 1000 /* 1 kHz clock */
 #define STMP3XXX_DEFAULT_TIMEOUT 19
@@ -21,8 +22,8 @@
 static int heartbeat = STMP3XXX_DEFAULT_TIMEOUT;
 module_param(heartbeat, uint, 0);
 MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat period in seconds from 1 to "
-		 __MODULE_STRING(STMP3XXX_MAX_TIMEOUT) ", default "
-		 __MODULE_STRING(STMP3XXX_DEFAULT_TIMEOUT));
+		 __stringify(STMP3XXX_MAX_TIMEOUT) ", default "
+		 __stringify(STMP3XXX_DEFAULT_TIMEOUT));
 
 static int wdt_start(struct watchdog_device *wdd)
 {
diff --git a/drivers/watchdog/stpmic1_wdt.c b/drivers/watchdog/stpmic1_wdt.c
index 45d0c543466fd..17f0cdecd22c3 100644
--- a/drivers/watchdog/stpmic1_wdt.c
+++ b/drivers/watchdog/stpmic1_wdt.c
@@ -9,6 +9,7 @@
 #include <linux/of.h>
 #include <linux/regmap.h>
 #include <linux/slab.h>
+#include <linux/stringify.h>
 #include <linux/watchdog.h>
 
 /* WATCHDOG CONTROL REGISTER bit */
@@ -25,7 +26,7 @@
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
-		 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+		 __stringify(WATCHDOG_NOWAYOUT) ")");
 
 struct stpmic1_wdt {
 	struct stpmic1 *pmic;
diff --git a/drivers/watchdog/sun4v_wdt.c b/drivers/watchdog/sun4v_wdt.c
index 8db86ad5ee3df..ad56d778776e7 100644
--- a/drivers/watchdog/sun4v_wdt.c
+++ b/drivers/watchdog/sun4v_wdt.c
@@ -15,6 +15,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
+#include <linux/stringify.h>
 #include <linux/watchdog.h>
 #include <asm/hypervisor.h>
 #include <asm/mdesc.h>
@@ -27,12 +28,12 @@
 static unsigned int timeout;
 module_param(timeout, uint, 0);
 MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds (default="
-	__MODULE_STRING(WDT_TIMEOUT) ")");
+	__stringify(WDT_TIMEOUT) ")");
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, S_IRUGO);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
-	__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+	__stringify(WATCHDOG_NOWAYOUT) ")");
 
 static int sun4v_wdt_stop(struct watchdog_device *wdd)
 {
diff --git a/drivers/watchdog/sunplus_wdt.c b/drivers/watchdog/sunplus_wdt.c
index ae0c11a15a051..f2e45907d882c 100644
--- a/drivers/watchdog/sunplus_wdt.c
+++ b/drivers/watchdog/sunplus_wdt.c
@@ -11,6 +11,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/reset.h>
+#include <linux/stringify.h>
 #include <linux/watchdog.h>
 
 #define WDT_CTRL		0x00
@@ -38,7 +39,7 @@ MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds");
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
-			__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+			__stringify(WATCHDOG_NOWAYOUT) ")");
 
 struct sp_wdt_priv {
 	struct watchdog_device wdev;
diff --git a/drivers/watchdog/sunxi_wdt.c b/drivers/watchdog/sunxi_wdt.c
index 3db34524ed13b..1e55c5fd43b8a 100644
--- a/drivers/watchdog/sunxi_wdt.c
+++ b/drivers/watchdog/sunxi_wdt.c
@@ -20,6 +20,7 @@
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/types.h>
+#include <linux/stringify.h>
 #include <linux/watchdog.h>
 
 #define WDT_MAX_TIMEOUT         16
@@ -357,7 +358,7 @@ MODULE_PARM_DESC(timeout, "Watchdog heartbeat in seconds");
 
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started "
-		"(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+		"(default=" __stringify(WATCHDOG_NOWAYOUT) ")");
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Carlo Caione <carlo.caione@gmail.com>");
diff --git a/drivers/watchdog/tegra_wdt.c b/drivers/watchdog/tegra_wdt.c
index d5de6c0657a55..6b3f65c4d593b 100644
--- a/drivers/watchdog/tegra_wdt.c
+++ b/drivers/watchdog/tegra_wdt.c
@@ -9,6 +9,7 @@
 #include <linux/io.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
+#include <linux/stringify.h>
 #include <linux/watchdog.h>
 
 /* minimum and maximum watchdog trigger timeout, in seconds */
@@ -67,13 +68,13 @@ static int heartbeat = WDT_HEARTBEAT;
 module_param(heartbeat, int, 0);
 MODULE_PARM_DESC(heartbeat,
 	"Watchdog heartbeats in seconds. (default = "
-	__MODULE_STRING(WDT_HEARTBEAT) ")");
+	__stringify(WDT_HEARTBEAT) ")");
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 	"Watchdog cannot be stopped once started (default="
-	__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+	__stringify(WATCHDOG_NOWAYOUT) ")");
 
 static int tegra_wdt_start(struct watchdog_device *wdd)
 {
diff --git a/drivers/watchdog/tqmx86_wdt.c b/drivers/watchdog/tqmx86_wdt.c
index 83860e94ce9d7..1da45a3f8cf3f 100644
--- a/drivers/watchdog/tqmx86_wdt.c
+++ b/drivers/watchdog/tqmx86_wdt.c
@@ -14,6 +14,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/timer.h>
+#include <linux/stringify.h>
 #include <linux/watchdog.h>
 
 /* default timeout (secs) */
@@ -23,7 +24,7 @@ static unsigned int timeout;
 module_param(timeout, uint, 0);
 MODULE_PARM_DESC(timeout,
 	"Watchdog timeout in seconds. (1<=timeout<=4096, default="
-				__MODULE_STRING(WDT_TIMEOUT) ")");
+				__stringify(WDT_TIMEOUT) ")");
 struct tqmx86_wdt {
 	struct watchdog_device wdd;
 	void __iomem *io_base;
diff --git a/drivers/watchdog/ts4800_wdt.c b/drivers/watchdog/ts4800_wdt.c
index 24b1ad52102e8..1bfc8db323c6a 100644
--- a/drivers/watchdog/ts4800_wdt.c
+++ b/drivers/watchdog/ts4800_wdt.c
@@ -12,13 +12,14 @@
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
+#include <linux/stringify.h>
 #include <linux/watchdog.h>
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 	"Watchdog cannot be stopped once started (default="
-	__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+	__stringify(WATCHDOG_NOWAYOUT) ")");
 
 /* possible feed values */
 #define TS4800_WDT_FEED_2S       0x1
diff --git a/drivers/watchdog/twl4030_wdt.c b/drivers/watchdog/twl4030_wdt.c
index 69a622646d75c..d5e06dcf74d9a 100644
--- a/drivers/watchdog/twl4030_wdt.c
+++ b/drivers/watchdog/twl4030_wdt.c
@@ -12,13 +12,14 @@
 #include <linux/watchdog.h>
 #include <linux/platform_device.h>
 #include <linux/mfd/twl.h>
+#include <linux/stringify.h>
 
 #define TWL4030_WATCHDOG_CFG_REG_OFFS	0x3
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started "
-	"(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+	"(default=" __stringify(WATCHDOG_NOWAYOUT) ")");
 
 static int twl4030_wdt_write(unsigned char val)
 {
diff --git a/drivers/watchdog/txx9wdt.c b/drivers/watchdog/txx9wdt.c
index 305349844b4f1..161a779dc74d8 100644
--- a/drivers/watchdog/txx9wdt.c
+++ b/drivers/watchdog/txx9wdt.c
@@ -16,6 +16,7 @@
 #include <linux/clk.h>
 #include <linux/err.h>
 #include <linux/io.h>
+#include <linux/stringify.h>
 #include <asm/txx9tmr.h>
 
 #define WD_TIMER_CCD	7		/* 1/256 */
@@ -27,14 +28,14 @@ static unsigned int timeout = TIMER_MARGIN;	/* in seconds */
 module_param(timeout, uint, 0);
 MODULE_PARM_DESC(timeout,
 	"Watchdog timeout in seconds. "
-	"(0<timeout<((2^" __MODULE_STRING(TXX9_TIMER_BITS) ")/(IMCLK/256)), "
-	"default=" __MODULE_STRING(TIMER_MARGIN) ")");
+	"(0<timeout<((2^" __stringify(TXX9_TIMER_BITS) ")/(IMCLK/256)), "
+	"default=" __stringify(TIMER_MARGIN) ")");
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 	"Watchdog cannot be stopped once started "
-	"(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+	"(default=" __stringify(WATCHDOG_NOWAYOUT) ")");
 
 static struct txx9_tmr_reg __iomem *txx9wdt_reg;
 static struct clk *txx9_imclk;
diff --git a/drivers/watchdog/uniphier_wdt.c b/drivers/watchdog/uniphier_wdt.c
index 8e9242c230222..d09fb2acfdde3 100644
--- a/drivers/watchdog/uniphier_wdt.c
+++ b/drivers/watchdog/uniphier_wdt.c
@@ -13,6 +13,7 @@
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
+#include <linux/stringify.h>
 #include <linux/watchdog.h>
 
 /* WDT timer setting register */
@@ -245,12 +246,12 @@ module_platform_driver(uniphier_wdt_driver);
 module_param(timeout, uint, 0000);
 MODULE_PARM_DESC(timeout,
 	"Watchdog timeout seconds in power of 2. (0 < timeout < 128, default="
-				__MODULE_STRING(WDT_DEFAULT_TIMEOUT) ")");
+				__stringify(WDT_DEFAULT_TIMEOUT) ")");
 
 module_param(nowayout, bool, 0000);
 MODULE_PARM_DESC(nowayout,
 	"Watchdog cannot be stopped once started (default="
-				__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+				__stringify(WATCHDOG_NOWAYOUT) ")");
 
 MODULE_AUTHOR("Keiji Hayashibara <hayashibara.keiji@socionext.com>");
 MODULE_DESCRIPTION("UniPhier Watchdog Device Driver");
diff --git a/drivers/watchdog/via_wdt.c b/drivers/watchdog/via_wdt.c
index be4ca619da65a..effa9bc8d354d 100644
--- a/drivers/watchdog/via_wdt.c
+++ b/drivers/watchdog/via_wdt.c
@@ -18,6 +18,7 @@
 #include <linux/jiffies.h>
 #include <linux/module.h>
 #include <linux/pci.h>
+#include <linux/stringify.h>
 #include <linux/timer.h>
 #include <linux/watchdog.h>
 
@@ -56,12 +57,12 @@
 static int timeout = WDT_TIMEOUT;
 module_param(timeout, int, 0);
 MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds, between 1 and 1023 "
-	"(default = " __MODULE_STRING(WDT_TIMEOUT) ")");
+	"(default = " __stringify(WDT_TIMEOUT) ")");
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started "
-	"(default = " __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+	"(default = " __stringify(WATCHDOG_NOWAYOUT) ")");
 
 static struct watchdog_device wdt_dev;
 static struct resource wdt_res;
diff --git a/drivers/watchdog/visconti_wdt.c b/drivers/watchdog/visconti_wdt.c
index 7795e7fbf67e6..fc4f0d4d3d554 100644
--- a/drivers/watchdog/visconti_wdt.c
+++ b/drivers/watchdog/visconti_wdt.c
@@ -11,6 +11,7 @@
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
+#include <linux/stringify.h>
 #include <linux/watchdog.h>
 
 #define WDT_CNT			0x00
@@ -29,7 +30,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(
 	nowayout,
-	"Watchdog cannot be stopped once started (default=" __MODULE_STRING(WATCHDOG_NOWAYOUT)")");
+	"Watchdog cannot be stopped once started (default=" __stringify(WATCHDOG_NOWAYOUT)")");
 
 struct visconti_wdt_priv {
 	struct watchdog_device wdev;
diff --git a/drivers/watchdog/w83627hf_wdt.c b/drivers/watchdog/w83627hf_wdt.c
index db77599e43a06..5aa4d9c0fc001 100644
--- a/drivers/watchdog/w83627hf_wdt.c
+++ b/drivers/watchdog/w83627hf_wdt.c
@@ -35,6 +35,7 @@
 #include <linux/init.h>
 #include <linux/io.h>
 #include <linux/dmi.h>
+#include <linux/stringify.h>
 
 #define WATCHDOG_NAME "w83627hf/thf/hg/dhg WDT"
 #define WATCHDOG_TIMEOUT 60		/* 60 sec default timeout */
@@ -55,13 +56,13 @@ static int timeout;			/* in seconds */
 module_param(timeout, int, 0);
 MODULE_PARM_DESC(timeout,
 		"Watchdog timeout in seconds. 1 <= timeout <= 255, default="
-				__MODULE_STRING(WATCHDOG_TIMEOUT) ".");
+				__stringify(WATCHDOG_TIMEOUT) ".");
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 		"Watchdog cannot be stopped once started (default="
-				__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+				__stringify(WATCHDOG_NOWAYOUT) ")");
 
 static int early_disable;
 module_param(early_disable, int, 0);
diff --git a/drivers/watchdog/w83877f_wdt.c b/drivers/watchdog/w83877f_wdt.c
index 53db59ef774b8..3187ea9d1b574 100644
--- a/drivers/watchdog/w83877f_wdt.c
+++ b/drivers/watchdog/w83877f_wdt.c
@@ -54,6 +54,7 @@
 #include <linux/init.h>
 #include <linux/io.h>
 #include <linux/uaccess.h>
+#include <linux/stringify.h>
 
 #define OUR_NAME "w83877f_wdt"
 
@@ -84,14 +85,14 @@ static int timeout = WATCHDOG_TIMEOUT;
 module_param(timeout, int, 0);
 MODULE_PARM_DESC(timeout,
 	"Watchdog timeout in seconds. (1<=timeout<=3600, default="
-				__MODULE_STRING(WATCHDOG_TIMEOUT) ")");
+				__stringify(WATCHDOG_TIMEOUT) ")");
 
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 		"Watchdog cannot be stopped once started (default="
-				__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+				__stringify(WATCHDOG_NOWAYOUT) ")");
 
 static void wdt_timer_ping(struct timer_list *);
 static DEFINE_TIMER(timer, wdt_timer_ping);
diff --git a/drivers/watchdog/w83977f_wdt.c b/drivers/watchdog/w83977f_wdt.c
index 3776030fa7c62..019fbf65eeb45 100644
--- a/drivers/watchdog/w83977f_wdt.c
+++ b/drivers/watchdog/w83977f_wdt.c
@@ -25,6 +25,7 @@
 #include <linux/reboot.h>
 #include <linux/uaccess.h>
 #include <linux/io.h>
+#include <linux/stringify.h>
 
 
 #define WATCHDOG_VERSION  "1.00"
@@ -49,7 +50,7 @@ static	DEFINE_SPINLOCK(spinlock);
 module_param(timeout, int, 0);
 MODULE_PARM_DESC(timeout,
 		"Watchdog timeout in seconds (15..7635), default="
-				__MODULE_STRING(DEFAULT_TIMEOUT) ")");
+				__stringify(DEFAULT_TIMEOUT) ")");
 module_param(testmode, int, 0);
 MODULE_PARM_DESC(testmode, "Watchdog testmode (1 = no reboot), default=0");
 
@@ -57,7 +58,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 		"Watchdog cannot be stopped once started (default="
-				__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+				__stringify(WATCHDOG_NOWAYOUT) ")");
 
 /*
  * Start the watchdog
diff --git a/drivers/watchdog/wafer5823wdt.c b/drivers/watchdog/wafer5823wdt.c
index 291109349e73a..c564d51fe5a5b 100644
--- a/drivers/watchdog/wafer5823wdt.c
+++ b/drivers/watchdog/wafer5823wdt.c
@@ -36,6 +36,7 @@
 #include <linux/spinlock.h>
 #include <linux/io.h>
 #include <linux/uaccess.h>
+#include <linux/stringify.h>
 
 #define WATCHDOG_NAME "Wafer 5823 WDT"
 #define PFX WATCHDOG_NAME ": "
@@ -61,13 +62,13 @@ static int timeout = WD_TIMO;  /* in seconds */
 module_param(timeout, int, 0);
 MODULE_PARM_DESC(timeout,
 		"Watchdog timeout in seconds. 1 <= timeout <= 255, default="
-				__MODULE_STRING(WD_TIMO) ".");
+				__stringify(WD_TIMO) ".");
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 		"Watchdog cannot be stopped once started (default="
-				__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+				__stringify(WATCHDOG_NOWAYOUT) ")");
 
 static void wafwdt_ping(void)
 {
diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c
index d7895009a2de3..1e1c3431b0076 100644
--- a/drivers/watchdog/watchdog_dev.c
+++ b/drivers/watchdog/watchdog_dev.c
@@ -44,6 +44,7 @@
 #include <linux/types.h>	/* For standard types (like size_t) */
 #include <linux/watchdog.h>	/* For watchdog specific items */
 #include <linux/uaccess.h>	/* For copy_to_user/put_user/... */
+#include <linux/stringify.h>	/* For __stringify */
 
 #include "watchdog_core.h"
 #include "watchdog_pretimeout.h"
@@ -1314,9 +1315,9 @@ int watchdog_dev_resume(struct watchdog_device *wdd)
 module_param(handle_boot_enabled, bool, 0444);
 MODULE_PARM_DESC(handle_boot_enabled,
 	"Watchdog core auto-updates boot enabled watchdogs before userspace takes over (default="
-	__MODULE_STRING(IS_ENABLED(CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED)) ")");
+	__stringify(IS_ENABLED(CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED)) ")");
 
 module_param(open_timeout, uint, 0644);
 MODULE_PARM_DESC(open_timeout,
 	"Maximum time (in seconds, 0 means infinity) for userspace to take over a running watchdog (default="
-	__MODULE_STRING(CONFIG_WATCHDOG_OPEN_TIMEOUT) ")");
+	__stringify(CONFIG_WATCHDOG_OPEN_TIMEOUT) ")");
diff --git a/drivers/watchdog/wdat_wdt.c b/drivers/watchdog/wdat_wdt.c
index 55ea16e73652f..a418da46bda2c 100644
--- a/drivers/watchdog/wdat_wdt.c
+++ b/drivers/watchdog/wdat_wdt.c
@@ -13,6 +13,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm.h>
+#include <linux/stringify.h>
 #include <linux/watchdog.h>
 
 #define MAX_WDAT_ACTIONS ACPI_WDAT_ACTION_RESERVED
@@ -54,14 +55,14 @@ struct wdat_wdt {
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
-		 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+		 __stringify(WATCHDOG_NOWAYOUT) ")");
 
 #define WDAT_DEFAULT_TIMEOUT	30
 
 static int timeout = WDAT_DEFAULT_TIMEOUT;
 module_param(timeout, int, 0);
 MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds (default="
-		 __MODULE_STRING(WDAT_DEFAULT_TIMEOUT) ")");
+		 __stringify(WDAT_DEFAULT_TIMEOUT) ")");
 
 static int wdat_wdt_read(struct wdat_wdt *wdat,
 	 const struct wdat_instruction *instr, u32 *value)
diff --git a/drivers/watchdog/wdt.c b/drivers/watchdog/wdt.c
index 3980d60bacd82..d8681ee547eea 100644
--- a/drivers/watchdog/wdt.c
+++ b/drivers/watchdog/wdt.c
@@ -43,6 +43,7 @@
 #include <linux/init.h>
 #include <linux/io.h>
 #include <linux/uaccess.h>
+#include <linux/stringify.h>
 
 #include "wd501p.h"
 
@@ -60,13 +61,13 @@ static int wd_heartbeat;
 module_param(heartbeat, int, 0);
 MODULE_PARM_DESC(heartbeat,
 	"Watchdog heartbeat in seconds. (0 < heartbeat < 65536, default="
-				__MODULE_STRING(WD_TIMO) ")");
+				__stringify(WD_TIMO) ")");
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 	"Watchdog cannot be stopped once started (default="
-				__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+				__stringify(WATCHDOG_NOWAYOUT) ")");
 
 /* You must set these - there is no sane way to probe for this board. */
 static int io = 0x240;
diff --git a/drivers/watchdog/wdt977.c b/drivers/watchdog/wdt977.c
index 4f449ac4dda41..f0fb82dc3c93d 100644
--- a/drivers/watchdog/wdt977.c
+++ b/drivers/watchdog/wdt977.c
@@ -34,6 +34,7 @@
 #include <linux/reboot.h>
 #include <linux/io.h>
 #include <linux/uaccess.h>
+#include <linux/stringify.h>
 
 #include <asm/mach-types.h>
 
@@ -59,7 +60,7 @@ static	DEFINE_SPINLOCK(spinlock);
 
 module_param(timeout, int, 0);
 MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds (60..15300, default="
-				__MODULE_STRING(DEFAULT_TIMEOUT) ")");
+				__stringify(DEFAULT_TIMEOUT) ")");
 module_param(testmode, int, 0);
 MODULE_PARM_DESC(testmode, "Watchdog testmode (1 = no reboot), default=0");
 
@@ -67,7 +68,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 		"Watchdog cannot be stopped once started (default="
-				__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+				__stringify(WATCHDOG_NOWAYOUT) ")");
 
 /*
  * Start the watchdog
diff --git a/drivers/watchdog/wdt_pci.c b/drivers/watchdog/wdt_pci.c
index 3918a600f2a00..4b1ef22d0df28 100644
--- a/drivers/watchdog/wdt_pci.c
+++ b/drivers/watchdog/wdt_pci.c
@@ -49,6 +49,7 @@
 #include <linux/pci.h>
 #include <linux/io.h>
 #include <linux/uaccess.h>
+#include <linux/stringify.h>
 
 
 #define WDT_IS_PCI
@@ -72,13 +73,13 @@ static int wd_heartbeat;
 module_param(heartbeat, int, 0);
 MODULE_PARM_DESC(heartbeat,
 		"Watchdog heartbeat in seconds. (0<heartbeat<65536, default="
-				__MODULE_STRING(WD_TIMO) ")");
+				__stringify(WD_TIMO) ")");
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 		"Watchdog cannot be stopped once started (default="
-				__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+				__stringify(WATCHDOG_NOWAYOUT) ")");
 
 /* Support for the Fan Tachometer on the PCI-WDT501 */
 static int tachometer;
diff --git a/drivers/watchdog/wm831x_wdt.c b/drivers/watchdog/wm831x_wdt.c
index d96ad8f38bd2e..1aeb532dfebae 100644
--- a/drivers/watchdog/wm831x_wdt.c
+++ b/drivers/watchdog/wm831x_wdt.c
@@ -13,6 +13,7 @@
 #include <linux/platform_device.h>
 #include <linux/watchdog.h>
 #include <linux/uaccess.h>
+#include <linux/stringify.h>
 
 #include <linux/mfd/wm831x/core.h>
 #include <linux/mfd/wm831x/pdata.h>
@@ -22,7 +23,7 @@ static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 		 "Watchdog cannot be stopped once started (default="
-		 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+		 __stringify(WATCHDOG_NOWAYOUT) ")");
 
 struct wm831x_wdt_drvdata {
 	struct watchdog_device wdt;
diff --git a/drivers/watchdog/wm8350_wdt.c b/drivers/watchdog/wm8350_wdt.c
index c82c1b77d91b5..5eca195eac188 100644
--- a/drivers/watchdog/wm8350_wdt.c
+++ b/drivers/watchdog/wm8350_wdt.c
@@ -14,13 +14,14 @@
 #include <linux/platform_device.h>
 #include <linux/watchdog.h>
 #include <linux/uaccess.h>
+#include <linux/stringify.h>
 #include <linux/mfd/wm8350/core.h>
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
 		 "Watchdog cannot be stopped once started (default="
-		 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+		 __stringify(WATCHDOG_NOWAYOUT) ")");
 
 static DEFINE_MUTEX(wdt_mutex);
 
diff --git a/drivers/watchdog/xen_wdt.c b/drivers/watchdog/xen_wdt.c
index b343f421dc72c..3bc323d886d0b 100644
--- a/drivers/watchdog/xen_wdt.c
+++ b/drivers/watchdog/xen_wdt.c
@@ -17,6 +17,7 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/platform_device.h>
+#include <linux/stringify.h>
 #include <linux/watchdog.h>
 #include <xen/xen.h>
 #include <asm/xen/hypercall.h>
@@ -30,12 +31,12 @@ static time64_t wdt_expires;
 static unsigned int timeout;
 module_param(timeout, uint, S_IRUGO);
 MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds "
-	"(default=" __MODULE_STRING(WATCHDOG_TIMEOUT) ")");
+	"(default=" __stringify(WATCHDOG_TIMEOUT) ")");
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, S_IRUGO);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started "
-	"(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+	"(default=" __stringify(WATCHDOG_NOWAYOUT) ")");
 
 static inline time64_t set_timeout(struct watchdog_device *wdd)
 {
diff --git a/drivers/watchdog/xilinx_wwdt.c b/drivers/watchdog/xilinx_wwdt.c
index 799ce8d22b2f3..b7cdf8140666f 100644
--- a/drivers/watchdog/xilinx_wwdt.c
+++ b/drivers/watchdog/xilinx_wwdt.c
@@ -12,6 +12,7 @@
 #include <linux/math64.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
+#include <linux/stringify.h>
 #include <linux/watchdog.h>
 
 /* Max timeout is calculated at 100MHz source clock */
@@ -47,11 +48,11 @@ static int closed_window_percent;
 module_param(wwdt_timeout, int, 0);
 MODULE_PARM_DESC(wwdt_timeout,
 		 "Watchdog time in seconds. (default="
-		 __MODULE_STRING(XWWDT_DEFAULT_TIMEOUT) ")");
+		 __stringify(XWWDT_DEFAULT_TIMEOUT) ")");
 module_param(closed_window_percent, int, 0);
 MODULE_PARM_DESC(closed_window_percent,
 		 "Watchdog closed window percentage. (default="
-		 __MODULE_STRING(XWWDT_CLOSE_WINDOW_PERCENT) ")");
+		 __stringify(XWWDT_CLOSE_WINDOW_PERCENT) ")");
 /**
  * struct xwwdt_device - Watchdog device structure
  * @base: base io address of WDT device
diff --git a/drivers/watchdog/ziirave_wdt.c b/drivers/watchdog/ziirave_wdt.c
index f3bb935c08c2e..10d4eaa8592a0 100644
--- a/drivers/watchdog/ziirave_wdt.c
+++ b/drivers/watchdog/ziirave_wdt.c
@@ -18,6 +18,7 @@
 #include <linux/slab.h>
 #include <linux/sysfs.h>
 #include <linux/types.h>
+#include <linux/stringify.h>
 #include <linux/watchdog.h>
 
 #include <linux/unaligned.h>
@@ -94,7 +95,7 @@ MODULE_PARM_DESC(reset_duration,
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started default="
-		 __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+		 __stringify(WATCHDOG_NOWAYOUT) ")");
 
 static int ziirave_wdt_revision(struct i2c_client *client,
 				struct ziirave_wdt_rev *rev, u8 command)
diff --git a/include/linux/module.h b/include/linux/module.h
index 96cc98568eea5..0d9157a2d487b 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -886,10 +886,6 @@ extern const struct kobj_type module_ktype;
 
 #define symbol_request(x) try_then_request_module(symbol_get(x), "symbol:" #x)
 
-/* BELOW HERE ALL THESE ARE OBSOLETE AND WILL VANISH */
-
-#define __MODULE_STRING(x) __stringify(x)
-
 #ifdef CONFIG_GENERIC_BUG
 void module_bug_finalize(const Elf_Ehdr *, const Elf_Shdr *,
 			 struct module *);