Skip to content

Commit f13bd29

Browse files
jerrykcodegregkh
authored andcommitted
staging: vme_user: Fix checkpatch warnings in vme_tsi148.c
This patch fix the follwing checkpatch warnings: WARNING: quoted string split across lines torvalds#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 torvalds#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 torvalds#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 torvalds#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 torvalds#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 torvalds#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 torvalds#591: FILE: drivers/staging/vme_user/vme_tsi148.c:591: + temp_ctl |= TSI148_LCSR_ITAT_SUPR ; WARNING: quoted string split across lines torvalds#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 torvalds#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 torvalds#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 torvalds#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 torvalds#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 torvalds#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: Mingyi Kang <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent aef1bf6 commit f13bd29

File tree

1 file changed

+26
-44
lines changed

1 file changed

+26
-44
lines changed

drivers/staging/vme_user/vme_tsi148.c

Lines changed: 26 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ static u32 tsi148_MB_irqhandler(struct vme_bridge *tsi148_bridge, u32 stat)
125125
for (i = 0; i < 4; i++) {
126126
if (stat & TSI148_LCSR_INTS_MBS[i]) {
127127
val = ioread32be(bridge->base + TSI148_GCSR_MBOX[i]);
128-
dev_err(tsi148_bridge->parent, "VME Mailbox %d received"
129-
": 0x%x\n", i, val);
128+
dev_err(tsi148_bridge->parent, "VME Mailbox %d received: 0x%x\n",
129+
i, val);
130130
serviced |= TSI148_LCSR_INTC_MBC[i];
131131
}
132132
}
@@ -143,14 +143,12 @@ static u32 tsi148_PERR_irqhandler(struct vme_bridge *tsi148_bridge)
143143

144144
bridge = tsi148_bridge->driver_priv;
145145

