* [PATCH] checkpatch: support more uppercase $logFunctions
@ 2015-03-19 6:21 Tom Van Braeckel
2015-03-19 8:26 ` [PATCH v2] " Tom Van Braeckel
0 siblings, 1 reply; 5+ messages in thread
From: Tom Van Braeckel @ 2015-03-19 6:21 UTC (permalink / raw)
To: apw, joe; +Cc: linux-kernel
Add support for uppercase logging function names (so that they may
exceed 80 cols) and regroup the matched expressions more logically.
Previously, WARN, WARN_RATELIMIT, WARN_ONCE were already supported but
many other uppercase logging functions were not and this caused
unfixable checkpatch warnings (an example: drivers/bluetooth/btusb.c)
Care was taken to avoid being overly broad by adding uppercase logging
functions that do not exist (such as VDBG) or by making everything case
insensitive.
Care was also taken to make sure that previously supported expressions
are still matched (such as WARN*) unless they do not exist anywhere in
the codebase (such as WARN_once or WARN_ratelimited).
Signed-off-by: Tom Van Braeckel <tomvanbraeckel@gmail.com>
---
scripts/checkpatch.pl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index d124359..c5d1388 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -351,8 +351,8 @@ our $typeTypedefs = qr{(?x:
our $logFunctions = qr{(?x:
printk(?:_ratelimited|_once|)|
- (?:[a-z0-9]+_){1,2}(?:printk|emerg|alert|crit|err|warning|warn|notice|info|debug|dbg|vdbg|devel|cont|WARN)(?:_ratelimited|_once|)|
- WARN(?:_RATELIMIT|_ONCE|)|
+ (?:[a-z0-9]+_){1,2}(?:printk|emerg|alert|crit|err|warning|warn|notice|info|debug|dbg|vdbg|devel|cont)(?:_ratelimited|_once|)|
+ (?:[A-Z0-9]+_){1,2}(?:EMERG|ALERT|CRIT|ERR|WARNING|WARN|NOTICE|INFO|DEBUG|DBG|DEVEL)(?:_RATELIMIT|_ONCE|)|
panic|
MODULE_[A-Z_]+|
seq_vprintf|seq_printf|seq_puts
--
2.1.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH v2] checkpatch: support more uppercase $logFunctions
2015-03-19 6:21 [PATCH] checkpatch: support more uppercase $logFunctions Tom Van Braeckel
@ 2015-03-19 8:26 ` Tom Van Braeckel
2015-03-19 9:13 ` Joe Perches
0 siblings, 1 reply; 5+ messages in thread
From: Tom Van Braeckel @ 2015-03-19 8:26 UTC (permalink / raw)
To: apw, joe; +Cc: linux-kernel, Tom Van Braeckel
Add support for uppercase logging function names (so that they may
exceed 80 cols) and regroup the matched expressions more logically.
Previously, WARN, WARN_RATELIMIT, WARN_ONCE were already supported but
many other uppercase logging functions were not and this caused
unfixable checkpatch warnings (an example: drivers/bluetooth/btusb.c)
Care was taken to avoid being overly broad by adding uppercase logging
functions that do not exist (such as VDBG) or by making everything case
insensitive.
Care was also taken to make sure that previously supported expressions
are still matched (such as WARN_RATELIMIT and WARN_ONCE).
Signed-off-by: Tom Van Braeckel <tomvanbraeckel@gmail.com>
---
scripts/checkpatch.pl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index d124359..18d1ffa 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -352,7 +352,7 @@ our $typeTypedefs = qr{(?x:
our $logFunctions = qr{(?x:
printk(?:_ratelimited|_once|)|
(?:[a-z0-9]+_){1,2}(?:printk|emerg|alert|crit|err|warning|warn|notice|info|debug|dbg|vdbg|devel|cont|WARN)(?:_ratelimited|_once|)|
- WARN(?:_RATELIMIT|_ONCE|)|
+ (?:[A-Z0-9]+_){1,2}(?:EMERG|ALERT|CRIT|ERR|WARNING|WARN|NOTICE|INFO|DEBUG|DBG|DEVEL)(?:_RATELIMIT|_ONCE|)|
panic|
MODULE_[A-Z_]+|
seq_vprintf|seq_printf|seq_puts
--
2.1.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH v2] checkpatch: support more uppercase $logFunctions
2015-03-19 8:26 ` [PATCH v2] " Tom Van Braeckel
@ 2015-03-19 9:13 ` Joe Perches
2015-03-19 9:57 ` Tom Van Braeckel
0 siblings, 1 reply; 5+ messages in thread
From: Joe Perches @ 2015-03-19 9:13 UTC (permalink / raw)
To: Tom Van Braeckel; +Cc: apw, linux-kernel
On Thu, 2015-03-19 at 09:26 +0100, Tom Van Braeckel wrote:
> Add support for uppercase logging function names (so that they may
> exceed 80 cols) and regroup the matched expressions more logically.
>
> Previously, WARN, WARN_RATELIMIT, WARN_ONCE were already supported but
> many other uppercase logging functions were not and this caused
> unfixable checkpatch warnings (an example: drivers/bluetooth/btusb.c)
I think BT_DBG is a poor macro as it's just
#define BT_DBG(fmt, ...) pr_debug(fmt "\n", ##__VA_ARGS__)
and I'd rather see a treewide sed for that to pr_debug
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2] checkpatch: support more uppercase $logFunctions
2015-03-19 9:13 ` Joe Perches
@ 2015-03-19 9:57 ` Tom Van Braeckel
2015-03-19 15:02 ` Joe Perches
0 siblings, 1 reply; 5+ messages in thread
From: Tom Van Braeckel @ 2015-03-19 9:57 UTC (permalink / raw)
To: Joe Perches; +Cc: Robo Bot, linux-kernel
>> unfixable checkpatch warnings (an example: drivers/bluetooth/btusb.c)
>
> I think BT_DBG is a poor macro as it's just
>
> #define BT_DBG(fmt, ...) pr_debug(fmt "\n", ##__VA_ARGS__)
>
> and I'd rather see a treewide sed for that to pr_debug
Indeed, I also think that BT_DBG() is a poor macro and that it should
be fixed tree-wide. I might even do it myself, in a separate patch.
The reason for DBG being in the current patch is to match other *_DBG()
log functions that make more sense, such as NS_DBG().
As for the btusb.c example case, this patch allows us to fix the
"quoted string split across lines" warning caused by the BT_INFO()
macro. The fix will be to not to split the quoted string, which will
be allowed when BT_INFO() is recognized as a log function.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2] checkpatch: support more uppercase $logFunctions
2015-03-19 9:57 ` Tom Van Braeckel
@ 2015-03-19 15:02 ` Joe Perches
0 siblings, 0 replies; 5+ messages in thread
From: Joe Perches @ 2015-03-19 15:02 UTC (permalink / raw)
To: Tom Van Braeckel; +Cc: Andy Whitcroft, linux-kernel
On Thu, 2015-03-19 at 10:57 +0100, Tom Van Braeckel wrote:
> >> unfixable checkpatch warnings (an example: drivers/bluetooth/btusb.c)
> >
> > I think BT_DBG is a poor macro as it's just
> >
> > #define BT_DBG(fmt, ...) pr_debug(fmt "\n", ##__VA_ARGS__)
> >
> > and I'd rather see a treewide sed for that to pr_debug
>
> Indeed, I also think that BT_DBG() is a poor macro and that it should
> be fixed tree-wide. I might even do it myself, in a separate patch.
>
> The reason for DBG being in the current patch is to match other *_DBG()
> log functions that make more sense, such as NS_DBG().
>
> As for the btusb.c example case, this patch allows us to fix the
> "quoted string split across lines" warning caused by the BT_INFO()
> macro. The fix will be to not to split the quoted string, which will
> be allowed when BT_INFO() is recognized as a log function.
The list of in-tree things this matches is long
and far too many are not logging functions
ABIT_UGURU_DEBUG
ACPI_BIOS_WARNING
ACPI_INFO
ACPI_WARNING
ADMA_LL_DBG
AFUD_READ_INFO
ALLOW_DEBUG
ALX_ISR_ALERT
AML_UART_ERR
APPTAG_ERR
ASC_DBG
ATA_ERR
AT_DMA_ERR
ATH_DBG_WARN
AUX_DBG
AUX_ERR
AX_SPR_ERR
BLOCK_PRTY_INFO
BMAC_HOST_INFO
BOND_AD_INFO
BOND_ALB_INFO
BT_DBG
BT_ERR
BT_INFO
CACHE_OP_ERR
CANINTF_ERR
CAUSE_DEBUG
CH_ALERT
CH_DBG
CH_ERR
CHNL_STS_ERR
CH_WARN
CISR_PAR_ERR
CL_LOCK_DEBUG
CLOCK_INFO
CL_PAGE_DEBUG
CMD_ERR
COH_DBG
CPIA_MODULE_DEBUG
CPSW_DEBUG
CSW_PARITY_ERR
CTCM_PR_DEBUG
DAT_ERR
DAVINCI_EMAC_DEBUG
DBG_EMERG
DBG_ERR
DEBUG_ERR
DEF_INT_ERR
DEV_DBG
DEV_ERR
D_INFO
DMM_PATSTATUS_ERR
DRM_DEBUG
DRM_INFO
DRM_INFO_ONCE
DRVSTAT_INFO
DRVSTAT_RX_INFO
DRVSTAT_TX_INFO
ECC_LAST_ERR
EISA_DBG
EMAC_DBG
EPB_TRANS_ERR
EZUSB_IS_INFO
FC_DISC_DBG
FC_EXCH_DBG
FC_FCP_DBG
FC_LIBFC_DBG
FC_LPORT_DBG
FCOE_DBG
FCOE_NETDEV_DBG
FC_RPORT_DBG
FC_SCSI_DBG
FENCE_WARN
FLD_FRM_ERR
FNIC_FCS_DBG
FNIC_ISR_DBG
FNIC_MAIN_DBG
FNIC_SCSI_DBG
GBE_STATSA_INFO
GBE_STATSB_INFO
GBE_STATSC_INFO
GBE_STATSD_INFO
GET_BT_INFO
GET_RXD_ERR
GUARD_ERR
HERMES_EV_INFO
HERMES_OFFSET_ERR
HERMES_RXSTAT_ERR
HF_EXT_ERR
HOST_DEBUG
HPEE_SLOT_INFO
HS_COMP_ERR
ICSPI_FRM_ERR
IEEE_DEBUG_INFO
IESPI_FRM_ERR
IF_ERR
IF_QUERY_INFO
IL_DBG
IL_DL_INFO
IL_ERR
IL_INFO
IL_WARN
INTEL_INFO
IPW_DEBUG
IPW_DEBUG_INFO
IPW_DEBUG_WARNING
IPW_DL_INFO
IPW_DL_WARNING
IPW_LL_DEBUG
IPW_WARNING
IRQ_ERR
IRQ_MST_ERR
IS_ERR
IS_OPERATIONAL_ERR
ISPCCDC_HORZ_INFO
ISPPRV_HORZ_INFO
ISPPRV_VERT_INFO
ISR_INIT_ERR
IVTV_ALSA_DEBUG
IVTV_ALSA_ERR
IVTV_ALSA_INFO
IVTV_ALSA_WARN
IVTV_DBGFLG_INFO
IVTV_DBGFLG_WARN
IVTV_DEBUG
IVTV_DEBUG_INFO
IVTV_DEBUG_WARN
IVTV_ERR
IVTVFB_DBGFLG_INFO
IVTVFB_DBGFLG_WARN
IVTVFB_DEBUG
IVTVFB_DEBUG_INFO
IVTVFB_DEBUG_WARN
IVTVFB_ERR
IVTVFB_INFO
IVTVFB_WARN
IVTV_INFO
IVTV_WARN
IWL_CRIT
IWL_DEBUG
IWL_DEBUG_INFO
IWL_ERR
IWL_INFO
IWL_WARN
K_DEBUG
LCDISR_UDR_ERR
LCD_SLV_DBG
LCONSOLE_EMERG
LCONSOLE_INFO
LCONSOLE_WARN
LDLM_DEBUG
LDLM_WARN
LIBFCOE_DBG
LIBFCOE_FIP_DBG
LIBFCOE_SYSFS_DBG
LIBFCOE_TRANSPORT_DBG
LIBIPW_DEBUG
LIBIPW_DEBUG_INFO
LIBIPW_DL_INFO
LIBIPW_WARNING
LU_OBJECT_DEBUG
MAKE_BUDGET_INFO
MAL_DBG
MEDIA_INFO
MG_DBG
MODE_DEBUG
MODULE_INFO
MST_STATUS_ERR
MTS_DEBUG
MTS_WARNING
NAND_ECC_INFO
NETCP_DEBUG
NS_DBG
NS_ERR
NS_INFO
NS_WARN
NV_DEBUG
NV_INFO
NV_WARN
OCSPI_FRM_ERR
OD_INFO
OESPI_FRM_ERR
OLYMPUS_MXL_INFO
OSC_IO_DEBUG
OSDBLK_DEBUG
OSD_DEBUG
OSD_ERR
OSD_INFO
PACKAGE_INFO
PHY_ERR
PIN_INFO
PRINT_DEBUG
PROBE_DEBUG
PROTOCOL_ERR
PTR_ERR
PWC_DEBUG
PWC_INFO
PWC_WARNING
QELM_NP_ERR
QXL_DEBUG
QXL_INFO
QXL_INFO_ONCE
RBRQ_CRC_ERR
RBRQ_HBUF_ERR
RBRQ_LEN_ERR
REFTAG_ERR
REG_DBG
REG_RXPKTBUF_DBG
REG_TXPKTBUF_DBG
RES_ERR
RGMII_DBG
RIA_DEBUG
RTL_DEBUG
RTLLIB_DEBUG
RTLLIB_DEBUG_INFO
RTLLIB_DL_ERR
RTLLIB_DL_INFO
RTLLIB_WARNING
RXBD_ERR
RX_DESC_INFO
RXFSHR_ERR
RX_PKT_ERR
RXS_ERR
RX_STATUS_ERR
SITD_STS_ERR
SLAVE_AD_INFO
SLAVE_TLB_INFO
SLINK_ERR
SMC_DEBUG
SMSC_WARN
SN_PCIDEV_INFO
SORT_CRIT
SPDIF_ERR
SPI_ERR
SR_CRIT
SR_TX_ERR
SSIF_DEFAULT_DEBUG
STK_INFO
STK_WARNING
STS_ERR
SYS_CFGSTAT_ERR
TCAM_ERR
TDMC_INTR_DBG
THERMAL_ALERT
TLAN_DBG
TTM_DEBUG
TXC_DEBUG
TX_CS_DBG
TX_DESC_INFO
TX_INFO
TX_STA_ERR
UDC_DEBUG
UDC_ISO_ERR
ULPI_INFO
ULTRASTOR_DEBUG
URB_DBG
URXD_ERR
USB_DEVICE_INFO
USB_INTERFACE_INFO
USB_STS_ERR
US_DEBUG
UVC_STREAM_ERR
UW_ERR
V_CQ_ERR
VELOCITY_DBG
VMON_OV_WARNING
VMON_UV_WARNING
VREG_INFO
V_UNMAPPED_ERR
WUSBINTR_HOST_ERR
WUSBSTS_HOST_ERR
XENBUS_EXIST_ERR
XE_PARITY_ERR
XMAC_HOST_INFO
ZAURUS_PXA_INFO
ZAURUS_STRONGARM_INFO
ZMII_DBG
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-03-19 15:03 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-19 6:21 [PATCH] checkpatch: support more uppercase $logFunctions Tom Van Braeckel
2015-03-19 8:26 ` [PATCH v2] " Tom Van Braeckel
2015-03-19 9:13 ` Joe Perches
2015-03-19 9:57 ` Tom Van Braeckel
2015-03-19 15:02 ` Joe Perches
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.