Skip to content

L
linux
Commit f13bd29c authored by Mingyi Kang's avatar Mingyi Kang Committed by Greg Kroah-Hartman
Browse files
Options

staging: vme_user: Fix checkpatch warnings in vme_tsi148.c 

This patch fix the follwing checkpatch warnings:

	WARNING: quoted string split across lines
	#129: FILE: drivers/staging/vme_user/vme_tsi148.c:129:
	+			dev_err(tsi148_bridge->parent, "VME Mailbox %d received"
	+				": 0x%x\n", i, val);

	WARNING: quoted string split across lines
	#147: FILE: drivers/staging/vme_user/vme_tsi148.c:147:
	+	dev_err(tsi148_bridge->parent, "PCI Exception at address: 0x%08x:%08x, "
	+		"attributes: %08x\n",

	WARNING: quoted string split across lines
	#153: FILE: drivers/staging/vme_user/vme_tsi148.c:153:
	+	dev_err(tsi148_bridge->parent, "PCI-X attribute reg: %08x, PCI-X split "
	+		"completion reg: %08x\n",

	WARNING: quoted string split across lines
	#185: FILE: drivers/staging/vme_user/vme_tsi148.c:185:
	+		dev_err(tsi148_bridge->parent, "VME Bus Exception Overflow "
	+			"Occurred\n");

	WARNING: quoted string split across lines
	#321: FILE: drivers/staging/vme_user/vme_tsi148.c:321:
	+		dev_err(tsi148_bridge->parent, "Can't get assigned pci irq "
	+			"vector %02X\n", pdev->irq);

	WARNING: quoted string split across lines
	#533: FILE: drivers/staging/vme_user/vme_tsi148.c:533:
	+		dev_err(tsi148_bridge->parent, "Invalid PCI Offset "
	+			"alignment\n");

	WARNING: space prohibited before semicolon
	#591: FILE: drivers/staging/vme_user/vme_tsi148.c:591:
	+		temp_ctl |= TSI148_LCSR_ITAT_SUPR ;

	WARNING: quoted string split across lines
	#766: FILE: drivers/staging/vme_user/vme_tsi148.c:766:
	+		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
	#831: FILE: drivers/staging/vme_user/vme_tsi148.c:831:
	+		dev_err(tsi148_bridge->parent, "Invalid VME Window "
	+			"alignment\n");
	WARNING: quoted string split across lines
	#838: FILE: drivers/staging/vme_user/vme_tsi148.c:838:
	+		dev_err(tsi148_bridge->parent, "Size must be non-zero for "
	+			"enabled windows\n");

	WARNING: quoted string split across lines
	#853: FILE: drivers/staging/vme_user/vme_tsi148.c:853:
	+		dev_err(tsi148_bridge->parent, "Unable to allocate memory for "
	+			"resource\n");

	WARNING: quoted string split across lines
	#894: FILE: drivers/staging/vme_user/vme_tsi148.c:894:
	+		dev_err(tsi148_bridge->parent, "Invalid VME Offset "
	+			"alignment\n");

	WARNING: quoted string split across lines
	#941: FILE: drivers/staging/vme_user/vme_tsi148.c:941:
	+		dev_warn(tsi148_bridge->parent, "Currently not setting "
	+			"Broadcast Select Registers\n");

	WARNING: quoted string split across lines
	#1455: FILE: drivers/staging/vme_user/vme_tsi148.c:1455:
	+		dev_err(dev, "Currently not setting Broadcast Select "
	+			"Registers\n");

	WARNING: quoted string split across lines
	#1554: FILE: drivers/staging/vme_user/vme_tsi148.c:1554:
	+		dev_err(dev, "Currently not setting Broadcast Select "
	+			"Registers\n");

	WARNING: quoted string split across lines
	#1643: FILE: drivers/staging/vme_user/vme_tsi148.c:1643:
	+		dev_err(tsi148_bridge->parent, "Descriptor not aligned to 8 "
	+			"byte boundary as required: %p\n",

	WARNING: else is not generally useful after a break or return
	#1830: FILE: drivers/staging/vme_user/vme_tsi148.c:1830:
	+		return -EBUSY;
	+	} else {

	warning: quoted string split across lines
	#1939: file: drivers/staging/vme_user/vme_tsi148.c:1939:
	+			dev_err(tsi148_bridge->parent, "location monitor "
	+				"callback attached, can't reset\n");

	WARNING: space prohibited before semicolon
	#1964: FILE: drivers/staging/vme_user/vme_tsi148.c:1964:
	+		lm_ctl |= TSI148_LCSR_LMAT_SUPR ;

	WARNING: quoted string split across lines
	#2055: FILE: drivers/staging/vme_user/vme_tsi148.c:2055:
	+		dev_err(tsi148_bridge->parent, "Location monitor not properly "
	+			"configured\n");

	WARNING: quoted string split across lines
	#2200: FILE: drivers/staging/vme_user/vme_tsi148.c:2200:
	+		dev_err(tsi148_bridge->parent, "Failed to allocate memory for "
	+			"CR/CSR image\n");

	WARNING: quoted string split across lines
	#2241: FILE: drivers/staging/vme_user/vme_tsi148.c:2241:
	+			dev_err(tsi148_bridge->parent, "Configuring flush image"
	+				" failed\n");
Signed-off-by: default avatarMingyi Kang <jerrykang026@gmail.com>
Link: https://lore.kernel.org/r/20220730045726.55452-1-jerrykang026@gmail.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent aef1bf6f
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 44 deletions
drivers/staging/vme_user/vme_tsi148.c
View file @ f13bd29c
...@@ -125,8 +125,8 @@ static u32 tsi148_MB_irqhandler(struct vme_bridge *tsi148_bridge, u32 stat) ...@@ -125,8 +125,8 @@ static u32 tsi148_MB_irqhandler(struct vme_bridge *tsi148_bridge, u32 stat)
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
if (stat & TSI148_LCSR_INTS_MBS[i]) { if (stat & TSI148_LCSR_INTS_MBS[i]) {
val = ioread32be(bridge->base + TSI148_GCSR_MBOX[i]); val = ioread32be(bridge->base + TSI148_GCSR_MBOX[i]);
dev_err(tsi148_bridge->parent, "VME Mailbox %d received" dev_err(tsi148_bridge->parent, "VME Mailbox %d received: 0x%x\n",
": 0x%x\n", i, val); i, val);
serviced |= TSI148_LCSR_INTC_MBC[i]; serviced |= TSI148_LCSR_INTC_MBC[i];
} }
} }
...@@ -143,14 +143,12 @@ static u32 tsi148_PERR_irqhandler(struct vme_bridge *tsi148_bridge) ...@@ -143,14 +143,12 @@ static u32 tsi148_PERR_irqhandler(struct vme_bridge *tsi148_bridge)
bridge = tsi148_bridge->driver_priv; bridge = tsi148_bridge->driver_priv;
dev_err(tsi148_bridge->parent, "PCI Exception at address: 0x%08x:%08x, " dev_err(tsi148_bridge->parent, "PCI Exception at address: 0x%08x:%08x, attributes: %08x\n",
"attributes: %08x\n",
ioread32be(bridge->base + TSI148_LCSR_EDPAU), ioread32be(bridge->base + TSI148_LCSR_EDPAU),
ioread32be(bridge->base + TSI148_LCSR_EDPAL), ioread32be(bridge->base + TSI148_LCSR_EDPAL),
ioread32be(bridge->base + TSI148_LCSR_EDPAT)); ioread32be(bridge->base + TSI148_LCSR_EDPAT));
dev_err(tsi148_bridge->parent, "PCI-X attribute reg: %08x, PCI-X split " dev_err(tsi148_bridge->parent, "PCI-X attribute reg: %08x, PCI-X split completion reg: %08x\n",
"completion reg: %08x\n",
ioread32be(bridge->base + TSI148_LCSR_EDPXA), ioread32be(bridge->base + TSI148_LCSR_EDPXA),
ioread32be(bridge->base + TSI148_LCSR_EDPXS)); ioread32be(bridge->base + TSI148_LCSR_EDPXS));
...@@ -180,10 +178,8 @@ static u32 tsi148_VERR_irqhandler(struct vme_bridge *tsi148_bridge) ...@@ -180,10 +178,8 @@ static u32 tsi148_VERR_irqhandler(struct vme_bridge *tsi148_bridge)
reg_join(error_addr_high, error_addr_low, &error_addr); reg_join(error_addr_high, error_addr_low, &error_addr);
/* Check for exception register overflow (we have lost error data) */ /* Check for exception register overflow (we have lost error data) */
if (error_attrib & TSI148_LCSR_VEAT_VEOF) { if (error_attrib & TSI148_LCSR_VEAT_VEOF)
dev_err(tsi148_bridge->parent, "VME Bus Exception Overflow " dev_err(tsi148_bridge->parent, "VME Bus Exception Overflow Occurred\n");
"Occurred\n");
}
if (err_chk) if (err_chk)
vme_bus_error_handler(tsi148_bridge, error_addr, error_am); vme_bus_error_handler(tsi148_bridge, error_addr, error_am);
...@@ -317,8 +313,8 @@ static int tsi148_irq_init(struct vme_bridge *tsi148_bridge) ...@@ -317,8 +313,8 @@ static int tsi148_irq_init(struct vme_bridge *tsi148_bridge)
IRQF_SHARED, IRQF_SHARED,
driver_name, tsi148_bridge); driver_name, tsi148_bridge);
if (result) { if (result) {
dev_err(tsi148_bridge->parent, "Can't get assigned pci irq " dev_err(tsi148_bridge->parent, "Can't get assigned pci irq vector %02X\n",
"vector %02X\n", pdev->irq); pdev->irq);
return result; return result;
} }
...@@ -529,8 +525,7 @@ static int tsi148_slave_set(struct vme_slave_resource *image, int enabled, ...@@ -529,8 +525,7 @@ static int tsi148_slave_set(struct vme_slave_resource *image, int enabled,
return -EINVAL; return -EINVAL;
} }
if (pci_offset_low & (granularity - 1)) { if (pci_offset_low & (granularity - 1)) {
dev_err(tsi148_bridge->parent, "Invalid PCI Offset " dev_err(tsi148_bridge->parent, "Invalid PCI Offset alignment\n");
"alignment\n");
return -EINVAL; return -EINVAL;
} }
...@@ -588,7 +583,7 @@ static int tsi148_slave_set(struct vme_slave_resource *image, int enabled, ...@@ -588,7 +583,7 @@ static int tsi148_slave_set(struct vme_slave_resource *image, int enabled,
temp_ctl &= ~0xF; temp_ctl &= ~0xF;
if (cycle & VME_SUPER) if (cycle & VME_SUPER)
temp_ctl |= TSI148_LCSR_ITAT_SUPR ; temp_ctl |= TSI148_LCSR_ITAT_SUPR;
if (cycle & VME_USER) if (cycle & VME_USER)
temp_ctl |= TSI148_LCSR_ITAT_NPRIV; temp_ctl |= TSI148_LCSR_ITAT_NPRIV;
if (cycle & VME_PROG) if (cycle & VME_PROG)
...@@ -762,8 +757,7 @@ static int tsi148_alloc_resource(struct vme_master_resource *image, ...@@ -762,8 +757,7 @@ static int tsi148_alloc_resource(struct vme_master_resource *image,
&image->bus_resource, size, 0x10000, PCIBIOS_MIN_MEM, &image->bus_resource, size, 0x10000, PCIBIOS_MIN_MEM,
0, NULL, NULL); 0, NULL, NULL);
if (retval) { if (retval) {
dev_err(tsi148_bridge->parent, "Failed to allocate mem " dev_err(tsi148_bridge->parent, "Failed to allocate mem resource for window %d size 0x%lx start 0x%lx\n",
"resource for window %d size 0x%lx start 0x%lx\n",
image->number, (unsigned long)size, image->number, (unsigned long)size,
(unsigned long)image->bus_resource.start); (unsigned long)image->bus_resource.start);
goto err_resource; goto err_resource;
...@@ -827,15 +821,13 @@ static int tsi148_master_set(struct vme_master_resource *image, int enabled, ...@@ -827,15 +821,13 @@ static int tsi148_master_set(struct vme_master_resource *image, int enabled,
/* Verify input data */ /* Verify input data */
if (vme_base & 0xFFFF) { if (vme_base & 0xFFFF) {
dev_err(tsi148_bridge->parent, "Invalid VME Window " dev_err(tsi148_bridge->parent, "Invalid VME Window alignment\n");
"alignment\n");
retval = -EINVAL; retval = -EINVAL;
goto err_window; goto err_window;
} }
if ((size == 0) && (enabled != 0)) { if ((size == 0) && (enabled != 0)) {
dev_err(tsi148_bridge->parent, "Size must be non-zero for " dev_err(tsi148_bridge->parent, "Size must be non-zero for enabled windows\n");
"enabled windows\n");
retval = -EINVAL; retval = -EINVAL;
goto err_window; goto err_window;
} }
...@@ -849,8 +841,7 @@ static int tsi148_master_set(struct vme_master_resource *image, int enabled, ...@@ -849,8 +841,7 @@ static int tsi148_master_set(struct vme_master_resource *image, int enabled,
retval = tsi148_alloc_resource(image, size); retval = tsi148_alloc_resource(image, size);
if (retval) { if (retval) {
spin_unlock(&image->lock); spin_unlock(&image->lock);
dev_err(tsi148_bridge->parent, "Unable to allocate memory for " dev_err(tsi148_bridge->parent, "Unable to allocate memory for resource\n");
"resource\n");
goto err_res; goto err_res;
} }
...@@ -890,8 +881,7 @@ static int tsi148_master_set(struct vme_master_resource *image, int enabled, ...@@ -890,8 +881,7 @@ static int tsi148_master_set(struct vme_master_resource *image, int enabled,
} }
if (vme_offset_low & 0xFFFF) { if (vme_offset_low & 0xFFFF) {
spin_unlock(&image->lock); spin_unlock(&image->lock);
dev_err(tsi148_bridge->parent, "Invalid VME Offset " dev_err(tsi148_bridge->parent, "Invalid VME Offset alignment\n");
"alignment\n");
retval = -EINVAL; retval = -EINVAL;
goto err_gran; goto err_gran;
} }
...@@ -937,8 +927,7 @@ static int tsi148_master_set(struct vme_master_resource *image, int enabled, ...@@ -937,8 +927,7 @@ static int tsi148_master_set(struct vme_master_resource *image, int enabled,
temp_ctl |= TSI148_LCSR_OTAT_TM_2eSST; temp_ctl |= TSI148_LCSR_OTAT_TM_2eSST;
} }
if (cycle & VME_2eSSTB) { if (cycle & VME_2eSSTB) {
dev_warn(tsi148_bridge->parent, "Currently not setting " dev_warn(tsi148_bridge->parent, "Currently not setting Broadcast Select Registers\n");
"Broadcast Select Registers\n");
temp_ctl &= ~TSI148_LCSR_OTAT_TM_M; temp_ctl &= ~TSI148_LCSR_OTAT_TM_M;
temp_ctl |= TSI148_LCSR_OTAT_TM_2eSSTB; temp_ctl |= TSI148_LCSR_OTAT_TM_2eSSTB;
} }
...@@ -1451,8 +1440,7 @@ static int tsi148_dma_set_vme_src_attributes(struct device *dev, __be32 *attr, ...@@ -1451,8 +1440,7 @@ static int tsi148_dma_set_vme_src_attributes(struct device *dev, __be32 *attr,
val |= TSI148_LCSR_DSAT_TM_2eSST; val |= TSI148_LCSR_DSAT_TM_2eSST;
if (cycle & VME_2eSSTB) { if (cycle & VME_2eSSTB) {
dev_err(dev, "Currently not setting Broadcast Select " dev_err(dev, "Currently not setting Broadcast Select Registers\n");
"Registers\n");
val |= TSI148_LCSR_DSAT_TM_2eSSTB; val |= TSI148_LCSR_DSAT_TM_2eSSTB;
} }
...@@ -1550,8 +1538,7 @@ static int tsi148_dma_set_vme_dest_attributes(struct device *dev, __be32 *attr, ...@@ -1550,8 +1538,7 @@ static int tsi148_dma_set_vme_dest_attributes(struct device *dev, __be32 *attr,
val |= TSI148_LCSR_DDAT_TM_2eSST; val |= TSI148_LCSR_DDAT_TM_2eSST;
if (cycle & VME_2eSSTB) { if (cycle & VME_2eSSTB) {
dev_err(dev, "Currently not setting Broadcast Select " dev_err(dev, "Currently not setting Broadcast Select Registers\n");
"Registers\n");
val |= TSI148_LCSR_DDAT_TM_2eSSTB; val |= TSI148_LCSR_DDAT_TM_2eSSTB;
} }
...@@ -1639,8 +1626,7 @@ static int tsi148_dma_list_add(struct vme_dma_list *list, ...@@ -1639,8 +1626,7 @@ static int tsi148_dma_list_add(struct vme_dma_list *list,
/* Test descriptor alignment */ /* Test descriptor alignment */
if ((unsigned long)&entry->descriptor & 0x7) { if ((unsigned long)&entry->descriptor & 0x7) {
dev_err(tsi148_bridge->parent, "Descriptor not aligned to 8 " dev_err(tsi148_bridge->parent, "Descriptor not aligned to 8 byte boundary as required: %p\n",
"byte boundary as required: %p\n",
&entry->descriptor); &entry->descriptor);
retval = -EINVAL; retval = -EINVAL;
goto err_align; goto err_align;
...@@ -1827,10 +1813,10 @@ static int tsi148_dma_list_exec(struct vme_dma_list *list) ...@@ -1827,10 +1813,10 @@ static int tsi148_dma_list_exec(struct vme_dma_list *list)
/* Need to add to pending here */ /* Need to add to pending here */
mutex_unlock(&ctrlr->mtx); mutex_unlock(&ctrlr->mtx);
return -EBUSY; return -EBUSY;
} else {
list_add(&list->list, &ctrlr->running);
} }
list_add(&list->list, &ctrlr->running);
/* Get first bus address and write into registers */ /* Get first bus address and write into registers */
entry = list_first_entry(&list->entries, struct tsi148_dma_entry, entry = list_first_entry(&list->entries, struct tsi148_dma_entry,
list); list);
...@@ -1935,8 +1921,7 @@ static int tsi148_lm_set(struct vme_lm_resource *lm, unsigned long long lm_base, ...@@ -1935,8 +1921,7 @@ static int tsi148_lm_set(struct vme_lm_resource *lm, unsigned long long lm_base,
for (i = 0; i < lm->monitors; i++) { for (i = 0; i < lm->monitors; i++) {
if (bridge->lm_callback[i]) { if (bridge->lm_callback[i]) {
mutex_unlock(&lm->mtx); mutex_unlock(&lm->mtx);
dev_err(tsi148_bridge->parent, "Location monitor " dev_err(tsi148_bridge->parent, "Location monitor callback attached, can't reset\n");
"callback attached, can't reset\n");
return -EBUSY; return -EBUSY;
} }
} }
...@@ -1961,7 +1946,7 @@ static int tsi148_lm_set(struct vme_lm_resource *lm, unsigned long long lm_base, ...@@ -1961,7 +1946,7 @@ static int tsi148_lm_set(struct vme_lm_resource *lm, unsigned long long lm_base,
} }
if (cycle & VME_SUPER) if (cycle & VME_SUPER)
lm_ctl |= TSI148_LCSR_LMAT_SUPR ; lm_ctl |= TSI148_LCSR_LMAT_SUPR;
if (cycle & VME_USER) if (cycle & VME_USER)
lm_ctl |= TSI148_LCSR_LMAT_NPRIV; lm_ctl |= TSI148_LCSR_LMAT_NPRIV;
if (cycle & VME_PROG) if (cycle & VME_PROG)
...@@ -2051,8 +2036,7 @@ static int tsi148_lm_attach(struct vme_lm_resource *lm, int monitor, ...@@ -2051,8 +2036,7 @@ static int tsi148_lm_attach(struct vme_lm_resource *lm, int monitor,
lm_ctl = ioread32be(bridge->base + TSI148_LCSR_LMAT); lm_ctl = ioread32be(bridge->base + TSI148_LCSR_LMAT);
if ((lm_ctl & (TSI148_LCSR_LMAT_PGM | TSI148_LCSR_LMAT_DATA)) == 0) { if ((lm_ctl & (TSI148_LCSR_LMAT_PGM | TSI148_LCSR_LMAT_DATA)) == 0) {
mutex_unlock(&lm->mtx); mutex_unlock(&lm->mtx);
dev_err(tsi148_bridge->parent, "Location monitor not properly " dev_err(tsi148_bridge->parent, "Location monitor not properly configured\n");
"configured\n");
return -EINVAL; return -EINVAL;
} }
...@@ -2196,8 +2180,7 @@ static int tsi148_crcsr_init(struct vme_bridge *tsi148_bridge, ...@@ -2196,8 +2180,7 @@ static int tsi148_crcsr_init(struct vme_bridge *tsi148_bridge,
VME_CRCSR_BUF_SIZE, VME_CRCSR_BUF_SIZE,
&bridge->crcsr_bus, GFP_KERNEL); &bridge->crcsr_bus, GFP_KERNEL);
if (!bridge->crcsr_kernel) { if (!bridge->crcsr_kernel) {
dev_err(tsi148_bridge->parent, "Failed to allocate memory for " dev_err(tsi148_bridge->parent, "Failed to allocate memory for CR/CSR image\n");
"CR/CSR image\n");
return -ENOMEM; return -ENOMEM;
} }
...@@ -2237,8 +2220,7 @@ static int tsi148_crcsr_init(struct vme_bridge *tsi148_bridge, ...@@ -2237,8 +2220,7 @@ static int tsi148_crcsr_init(struct vme_bridge *tsi148_bridge,
(vstat * 0x80000), 0x80000, VME_CRCSR, VME_SCT, (vstat * 0x80000), 0x80000, VME_CRCSR, VME_SCT,
VME_D16); VME_D16);
if (retval) if (retval)
dev_err(tsi148_bridge->parent, "Configuring flush image" dev_err(tsi148_bridge->parent, "Configuring flush image failed\n");
" failed\n");
} }
return 0; return 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7