From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtpout-02.galae.net (smtpout-02.galae.net [185.246.84.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 004A44EFFAB; Wed, 30 Sep 2026 14:39:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.246.84.56 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790779164; cv=none; b=LKT7nNz36xBlP9Qc2q7T2iHS7jhISYlySq1K9gkQslTfE7lKV/bcbRUyg7DcGHTAZrJmjTpbFDIaRRzkhXeP1cGppClSpZqrzLyN9lqmpfdEXjRiMNHz81n5rwvW+kYv86OBVKwJHcArn1SNidN3O/JHNC4pQ/wq7OXZwttguVQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790779164; c=relaxed/simple; bh=ZQuU4MqAB9SZtEoYb0AWuqh2pJUneaFwtAhjMSxAd0A=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=eKwKEhlgVgKp58SM6ybl7qucuLU8ciOvcNFVMc1v7pjCqw86vXqFkJY+VGlg0CXSqLy2C39GIdAqqD2Sj0UZUqBbpvs9bKE91ctvwXY9SuKeNgOnMbWfrZSAgHsXuFSzBVL9Izle8fCjXRL+15m31BEV5zpiHsKtVHXgTBq0HVw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=kHjtnK2u; arc=none smtp.client-ip=185.246.84.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="kHjtnK2u" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id 553331A1086; Wed, 30 Sep 2026 14:39:02 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 1F31C60749; Wed, 30 Sep 2026 14:39:02 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 71BEA10328C6D; Wed, 30 Sep 2026 16:38:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1790779135; h=from:subject:date:message-id:to:cc:mime-version:content-type: in-reply-to:references; bh=38Oz9a1Ag+N2kR26znG03tim1sBdAcNU1KPvExWJ1ro=; b=kHjtnK2ukAFiRn2gCtyKWx3DxRcryQDDA7PxOR3Hx7A5TN9c68jhgYjHy3ZDUDFuFGrWuP K8hbqEcyC8lhwjjghdWG1q36vcM7JVMUSFccSytwVWm3M26pZwMBVnPSXMjuICju6sys+K 1LHPuKmpNiGnlikIN5UQlrejtxAKTagY2/cvywgmDmc6+yZ/gdw3LOjuh+9616vNN6UHff FPlehoULGXV800UiG4Udxz5iXcztPfjwQZbVQ1oXrZ329j+Jx+FVD6I3C1uYe5xuoqf1DL qsh81PV6yOCxEli+UkdAw4GKaAgPm4XUmAtiIZ0BIMOVpKA8dDVagPMV/LTqtg== Date: Wed, 30 Sep 2026 16:38:43 +0200 From: Alexandre Belloni To: Petr Pavlu Cc: Wim Van Sebroeck , Guenter Roeck , Ian Abbott , H Hartley Sweeten , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Rudolf Marek , Andi Shyti , Chris Snook , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Tony Nguyen , Przemek Kitszel , Marek =?iso-8859-1?Q?Beh=FAn?= , Andreas Noever , Mika Westerberg , Yehezkel Bernat , Greg Kroah-Hartman , Jiri Slaby , Duncan Sands , Chas Williams <3chas3@gmail.com>, Luis Chamberlain , Daniel Gomez , Sami Tolvanen , Aaron Tomlin , linux-watchdog@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-hwmon@vger.kernel.org, linux-i2c@vger.kernel.org, netdev@vger.kernel.org, intel-wired-lan@lists.osuosl.org, linux-rtc@vger.kernel.org, linux-usb@vger.kernel.org, linux-serial@vger.kernel.org, linux-atm-general@lists.sourceforge.net, linux-modules@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/3] drivers: Replace __MODULE_STRING() with __stringify() Message-ID: <202609301438434ded5bca@mail.local> References: <20260922-module-string-v1-0-c18766690185@suse.com> <20260922-module-string-v1-2-c18766690185@suse.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260922-module-string-v1-2-c18766690185@suse.com> X-Last-TLS-Session-Version: TLSv1.3 On 22/09/2026 15:32:22+0200, Petr Pavlu wrote: > __MODULE_STRING() has been an alias for __stringify() since "[PATCH] > MODULE_PARM support for older modules" [1] in 2002-12. That change also > moved it to the graveyard section at the end of linux/module.h > > Replace the remaining uses of __MODULE_STRING() with __stringify() in > preparation for its removal. > > Link: https://git.kernel.org/tglx/history/c/136839a1b4 [1] > Signed-off-by: Petr Pavlu Acked-by: Alexandre Belloni > --- > drivers/comedi/comedi_fops.c | 5 +++-- > drivers/gpu/drm/drm_fb_helper.c | 3 ++- > drivers/hwmon/fschmd.c | 3 ++- > drivers/hwmon/nct7904.c | 5 +++-- > drivers/hwmon/sch56xx-common.c | 3 ++- > drivers/hwmon/w83793.c | 5 +++-- > drivers/i2c/busses/i2c-kempld.c | 3 ++- > drivers/net/ethernet/atheros/atl1e/atl1e_param.c | 9 +++++---- > drivers/net/ethernet/atheros/atlx/atl1.c | 3 ++- > drivers/net/ethernet/atheros/atlx/atl2.c | 11 ++++++----- > drivers/net/ethernet/intel/e1000/e1000_param.c | 15 ++++++++------- > drivers/net/ethernet/intel/e1000e/param.c | 16 ++++++---------- > drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c | 7 ++++--- > drivers/platform/cznic/turris-omnia-mcu-watchdog.c | 3 ++- > drivers/rtc/rtc-ds1374.c | 3 ++- > drivers/thunderbolt/tb.c | 3 ++- > drivers/thunderbolt/tunnel.c | 5 +++-- > drivers/tty/serial/8250/8250_platform.c | 3 ++- > drivers/usb/atm/speedtch.c | 15 ++++++++------- > drivers/usb/atm/usbatm.c | 17 +++++++++-------- > 20 files changed, 76 insertions(+), 61 deletions(-) > > diff --git a/drivers/comedi/comedi_fops.c b/drivers/comedi/comedi_fops.c > index c09bbe04be6c..05d14839c5a6 100644 > --- a/drivers/comedi/comedi_fops.c > +++ b/drivers/comedi/comedi_fops.c > @@ -29,6 +29,7 @@ > #include > #include > #include > +#include > > #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 d4664ed468b2..36009bb02c25 100644 > --- a/drivers/gpu/drm/drm_fb_helper.c > +++ b/drivers/gpu/drm/drm_fb_helper.c > @@ -31,6 +31,7 @@ > > #include > #include > +#include > > #include > #include > @@ -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 019fc32bf318..df9418a86c83 100644 > --- a/drivers/hwmon/fschmd.c > +++ b/drivers/hwmon/fschmd.c > @@ -35,6 +35,7 @@ > #include > #include > #include > +#include > > /* 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 976b8a008e44..04e1a8e6db37 100644 > --- a/drivers/hwmon/nct7904.c > +++ b/drivers/hwmon/nct7904.c > @@ -23,6 +23,7 @@ > #include > #include > #include > +#include > > #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 a385aae3bb0f..febb8ba7dc2c 100644 > --- a/drivers/hwmon/sch56xx-common.c > +++ b/drivers/hwmon/sch56xx-common.c > @@ -18,13 +18,14 @@ > #include > #include > #include > +#include > #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 c6ef04c69856..e1f2708b5db6 100644 > --- a/drivers/hwmon/w83793.c > +++ b/drivers/hwmon/w83793.c > @@ -34,6 +34,7 @@ > #include > #include > #include > +#include > > /* 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 9b4c7cba62b6..d0438960c272 100644 > --- a/drivers/i2c/busses/i2c-kempld.c > +++ b/drivers/i2c/busses/i2c-kempld.c > @@ -13,6 +13,7 @@ > #include > #include > #include > +#include > > #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 6b1d6df8da97..ff3423a4dc2e 100644 > --- a/drivers/net/ethernet/atheros/atl1e/atl1e_param.c > +++ b/drivers/net/ethernet/atheros/atl1e/atl1e_param.c > @@ -7,6 +7,7 @@ > */ > > #include > +#include > > #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 98a4d089270e..aef5de6287dc 100644 > --- a/drivers/net/ethernet/atheros/atlx/atl1.c > +++ b/drivers/net/ethernet/atheros/atlx/atl1.c > @@ -56,6 +56,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -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 5560d5cc3169..853d2e1eb954 100644 > --- a/drivers/net/ethernet/atheros/atlx/atl2.c > +++ b/drivers/net/ethernet/atheros/atlx/atl2.c > @@ -29,6 +29,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -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 f4154ca7fcb4..5faf6d6280c8 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 > #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 3132d8f2f207..c6f400e6cdea 100644 > --- a/drivers/net/ethernet/intel/e1000e/param.c > +++ b/drivers/net/ethernet/intel/e1000e/param.c > @@ -4,6 +4,7 @@ > #include > #include > #include > +#include > > #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 81fc5a6e3221..6a1a6678bd1a 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 /* for __MODULE_STRING */ > +#include > +#include > > #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 3ad146ec1d80..daabd88eb913 100644 > --- a/drivers/platform/cznic/turris-omnia-mcu-watchdog.c > +++ b/drivers/platform/cznic/turris-omnia-mcu-watchdog.c > @@ -9,6 +9,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -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 8c247215d611..2ed6777e7035 100644 > --- a/drivers/rtc/rtc-ds1374.c > +++ b/drivers/rtc/rtc-ds1374.c > @@ -26,6 +26,7 @@ > #include > #include > #include > +#include > #ifdef CONFIG_RTC_DRV_DS1374_WDT > #include > #include > @@ -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 47753a5c0f2e..a2459e44e320 100644 > --- a/drivers/thunderbolt/tb.c > +++ b/drivers/thunderbolt/tb.c > @@ -11,6 +11,7 @@ > #include > #include > #include > +#include > > #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 7e8284575dff..ad4916748789 100644 > --- a/drivers/thunderbolt/tunnel.c > +++ b/drivers/thunderbolt/tunnel.c > @@ -11,6 +11,7 @@ > #include > #include > #include > +#include > > #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 af946d12e764..e060e0427fc9 100644 > --- a/drivers/tty/serial/8250/8250_platform.c > +++ b/drivers/tty/serial/8250/8250_platform.c > @@ -16,6 +16,7 @@ > #include > #include > #include > +#include > > #include > > @@ -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 9d28c652bcd8..95cd8ce99a64 100644 > --- a/drivers/usb/atm/speedtch.c > +++ b/drivers/usb/atm/speedtch.c > @@ -19,6 +19,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -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 7b0c791399ea..d4052d206e00 100644 > --- a/drivers/usb/atm/usbatm.c > +++ b/drivers/usb/atm/usbatm.c > @@ -64,6 +64,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -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 */ > > -- > 2.55.0 > -- Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com