Skip to content

L
linux
Commit e693d73c authored by Joe Perches's avatar Joe Perches Committed by Linus Torvalds
Browse files
Options

parisc: remove use of seq_printf return value 

The seq_printf return value, because it's frequently misused,
will eventually be converted to void.

See: commit 1f33c41c ("seq_file: Rename seq_overflow() to
     seq_has_overflowed() and make public")
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
Cc: Helge Deller <deller@gmx.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d50f8f8d
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 72 deletions
drivers/parisc/ccio-dma.c
View file @ e693d73c
...@@ -1021,7 +1021,6 @@ static struct hppa_dma_ops ccio_ops = { ...@@ -1021,7 +1021,6 @@ static struct hppa_dma_ops ccio_ops = {
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
static int ccio_proc_info(struct seq_file *m, void *p) static int ccio_proc_info(struct seq_file *m, void *p)
{ {
int len = 0;
struct ioc *ioc = ioc_list; struct ioc *ioc = ioc_list;
while (ioc != NULL) { while (ioc != NULL) {
...@@ -1031,22 +1030,22 @@ static int ccio_proc_info(struct seq_file *m, void *p) ...@@ -1031,22 +1030,22 @@ static int ccio_proc_info(struct seq_file *m, void *p)
int j; int j;
#endif #endif
len += seq_printf(m, "%s\n", ioc->name); seq_printf(m, "%s\n", ioc->name);
len += seq_printf(m, "Cujo 2.0 bug : %s\n", seq_printf(m, "Cujo 2.0 bug : %s\n",
(ioc->cujo20_bug ? "yes" : "no")); (ioc->cujo20_bug ? "yes" : "no"));
len += seq_printf(m, "IO PDIR size : %d bytes (%d entries)\n", seq_printf(m, "IO PDIR size : %d bytes (%d entries)\n",
total_pages * 8, total_pages); total_pages * 8, total_pages);
#ifdef CCIO_COLLECT_STATS #ifdef CCIO_COLLECT_STATS
len += seq_printf(m, "IO PDIR entries : %ld free %ld used (%d%%)\n", seq_printf(m, "IO PDIR entries : %ld free %ld used (%d%%)\n",
total_pages - ioc->used_pages, ioc->used_pages, total_pages - ioc->used_pages, ioc->used_pages,
(int)(ioc->used_pages * 100 / total_pages)); (int)(ioc->used_pages * 100 / total_pages));
#endif #endif
len += seq_printf(m, "Resource bitmap : %d bytes (%d pages)\n", seq_printf(m, "Resource bitmap : %d bytes (%d pages)\n",
ioc->res_size, total_pages); ioc->res_size, total_pages);
#ifdef CCIO_COLLECT_STATS #ifdef CCIO_COLLECT_STATS
min = max = ioc->avg_search[0]; min = max = ioc->avg_search[0];
...@@ -1058,26 +1057,26 @@ static int ccio_proc_info(struct seq_file *m, void *p) ...@@ -1058,26 +1057,26 @@ static int ccio_proc_info(struct seq_file *m, void *p)
min = ioc->avg_search[j]; min = ioc->avg_search[j];
} }
avg /= CCIO_SEARCH_SAMPLE; avg /= CCIO_SEARCH_SAMPLE;
len += seq_printf(m, " Bitmap search : %ld/%ld/%ld (min/avg/max CPU Cycles)\n", seq_printf(m, " Bitmap search : %ld/%ld/%ld (min/avg/max CPU Cycles)\n",
min, avg, max); min, avg, max);
len += seq_printf(m, "pci_map_single(): %8ld calls %8ld pages (avg %d/1000)\n", seq_printf(m, "pci_map_single(): %8ld calls %8ld pages (avg %d/1000)\n",
ioc->msingle_calls, ioc->msingle_pages, ioc->msingle_calls, ioc->msingle_pages,
(int)((ioc->msingle_pages * 1000)/ioc->msingle_calls)); (int)((ioc->msingle_pages * 1000)/ioc->msingle_calls));
/* KLUGE - unmap_sg calls unmap_single for each mapped page */ /* KLUGE - unmap_sg calls unmap_single for each mapped page */
min = ioc->usingle_calls - ioc->usg_calls; min = ioc->usingle_calls - ioc->usg_calls;
max = ioc->usingle_pages - ioc->usg_pages; max = ioc->usingle_pages - ioc->usg_pages;
len += seq_printf(m, "pci_unmap_single: %8ld calls %8ld pages (avg %d/1000)\n", seq_printf(m, "pci_unmap_single: %8ld calls %8ld pages (avg %d/1000)\n",
min, max, (int)((max * 1000)/min)); min, max, (int)((max * 1000)/min));
len += seq_printf(m, "pci_map_sg() : %8ld calls %8ld pages (avg %d/1000)\n", seq_printf(m, "pci_map_sg() : %8ld calls %8ld pages (avg %d/1000)\n",
ioc->msg_calls, ioc->msg_pages, ioc->msg_calls, ioc->msg_pages,
(int)((ioc->msg_pages * 1000)/ioc->msg_calls)); (int)((ioc->msg_pages * 1000)/ioc->msg_calls));
len += seq_printf(m, "pci_unmap_sg() : %8ld calls %8ld pages (avg %d/1000)\n\n\n", seq_printf(m, "pci_unmap_sg() : %8ld calls %8ld pages (avg %d/1000)\n\n\n",
ioc->usg_calls, ioc->usg_pages, ioc->usg_calls, ioc->usg_pages,
(int)((ioc->usg_pages * 1000)/ioc->usg_calls)); (int)((ioc->usg_pages * 1000)/ioc->usg_calls));
#endif /* CCIO_COLLECT_STATS */ #endif /* CCIO_COLLECT_STATS */
ioc = ioc->next; ioc = ioc->next;
...@@ -1101,7 +1100,6 @@ static const struct file_operations ccio_proc_info_fops = { ...@@ -1101,7 +1100,6 @@ static const struct file_operations ccio_proc_info_fops = {
static int ccio_proc_bitmap_info(struct seq_file *m, void *p) static int ccio_proc_bitmap_info(struct seq_file *m, void *p)
{ {
int len = 0;
struct ioc *ioc = ioc_list; struct ioc *ioc = ioc_list;
while (ioc != NULL) { while (ioc != NULL) {
...@@ -1110,11 +1108,11 @@ static int ccio_proc_bitmap_info(struct seq_file *m, void *p) ...@@ -1110,11 +1108,11 @@ static int ccio_proc_bitmap_info(struct seq_file *m, void *p)
for (j = 0; j < (ioc->res_size / sizeof(u32)); j++) { for (j = 0; j < (ioc->res_size / sizeof(u32)); j++) {
if ((j & 7) == 0) if ((j & 7) == 0)
len += seq_puts(m, "\n "); seq_puts(m, "\n ");
len += seq_printf(m, "%08x", *res_ptr); seq_printf(m, "%08x", *res_ptr);
res_ptr++; res_ptr++;
} }
len += seq_puts(m, "\n\n"); seq_puts(m, "\n\n");
ioc = ioc->next; ioc = ioc->next;
break; /* XXX - remove me */ break; /* XXX - remove me */
} }
......
drivers/parisc/sba_iommu.c
View file @ e693d73c
...@@ -1774,37 +1774,35 @@ static int sba_proc_info(struct seq_file *m, void *p) ...@@ -1774,37 +1774,35 @@ static int sba_proc_info(struct seq_file *m, void *p)
#ifdef SBA_COLLECT_STATS #ifdef SBA_COLLECT_STATS
unsigned long avg = 0, min, max; unsigned long avg = 0, min, max;
#endif #endif
int i, len = 0; int i;
len += seq_printf(m, "%s rev %d.%d\n", seq_printf(m, "%s rev %d.%d\n",
sba_dev->name, sba_dev->name,
(sba_dev->hw_rev & 0x7) + 1, (sba_dev->hw_rev & 0x7) + 1,
(sba_dev->hw_rev & 0x18) >> 3 (sba_dev->hw_rev & 0x18) >> 3);
); seq_printf(m, "IO PDIR size : %d bytes (%d entries)\n",
len += seq_printf(m, "IO PDIR size : %d bytes (%d entries)\n", (int)((ioc->res_size << 3) * sizeof(u64)), /* 8 bits/byte */
(int) ((ioc->res_size << 3) * sizeof(u64)), /* 8 bits/byte */ total_pages);
total_pages);
seq_printf(m, "Resource bitmap : %d bytes (%d pages)\n",
len += seq_printf(m, "Resource bitmap : %d bytes (%d pages)\n", ioc->res_size, ioc->res_size << 3); /* 8 bits per byte */
ioc->res_size, ioc->res_size << 3); /* 8 bits per byte */
seq_printf(m, "LMMIO_BASE/MASK/ROUTE %08x %08x %08x\n",
len += seq_printf(m, "LMMIO_BASE/MASK/ROUTE %08x %08x %08x\n", READ_REG32(sba_dev->sba_hpa + LMMIO_DIST_BASE),
READ_REG32(sba_dev->sba_hpa + LMMIO_DIST_BASE), READ_REG32(sba_dev->sba_hpa + LMMIO_DIST_MASK),
READ_REG32(sba_dev->sba_hpa + LMMIO_DIST_MASK), READ_REG32(sba_dev->sba_hpa + LMMIO_DIST_ROUTE));
READ_REG32(sba_dev->sba_hpa + LMMIO_DIST_ROUTE)
);
for (i=0; i<4; i++) for (i=0; i<4; i++)
len += seq_printf(m, "DIR%d_BASE/MASK/ROUTE %08x %08x %08x\n", i, seq_printf(m, "DIR%d_BASE/MASK/ROUTE %08x %08x %08x\n",
READ_REG32(sba_dev->sba_hpa + LMMIO_DIRECT0_BASE + i*0x18), i,
READ_REG32(sba_dev->sba_hpa + LMMIO_DIRECT0_MASK + i*0x18), READ_REG32(sba_dev->sba_hpa + LMMIO_DIRECT0_BASE + i*0x18),
READ_REG32(sba_dev->sba_hpa + LMMIO_DIRECT0_ROUTE + i*0x18) READ_REG32(sba_dev->sba_hpa + LMMIO_DIRECT0_MASK + i*0x18),
); READ_REG32(sba_dev->sba_hpa + LMMIO_DIRECT0_ROUTE + i*0x18));
#ifdef SBA_COLLECT_STATS #ifdef SBA_COLLECT_STATS
len += seq_printf(m, "IO PDIR entries : %ld free %ld used (%d%%)\n", seq_printf(m, "IO PDIR entries : %ld free %ld used (%d%%)\n",
total_pages - ioc->used_pages, ioc->used_pages, total_pages - ioc->used_pages, ioc->used_pages,
(int) (ioc->used_pages * 100 / total_pages)); (int)(ioc->used_pages * 100 / total_pages));
min = max = ioc->avg_search[0]; min = max = ioc->avg_search[0];
for (i = 0; i < SBA_SEARCH_SAMPLE; i++) { for (i = 0; i < SBA_SEARCH_SAMPLE; i++) {
...@@ -1813,26 +1811,26 @@ static int sba_proc_info(struct seq_file *m, void *p) ...@@ -1813,26 +1811,26 @@ static int sba_proc_info(struct seq_file *m, void *p)
if (ioc->avg_search[i] < min) min = ioc->avg_search[i]; if (ioc->avg_search[i] < min) min = ioc->avg_search[i];
} }
avg /= SBA_SEARCH_SAMPLE; avg /= SBA_SEARCH_SAMPLE;
len += seq_printf(m, " Bitmap search : %ld/%ld/%ld (min/avg/max CPU Cycles)\n", seq_printf(m, " Bitmap search : %ld/%ld/%ld (min/avg/max CPU Cycles)\n",
min, avg, max); min, avg, max);
len += seq_printf(m, "pci_map_single(): %12ld calls %12ld pages (avg %d/1000)\n", seq_printf(m, "pci_map_single(): %12ld calls %12ld pages (avg %d/1000)\n",
ioc->msingle_calls, ioc->msingle_pages, ioc->msingle_calls, ioc->msingle_pages,
(int) ((ioc->msingle_pages * 1000)/ioc->msingle_calls)); (int)((ioc->msingle_pages * 1000)/ioc->msingle_calls));
/* KLUGE - unmap_sg calls unmap_single for each mapped page */ /* KLUGE - unmap_sg calls unmap_single for each mapped page */
min = ioc->usingle_calls; min = ioc->usingle_calls;
max = ioc->usingle_pages - ioc->usg_pages; max = ioc->usingle_pages - ioc->usg_pages;
len += seq_printf(m, "pci_unmap_single: %12ld calls %12ld pages (avg %d/1000)\n", seq_printf(m, "pci_unmap_single: %12ld calls %12ld pages (avg %d/1000)\n",
min, max, (int) ((max * 1000)/min)); min, max, (int)((max * 1000)/min));
len += seq_printf(m, "pci_map_sg() : %12ld calls %12ld pages (avg %d/1000)\n", seq_printf(m, "pci_map_sg() : %12ld calls %12ld pages (avg %d/1000)\n",
ioc->msg_calls, ioc->msg_pages, ioc->msg_calls, ioc->msg_pages,
(int) ((ioc->msg_pages * 1000)/ioc->msg_calls)); (int)((ioc->msg_pages * 1000)/ioc->msg_calls));
len += seq_printf(m, "pci_unmap_sg() : %12ld calls %12ld pages (avg %d/1000)\n", seq_printf(m, "pci_unmap_sg() : %12ld calls %12ld pages (avg %d/1000)\n",
ioc->usg_calls, ioc->usg_pages, ioc->usg_calls, ioc->usg_pages,
(int) ((ioc->usg_pages * 1000)/ioc->usg_calls)); (int)((ioc->usg_pages * 1000)/ioc->usg_calls));
#endif #endif
return 0; return 0;
...@@ -1858,14 +1856,14 @@ sba_proc_bitmap_info(struct seq_file *m, void *p) ...@@ -1858,14 +1856,14 @@ sba_proc_bitmap_info(struct seq_file *m, void *p)
struct sba_device *sba_dev = sba_list; struct sba_device *sba_dev = sba_list;
struct ioc *ioc = &sba_dev->ioc[0]; /* FIXME: Multi-IOC support! */ struct ioc *ioc = &sba_dev->ioc[0]; /* FIXME: Multi-IOC support! */
unsigned int *res_ptr = (unsigned int *)ioc->res_map; unsigned int *res_ptr = (unsigned int *)ioc->res_map;
int i, len = 0; int i;
for (i = 0; i < (ioc->res_size/sizeof(unsigned int)); ++i, ++res_ptr) { for (i = 0; i < (ioc->res_size/sizeof(unsigned int)); ++i, ++res_ptr) {
if ((i & 7) == 0) if ((i & 7) == 0)
len += seq_printf(m, "\n "); seq_puts(m, "\n ");
len += seq_printf(m, " %08x", *res_ptr); seq_printf(m, " %08x", *res_ptr);
} }
len += seq_printf(m, "\n"); seq_putc(m, '\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