Skip to content

Commit d6c5dc1

Browse files
JoePerchescminyard
authored andcommitted
ipmi: Remove uses of return value of seq_printf
The seq_printf like functions will soon be changed to return void. Convert these uses to check seq_has_overflowed instead. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Corey Minyard <cminyard@mvista.com>
1 parent 2d06a0c commit d6c5dc1

File tree

3 files changed

+26
-16
lines changed

3 files changed

+26
-16
lines changed

drivers/char/ipmi/ipmi_msghandler.c

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1998,7 +1998,9 @@ static int smi_ipmb_proc_show(struct seq_file *m, void *v)
19981998
seq_printf(m, "%x", intf->channels[0].address);
19991999
for (i = 1; i < IPMI_MAX_CHANNELS; i++)
20002000
seq_printf(m, " %x", intf->channels[i].address);
2001-
return seq_putc(m, '\n');
2001+
seq_putc(m, '\n');
2002+
2003+
return seq_has_overflowed(m);
20022004
}
20032005

20042006
static int smi_ipmb_proc_open(struct inode *inode, struct file *file)
@@ -2017,9 +2019,11 @@ static int smi_version_proc_show(struct seq_file *m, void *v)
20172019
{
20182020
ipmi_smi_t intf = m->private;
20192021

2020-
return seq_printf(m, "%u.%u\n",
2021-
ipmi_version_major(&intf->bmc->id),
2022-
ipmi_version_minor(&intf->bmc->id));
2022+
seq_printf(m, "%u.%u\n",
2023+
ipmi_version_major(&intf->bmc->id),
2024+
ipmi_version_minor(&intf->bmc->id));
2025+
2026+
return seq_has_overflowed(m);
20232027
}
20242028

20252029
static int smi_version_proc_open(struct inode *inode, struct file *file)

drivers/char/ipmi/ipmi_si_intf.c

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2979,7 +2979,9 @@ static int smi_type_proc_show(struct seq_file *m, void *v)
29792979
{
29802980
struct smi_info *smi = m->private;
29812981

2982-
return seq_printf(m, "%s\n", si_to_str[smi->si_type]);
2982+
seq_printf(m, "%s\n", si_to_str[smi->si_type]);
2983+
2984+
return seq_has_overflowed(m);
29832985
}
29842986

29852987
static int smi_type_proc_open(struct inode *inode, struct file *file)
@@ -3041,16 +3043,18 @@ static int smi_params_proc_show(struct seq_file *m, void *v)
30413043
{
30423044
struct smi_info *smi = m->private;
30433045

3044-
return seq_printf(m,
3045-
"%s,%s,0x%lx,rsp=%d,rsi=%d,rsh=%d,irq=%d,ipmb=%d\n",
3046-
si_to_str[smi->si_type],
3047-
addr_space_to_str[smi->io.addr_type],
3048-
smi->io.addr_data,
3049-
smi->io.regspacing,
3050-
smi->io.regsize,
3051-
smi->io.regshift,
3052-
smi->irq,
3053-
smi->slave_addr);
3046+
seq_printf(m,
3047+
"%s,%s,0x%lx,rsp=%d,rsi=%d,rsh=%d,irq=%d,ipmb=%d\n",
3048+
si_to_str[smi->si_type],
3049+
addr_space_to_str[smi->io.addr_type],
3050+
smi->io.addr_data,
3051+
smi->io.regspacing,
3052+
smi->io.regsize,
3053+
smi->io.regshift,
3054+
smi->irq,
3055+
smi->slave_addr);
3056+
3057+
return seq_has_overflowed(m);
30543058
}
30553059

30563060
static int smi_params_proc_open(struct inode *inode, struct file *file)

drivers/char/ipmi/ipmi_ssif.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1196,7 +1196,9 @@ static int ssif_detect(struct i2c_client *client, struct i2c_board_info *info)
11961196

11971197
static int smi_type_proc_show(struct seq_file *m, void *v)
11981198
{
1199-
return seq_puts(m, "ssif\n");
1199+
seq_puts(m, "ssif\n");
1200+
1201+
return seq_has_overflowed(m);
12001202
}
12011203

12021204
static int smi_type_proc_open(struct inode *inode, struct file *file)

0 commit comments

Comments
 (0)