staging: vme_user: Put quoted string in a single line
PATCH 1/1 staging: vme_user: Put quoted string in a single line
This patch resolves the follwing checkpatch warnings:
WARNING: quoted string split across lines
+ dev_err(tsi148_bridge->parent, "VME Mailbox %d received"
+ ": 0x%x\n", i, val);
WARNING: quoted string split across lines
+ dev_err(tsi148_bridge->parent, "PCI Exception at address: 0x%08x:%08x, "
+ "attributes: %08x\n",
WARNING: quoted string split across lines
+ dev_err(tsi148_bridge->parent, "PCI-X attribute reg: %08x, PCI-X split "
+ "completion reg: %08x\n",
WARNING: quoted string split across lines
+ dev_err(tsi148_bridge->parent, "VME Bus Exception Overflow "
+ "Occurred\n");
WARNING: quoted string split across lines
+ dev_err(tsi148_bridge->parent, "Can't get assigned pci irq "
+ "vector %02X\n", pdev->irq);
WARNING: quoted string split across lines
+ dev_err(tsi148_bridge->parent, "Failed to allocate mem "
+ "resource for window %d size 0x%lx start 0x%lx\n",
WARNING: quoted string split across lines
+ dev_err(tsi148_bridge->parent, "Invalid VME Window "
+ "alignment\n");
WARNING: quoted string split across lines
+ dev_err(tsi148_bridge->parent, "Size must be non-zero for "
+ "enabled windows\n");
WARNING: quoted string split across lines
+ dev_err(tsi148_bridge->parent, "Unable to allocate memory for "
+ "resource\n");
WARNING: quoted string split across lines
+ dev_err(tsi148_bridge->parent, "Invalid VME Offset "
+ "alignment\n");
WARNING: quoted string split across lines
+ dev_warn(tsi148_bridge->parent, "Currently not setting "
+ "Broadcast Select Registers\n");
WARNING: quoted string split across lines
+ dev_err(dev, "Currently not setting Broadcast Select "
+ "Registers\n");
WARNING: quoted string split across lines
+ dev_err(dev, "Currently not setting Broadcast Select "
+ "Registers\n");
WARNING: quoted string split across lines
+ dev_err(tsi148_bridge->parent, "Descriptor not aligned to 8 "
+ "byte boundary as required: %p\n",
warning: quoted string split across lines
+ dev_err(tsi148_bridge->parent, "location monitor "
+ "callback attached, can't reset\n");
WARNING: quoted string split across lines
+ dev_err(tsi148_bridge->parent, "Location monitor not properly "
+ "configured\n");
WARNING: quoted string split across lines
+ dev_err(tsi148_bridge->parent, "Failed to allocate memory for "
+ "CR/CSR image\n");
WARNING: quoted string split across lines
+ dev_err(tsi148_bridge->parent, "Configuring flush image"
+ " failed\n");
--- drivers/staging/vme_user/vme_tsi148.c | 57 +++++++++------------------ 1 file changed, 19 insertions(+), 38 deletions(-)
drivers/staging/vme_user/vme_tsi148.c +19 -38
@@ -125,8 +125,7 @@ static u32 tsi148_MB_irqhandler(struct vme_bridge *tsi148_bridge, u32 stat)for (i =0 ; i <4 ; i++) {if (stat &TSI148_LCSR_INTS_MBS [i]) { val =ioread32be (bridge->base +TSI148_GCSR_MBOX [i]); -dev_err (tsi148_bridge->parent,"VME Mailbox %d received" -": 0x%x\n" , i, val); +dev_err (tsi148_bridge->parent,"VME Mailbox %d received: 0x%x\n" , i, val); serviced |=TSI148_LCSR_INTC_MBC [i]; } }
@@ -143,14 +142,12 @@ static u32 tsi148_PERR_irqhandler(struct vme_bridge *tsi148_bridge) bridge = tsi148_bridge->driver_priv; -dev_err (tsi148_bridge->parent,"PCI Exception at address: 0x%08x:%08x, " -"attributes: %08x\n" , +dev_err (tsi148_bridge->parent,"PCI Exception at address: 0x%08x:%08x, attributes: %08x\n" ,ioread32be (bridge->base +TSI148_LCSR_EDPAU ),ioread32be (bridge->base +TSI148_LCSR_EDPAL ),ioread32be (bridge->base +TSI148_LCSR_EDPAT )); -dev_err (tsi148_bridge->parent,"PCI-X attribute reg: %08x, PCI-X split " -"completion reg: %08x\n" , +dev_err (tsi148_bridge->parent,"PCI-X attribute reg: %08x, PCI-X split completion reg: %08x\n" ,ioread32be (bridge->base +TSI148_LCSR_EDPXA ),ioread32be (bridge->base +TSI148_LCSR_EDPXS ));
@@ -181,8 +178,7 @@ static u32 tsi148_VERR_irqhandler(struct vme_bridge *tsi148_bridge)/* Check for exception register overflow (we have lost error data) */ if (error_attrib &TSI148_LCSR_VEAT_VEOF ) { -dev_err (tsi148_bridge->parent,"VME Bus Exception Overflow " -"Occurred\n" ); +dev_err (tsi148_bridge->parent,"VME Bus Exception Overflow Occurred\n" ); }if (err_chk)
@@ -317,8 +313,7 @@ static int tsi148_irq_init(struct vme_bridge *tsi148_bridge)IRQF_SHARED , driver_name, tsi148_bridge);if (result) { -dev_err (tsi148_bridge->parent,"Can't get assigned pci irq " -"vector %02X\n" , pdev->irq); +dev_err (tsi148_bridge->parent,"Can't get assigned pci irq vector %02X\n" , pdev->irq);return result; }
@@ -529,8 +524,7 @@ static int tsi148_slave_set(struct vme_slave_resource *image, int enabled,return -EINVAL ; }if (pci_offset_low & (granularity -1 )) { -dev_err (tsi148_bridge->parent,"Invalid PCI Offset " -"alignment\n" ); +dev_err (tsi148_bridge->parent,"Invalid PCI Offset alignment\n" );return -EINVAL ; }
@@ -762,8 +756,7 @@ static int tsi148_alloc_resource(struct vme_master_resource *image, &image->bus_resource, size,0x10000 ,PCIBIOS_MIN_MEM , 0, NULL, NULL);if (retval) { -dev_err (tsi148_bridge->parent,"Failed to allocate mem " -"resource for window %d size 0x%lx start 0x%lx\n" , +dev_err (tsi148_bridge->parent,"Failed to allocate mem resource for window %d size 0x%lx start 0x%lx\n" , image->number, (unsigned long )size, (unsigned long )image->bus_resource.start); goto err_resource;
@@ -827,15 +820,13 @@ static int tsi148_master_set(struct vme_master_resource *image, int enabled,/* Verify input data */ if (vme_base &0xFFFF ) { -dev_err (tsi148_bridge->parent,"Invalid VME Window " -"alignment\n" ); +dev_err (tsi148_bridge->parent,"Invalid VME Window alignment\n" ); retval = -EINVAL ; goto err_window; }if ((size ==0 ) && (enabled !=0 )) { -dev_err (tsi148_bridge->parent,"Size must be non-zero for " -"enabled windows\n" ); +dev_err (tsi148_bridge->parent,"Size must be non-zero for enabled windows\n" ); retval = -EINVAL ; goto err_window; }
@@ -849,8 +840,7 @@ static int tsi148_master_set(struct vme_master_resource *image, int enabled, retval =tsi148_alloc_resource (image, size);if (retval) {spin_unlock (&image->lock); -dev_err (tsi148_bridge->parent,"Unable to allocate memory for " -"resource\n" ); +dev_err (tsi148_bridge->parent,"Unable to allocate memory for resource\n" ); goto err_res; }
@@ -890,8 +880,7 @@ static int tsi148_master_set(struct vme_master_resource *image, int enabled, }if (vme_offset_low &0xFFFF ) {spin_unlock (&image->lock); -dev_err (tsi148_bridge->parent,"Invalid VME Offset " -"alignment\n" ); +dev_err (tsi148_bridge->parent,"Invalid VME Offset alignment\n" ); retval = -EINVAL ; goto err_gran; }
@@ -937,8 +926,7 @@ static int tsi148_master_set(struct vme_master_resource *image, int enabled, temp_ctl |= TSI148_LCSR_OTAT_TM_2eSST; }if (cycle & VME_2eSSTB) { -dev_warn (tsi148_bridge->parent,"Currently not setting " -"Broadcast Select Registers\n" ); +dev_warn (tsi148_bridge->parent,"Currently not setting Broadcast Select Registers\n" ); temp_ctl &= ~TSI148_LCSR_OTAT_TM_M ; temp_ctl |= TSI148_LCSR_OTAT_TM_2eSSTB; }
@@ -1451,8 +1439,7 @@ static int tsi148_dma_set_vme_src_attributes(struct device *dev, __be32 *attr, val |= TSI148_LCSR_DSAT_TM_2eSST;if (cycle & VME_2eSSTB) { -dev_err (dev,"Currently not setting Broadcast Select " -"Registers\n" ); +dev_err (dev,"Currently not setting Broadcast Select Registers\n" ); val |= TSI148_LCSR_DSAT_TM_2eSSTB; }
@@ -1550,8 +1537,7 @@ static int tsi148_dma_set_vme_dest_attributes(struct device *dev, __be32 *attr, val |= TSI148_LCSR_DDAT_TM_2eSST;if (cycle & VME_2eSSTB) { -dev_err (dev,"Currently not setting Broadcast Select " -"Registers\n" ); +dev_err (dev,"Currently not setting Broadcast Select Registers\n" ); val |= TSI148_LCSR_DDAT_TM_2eSSTB; }
@@ -1639,8 +1625,7 @@ static int tsi148_dma_list_add(struct vme_dma_list *list,/* Test descriptor alignment */ if ((unsigned long )&entry->descriptor &0x7 ) { -dev_err (tsi148_bridge->parent,"Descriptor not aligned to 8 " -"byte boundary as required: %p\n" , +dev_err (tsi148_bridge->parent,"Descriptor not aligned to 8 byte boundary as required: %p\n" , &entry->descriptor); retval = -EINVAL ; goto err_align;
@@ -1935,8 +1920,7 @@ static int tsi148_lm_set(struct vme_lm_resource *lm, unsigned long long lm_base,for (i =0 ; i < lm->monitors; i++) {if (bridge->lm_callback[i]) {mutex_unlock (&lm->mtx); -dev_err (tsi148_bridge->parent,"Location monitor " -"callback attached, can't reset\n" ); +dev_err (tsi148_bridge->parent,"Location monitor callback attached, can't reset\n" );return -EBUSY ; } }
@@ -2051,8 +2035,7 @@ static int tsi148_lm_attach(struct vme_lm_resource *lm, int monitor, lm_ctl =ioread32be (bridge->base +TSI148_LCSR_LMAT );if ((lm_ctl & (TSI148_LCSR_LMAT_PGM |TSI148_LCSR_LMAT_DATA )) ==0 ) {mutex_unlock (&lm->mtx); -dev_err (tsi148_bridge->parent,"Location monitor not properly " -"configured\n" ); +dev_err (tsi148_bridge->parent,"Location monitor not properly configured\n" );return -EINVAL ; }
@@ -2196,8 +2179,7 @@ static int tsi148_crcsr_init(struct vme_bridge *tsi148_bridge,VME_CRCSR_BUF_SIZE , &bridge->crcsr_bus, GFP_KERNEL);if (!bridge->crcsr_kernel) { -dev_err (tsi148_bridge->parent,"Failed to allocate memory for " -"CR/CSR image\n" ); +dev_err (tsi148_bridge->parent,"Failed to allocate memory for CR/CSR image\n" );return -ENOMEM ; }
@@ -2237,8 +2219,7 @@ static int tsi148_crcsr_init(struct vme_bridge *tsi148_bridge, (vstat *0x80000 ),0x80000 ,VME_CRCSR ,VME_SCT , VME_D16);if (retval) -dev_err (tsi148_bridge->parent,"Configuring flush image" -" failed\n" ); +dev_err (tsi148_bridge->parent,"Configuring flush image failed\n" ); }return 0 ;
Signature · 1 line
2.25.1
Greg KH
maintainerQuoted 83 lines · Mingyi Kang
This patch resolves the follwing checkpatch warnings:
WARNING: quoted string split across lines
(quoted diff) +2
-0+ dev_err(tsi148_bridge->parent, "VME Mailbox %d received" + ": 0x%x\n", i, val);WARNING: quoted string split across lines
(quoted diff) +2
-0+ dev_err(tsi148_bridge->parent, "PCI Exception at address: 0x%08x:%08x, " + "attributes: %08x\n",WARNING: quoted string split across lines
(quoted diff) +2
-0+ dev_err(tsi148_bridge->parent, "PCI-X attribute reg: %08x, PCI-X split " + "completion reg: %08x\n",WARNING: quoted string split across lines
(quoted diff) +2
-0+ dev_err(tsi148_bridge->parent, "VME Bus Exception Overflow " + "Occurred\n");WARNING: quoted string split across lines
(quoted diff) +2
-0+ dev_err(tsi148_bridge->parent, "Can't get assigned pci irq " + "vector %02X\n", pdev->irq);WARNING: quoted string split across lines
(quoted diff) +2
-0+ dev_err(tsi148_bridge->parent, "Failed to allocate mem " + "resource for window %d size 0x%lx start 0x%lx\n",WARNING: quoted string split across lines
(quoted diff) +2
-0+ dev_err(tsi148_bridge->parent, "Invalid VME Window " + "alignment\n");WARNING: quoted string split across lines
(quoted diff) +2
-0+ dev_err(tsi148_bridge->parent, "Size must be non-zero for " + "enabled windows\n");WARNING: quoted string split across lines
(quoted diff) +2
-0+ dev_err(tsi148_bridge->parent, "Unable to allocate memory for " + "resource\n");WARNING: quoted string split across lines
(quoted diff) +2
-0+ dev_err(tsi148_bridge->parent, "Invalid VME Offset " + "alignment\n");WARNING: quoted string split across lines
(quoted diff) +2
-0+ dev_warn(tsi148_bridge->parent, "Currently not setting " + "Broadcast Select Registers\n");WARNING: quoted string split across lines
(quoted diff) +2
-0+ dev_err(dev, "Currently not setting Broadcast Select " + "Registers\n");WARNING: quoted string split across lines
(quoted diff) +2
-0+ dev_err(dev, "Currently not setting Broadcast Select " + "Registers\n");WARNING: quoted string split across lines
(quoted diff) +2
-0+ dev_err(tsi148_bridge->parent, "Descriptor not aligned to 8 " + "byte boundary as required: %p\n",warning: quoted string split across lines
(quoted diff) +2
-0+ dev_err(tsi148_bridge->parent, "location monitor " + "callback attached, can't reset\n");WARNING: quoted string split across lines
(quoted diff) +2
-0+ dev_err(tsi148_bridge->parent, "Location monitor not properly " + "configured\n");WARNING: quoted string split across lines
(quoted diff) +2
-0+ dev_err(tsi148_bridge->parent, "Failed to allocate memory for " + "CR/CSR image\n");WARNING: quoted string split across lines
(quoted diff) +2
-0+ dev_err(tsi148_bridge->parent, "Configuring flush image" + " failed\n");Signed-off-by Mingyi Kang <[email protected]>--- drivers/staging/vme_user/vme_tsi148.c | 57 +++++++++------------------ 1 file changed, 19 insertions(+), 38 deletions(-)drivers/staging/vme_user/vme_tsi148.c +0
-0
drivers/staging/vme_user/vme_tsi148.c static u32 tsi148_MB_irqhandler(struct vme_bridge *tsi148_bridge, u32 stat) · line 128
Quoted 6 lines
drivers/staging/vme_user/vme_tsi148.c +1
-2@@ -125,8 +125,7 @@ static u32 tsi148_MB_irqhandler(struct vme_bridge *tsi148_bridge, u32 stat)for (i =0 ; i <4 ; i++) {if (stat &TSI148_LCSR_INTS_MBS [i]) { val =ioread32be (bridge->base +TSI148_GCSR_MBOX [i]); -dev_err (tsi148_bridge->parent,"VME Mailbox %d received" -": 0x%x\n" , i, val); +dev_err (tsi148_bridge->parent,"VME Mailbox %d received: 0x%x\n" , i, val);
Unwrapping the string is fine, but not the arguments. Did you run checkpatch on this change? I see some warnings on it, please don't introduce new ones.
thanks,
greg k-h