146-
dev_err(tsi148_bridge->parent, "PCI Exception at address: 0x%08x:%08x, "
147-
"attributes: %08x\n",
146+
dev_err(tsi148_bridge->parent, "PCI Exception at address: 0x%08x:%08x, attributes: %08x\n",
148147
ioread32be(bridge->base + TSI148_LCSR_EDPAU),
149148
ioread32be(bridge->base + TSI148_LCSR_EDPAL),
150149
ioread32be(bridge->base + TSI148_LCSR_EDPAT));
151150

152-
dev_err(tsi148_bridge->parent, "PCI-X attribute reg: %08x, PCI-X split "
153-
"completion reg: %08x\n",
151+
dev_err(tsi148_bridge->parent, "PCI-X attribute reg: %08x, PCI-X split completion reg: %08x\n",
154152
ioread32be(bridge->base + TSI148_LCSR_EDPXA),
155153
ioread32be(bridge->base + TSI148_LCSR_EDPXS));
156154

@@ -180,10 +178,8 @@ static u32 tsi148_VERR_irqhandler(struct vme_bridge *tsi148_bridge)
180178
reg_join(error_addr_high, error_addr_low, &error_addr);
181179

182180
/* Check for exception register overflow (we have lost error data) */
183-
if (error_attrib & TSI148_LCSR_VEAT_VEOF) {
184-
dev_err(tsi148_bridge->parent, "VME Bus Exception Overflow "
185-
"Occurred\n");
186-
}
181+
if (error_attrib & TSI148_LCSR_VEAT_VEOF)
182+
dev_err(tsi148_bridge->parent, "VME Bus Exception Overflow Occurred\n");
187183

188184
if (err_chk)
189185
vme_bus_error_handler(tsi148_bridge, error_addr, error_am);
@@ -317,8 +313,8 @@ static int tsi148_irq_init(struct vme_bridge *tsi148_bridge)
317313
IRQF_SHARED,
318314
driver_name, tsi148_bridge);
319315
if (result) {
320-
dev_err(tsi148_bridge->parent, "Can't get assigned pci irq "
321-
"vector %02X\n", pdev->irq);
316+
dev_err(tsi148_bridge->parent, "Can't get assigned pci irq vector %02X\n",
317+
pdev->irq);
322318
return result;
323319
}
324320

@@ -529,8 +525,7 @@ static int tsi148_slave_set(struct vme_slave_resource *image, int enabled,
529525
return -EINVAL;
530526
}
531527
if (pci_offset_low & (granularity - 1)) {
532-
dev_err(tsi148_bridge->parent, "Invalid PCI Offset "
533-
"alignment\n");
528+
dev_err(tsi148_bridge->parent, "Invalid PCI Offset alignment\n");
534529
return -EINVAL;
535530
}
536531

@@ -588,7 +583,7 @@ static int tsi148_slave_set(struct vme_slave_resource *image, int enabled,
588583

589584
temp_ctl &= ~0xF;
590585
if (cycle & VME_SUPER)
591-
temp_ctl |= TSI148_LCSR_ITAT_SUPR ;
586+
temp_ctl |= TSI148_LCSR_ITAT_SUPR;
592587
if (cycle & VME_USER)
593588
temp_ctl |= TSI148_LCSR_ITAT_NPRIV;
594589
if (cycle & VME_PROG)
@@ -762,8 +757,7 @@ static int tsi148_alloc_resource(struct vme_master_resource *image,
762757
&image->bus_resource, size, 0x10000, PCIBIOS_MIN_MEM,
763758
0, NULL, NULL);
764759
if (retval) {
765-
dev_err(tsi148_bridge->parent, "Failed to allocate mem "
766-
"resource for window %d size 0x%lx start 0x%lx\n",
760+
dev_err(tsi148_bridge->parent, "Failed to allocate mem resource for window %d size 0x%lx start 0x%lx\n",
767761
image->number, (unsigned long)size,
768762
(unsigned long)image->bus_resource.start);
769763
goto err_resource;
@@ -827,15 +821,13 @@ static int tsi148_master_set(struct vme_master_resource *image, int enabled,
827821

828822
/* Verify input data */
829823
if (vme_base & 0xFFFF) {
830-
dev_err(tsi148_bridge->parent, "Invalid VME Window "
831-
"alignment\n");
824+
dev_err(tsi148_bridge->parent, "Invalid VME Window alignment\n");
832825
retval = -EINVAL;
833826
goto err_window;
834827
}
835828

836829
if ((size == 0) && (enabled != 0)) {
837-
dev_err(tsi148_bridge->parent, "Size must be non-zero for "
838-
"enabled windows\n");
830+
dev_err(tsi148_bridge->parent, "Size must be non-zero for enabled windows\n");
839831
retval = -EINVAL;
840832
goto err_window;
841833
}
@@ -849,8 +841,7 @@ static int tsi148_master_set(struct vme_master_resource *image, int enabled,
849841
retval = tsi148_alloc_resource(image, size);
850842
if (retval) {
851843
spin_unlock(&image->lock);
852-
dev_err(tsi148_bridge->parent, "Unable to allocate memory for "
853-
"resource\n");
844+
dev_err(tsi148_bridge->parent, "Unable to allocate memory for resource\n");
854845
goto err_res;
855846
}
856847

@@ -890,8 +881,7 @@ static int tsi148_master_set(struct vme_master_resource *image, int enabled,
890881
}
891882
if (vme_offset_low & 0xFFFF) {
892883
spin_unlock(&image->lock);
893-
dev_err(tsi148_bridge->parent, "Invalid VME Offset "
894-
"alignment\n");
884+
dev_err(tsi148_bridge->parent, "Invalid VME Offset alignment\n");
895885
retval = -EINVAL;
896886
goto err_gran;
897887
}
@@ -937,8 +927,7 @@ static int tsi148_master_set(struct vme_master_resource *image, int enabled,
937927
temp_ctl |= TSI148_LCSR_OTAT_TM_2eSST;
938928
}
939929
if (cycle & VME_2eSSTB) {
940-
dev_warn(tsi148_bridge->parent, "Currently not setting "
941-
"Broadcast Select Registers\n");
930+
dev_warn(tsi148_bridge->parent, "Currently not setting Broadcast Select Registers\n");
942931
temp_ctl &= ~TSI148_LCSR_OTAT_TM_M;
943932
temp_ctl |= TSI148_LCSR_OTAT_TM_2eSSTB;
944933
}
@@ -1451,8 +1440,7 @@ static int tsi148_dma_set_vme_src_attributes(struct device *dev, __be32 *attr,
14511440
val |= TSI148_LCSR_DSAT_TM_2eSST;
14521441

14531442
if (cycle & VME_2eSSTB) {
1454-
dev_err(dev, "Currently not setting Broadcast Select "
1455-
"Registers\n");
1443+
dev_err(dev, "Currently not setting Broadcast Select Registers\n");
14561444
val |= TSI148_LCSR_DSAT_TM_2eSSTB;
14571445
}
14581446

@@ -1550,8 +1538,7 @@ static int tsi148_dma_set_vme_dest_attributes(struct device *dev, __be32 *attr,
15501538
val |= TSI148_LCSR_DDAT_TM_2eSST;
15511539

15521540
if (cycle & VME_2eSSTB) {
1553-
dev_err(dev, "Currently not setting Broadcast Select "
1554-
"Registers\n");
1541+
dev_err(dev, "Currently not setting Broadcast Select Registers\n");
15551542
val |= TSI148_LCSR_DDAT_TM_2eSSTB;
15561543
}
15571544

@@ -1639,8 +1626,7 @@ static int tsi148_dma_list_add(struct vme_dma_list *list,
16391626

16401627
/* Test descriptor alignment */
16411628
if ((unsigned long)&entry->descriptor & 0x7) {
1642-
dev_err(tsi148_bridge->parent, "Descriptor not aligned to 8 "
1643-
"byte boundary as required: %p\n",
1629+
dev_err(tsi148_bridge->parent, "Descriptor not aligned to 8 byte boundary as required: %p\n",
16441630
&entry->descriptor);
16451631
retval = -EINVAL;
16461632
goto err_align;
@@ -1827,10 +1813,10 @@ static int tsi148_dma_list_exec(struct vme_dma_list *list)
18271813
/* Need to add to pending here */
18281814
mutex_unlock(&ctrlr->mtx);
18291815
return -EBUSY;
1830-
} else {
1831-
list_add(&list->list, &ctrlr->running);
18321816
}
18331817

1818+
list_add(&list->list, &ctrlr->running);
1819+
18341820
/* Get first bus address and write into registers */
18351821
entry = list_first_entry(&list->entries, struct tsi148_dma_entry,
18361822
list);
@@ -1935,8 +1921,7 @@ static int tsi148_lm_set(struct vme_lm_resource *lm, unsigned long long lm_base,
19351921
for (i = 0; i < lm->monitors; i++) {
19361922
if (bridge->lm_callback[i]) {
19371923
mutex_unlock(&lm->mtx);
1938-
dev_err(tsi148_bridge->parent, "Location monitor "
1939-
"callback attached, can't reset\n");
1924+
dev_err(tsi148_bridge->parent, "Location monitor callback attached, can't reset\n");
19401925
return -EBUSY;
19411926
}
19421927
}
@@ -1961,7 +1946,7 @@ static int tsi148_lm_set(struct vme_lm_resource *lm, unsigned long long lm_base,
19611946
}
19621947

19631948
if (cycle & VME_SUPER)
1964-
lm_ctl |= TSI148_LCSR_LMAT_SUPR ;
1949+
lm_ctl |= TSI148_LCSR_LMAT_SUPR;
19651950
if (cycle & VME_USER)
19661951
lm_ctl |= TSI148_LCSR_LMAT_NPRIV;
19671952
if (cycle & VME_PROG)
@@ -2051,8 +2036,7 @@ static int tsi148_lm_attach(struct vme_lm_resource *lm, int monitor,
20512036
lm_ctl = ioread32be(bridge->base + TSI148_LCSR_LMAT);
20522037
if ((lm_ctl & (TSI148_LCSR_LMAT_PGM | TSI148_LCSR_LMAT_DATA)) == 0) {
20532038
mutex_unlock(&lm->mtx);
2054-
dev_err(tsi148_bridge->parent, "Location monitor not properly "
2055-
"configured\n");
2039+
dev_err(tsi148_bridge->parent, "Location monitor not properly configured\n");
20562040
return -EINVAL;
20572041
}
20582042

@@ -2196,8 +2180,7 @@ static int tsi148_crcsr_init(struct vme_bridge *tsi148_bridge,
21962180
VME_CRCSR_BUF_SIZE,
21972181
&bridge->crcsr_bus, GFP_KERNEL);
21982182
if (!bridge->crcsr_kernel) {
2199-
dev_err(tsi148_bridge->parent, "Failed to allocate memory for "
2200-
"CR/CSR image\n");
2183+
dev_err(tsi148_bridge->parent, "Failed to allocate memory for CR/CSR image\n");
22012184
return -ENOMEM;
22022185
}
22032186

@@ -2237,8 +2220,7 @@ static int tsi148_crcsr_init(struct vme_bridge *tsi148_bridge,
22372220
(vstat * 0x80000), 0x80000, VME_CRCSR, VME_SCT,
22382221
VME_D16);
22392222
if (retval)
2240-
dev_err(tsi148_bridge->parent, "Configuring flush image"
2241-
" failed\n");
2223+
dev_err(tsi148_bridge->parent, "Configuring flush image failed\n");
22422224
}
22432225

22442226
return 0;

0 commit comments

Comments
 (0)