Skip to contentSkip to conversation

ipmi: Remove uses of return value of seq_printf

PATCH In review Joe Perches 2 participants 4 messages Feb 17, 2015 – Feb 20, 2015 IPMI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 drivers/char/ipmi/ipmi_msghandler.c | 12 ++++++++----
 drivers/char/ipmi/ipmi_si_intf.c    | 26 +++++++++++++++-----------
 drivers/char/ipmi/ipmi_ssif.c       |  4 +++-
 3 files changed, 26 insertions(+), 16 deletions(-)
drivers/char/ipmi/ipmi_msghandler.c +8 -4
index bf95efc..fa0b941 100644
@@ -1997,7 +1997,9 @@ static int smi_ipmb_proc_show(struct seq_file *m, void *v)
 	seq_printf(m, "%x", intf->channels[0].address);
 	for (i = 1; i < IPMI_MAX_CHANNELS; i++)
 		seq_printf(m, " %x", intf->channels[i].address);
-	return seq_putc(m, '\n');
+	seq_putc(m, '\n');
+
+	return seq_has_overflowed(m);
 }
 
 static int smi_ipmb_proc_open(struct inode *inode, struct file *file)
@@ -2016,9 +2018,11 @@ static int smi_version_proc_show(struct seq_file *m, void *v)
 {
 	ipmi_smi_t intf = m->private;
 
-	return seq_printf(m, "%u.%u\n",
-		       ipmi_version_major(&intf->bmc->id),
-		       ipmi_version_minor(&intf->bmc->id));
+	seq_printf(m, "%u.%u\n",
+		   ipmi_version_major(&intf->bmc->id),
+		   ipmi_version_minor(&intf->bmc->id));
+
+	return seq_has_overflowed(m);
 }
 
 static int smi_version_proc_open(struct inode *inode, struct file *file)
drivers/char/ipmi/ipmi_si_intf.c +15 -11
index fd6110f..321ecb2 100644
@@ -2979,7 +2979,9 @@ static int smi_type_proc_show(struct seq_file *m, void *v)
 {
 	struct smi_info *smi = m->private;
 
-	return seq_printf(m, "%s\n", si_to_str[smi->si_type]);
+	seq_printf(m, "%s\n", si_to_str[smi->si_type]);
+
+	return seq_has_overflowed(m);
 }
 
 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)
 {
 	struct smi_info *smi = m->private;
 
-	return seq_printf(m,
-		       "%s,%s,0x%lx,rsp=%d,rsi=%d,rsh=%d,irq=%d,ipmb=%d\n",
-		       si_to_str[smi->si_type],
-		       addr_space_to_str[smi->io.addr_type],
-		       smi->io.addr_data,
-		       smi->io.regspacing,
-		       smi->io.regsize,
-		       smi->io.regshift,
-		       smi->irq,
-		       smi->slave_addr);
+	seq_printf(m,
+		   "%s,%s,0x%lx,rsp=%d,rsi=%d,rsh=%d,irq=%d,ipmb=%d\n",
+		   si_to_str[smi->si_type],
+		   addr_space_to_str[smi->io.addr_type],
+		   smi->io.addr_data,
+		   smi->io.regspacing,
+		   smi->io.regsize,
+		   smi->io.regshift,
+		   smi->irq,
+		   smi->slave_addr);
+
+	return seq_has_overflowed(m);
 }
 
 static int smi_params_proc_open(struct inode *inode, struct file *file)
drivers/char/ipmi/ipmi_ssif.c +3 -1
index 74128e6..f6e378d 100644
@@ -1196,7 +1196,9 @@ static int ssif_detect(struct i2c_client *client, struct i2c_board_info *info)
 
 static int smi_type_proc_show(struct seq_file *m, void *v)
 {
-	return seq_puts(m, "ssif\n");
+	seq_puts(m, "ssif\n");
+
+	return seq_has_overflowed(m);
 }
 
 static int smi_type_proc_open(struct inode *inode, struct file *file)
#1 lore raw

Thanks, queued for 3.20.

-corey

Quoted 102 lines · Joe Perches

The seq_printf like functions will soon be changed to return void.

Convert these uses to check seq_has_overflowed instead.

---
 drivers/char/ipmi/ipmi_msghandler.c | 12 ++++++++----
 drivers/char/ipmi/ipmi_si_intf.c    | 26 +++++++++++++++-----------
 drivers/char/ipmi/ipmi_ssif.c       |  4 +++-
 3 files changed, 26 insertions(+), 16 deletions(-)
drivers/char/ipmi/ipmi_msghandler.c +8 -4
index bf95efc..fa0b941 100644
@@ -1997,7 +1997,9 @@ static int smi_ipmb_proc_show(struct seq_file *m, void *v)
 	seq_printf(m, "%x", intf->channels[0].address);
 	for (i = 1; i < IPMI_MAX_CHANNELS; i++)
 		seq_printf(m, " %x", intf->channels[i].address);
-	return seq_putc(m, '\n');
+	seq_putc(m, '\n');
+
+	return seq_has_overflowed(m);
 }
 
 static int smi_ipmb_proc_open(struct inode *inode, struct file *file)
@@ -2016,9 +2018,11 @@ static int smi_version_proc_show(struct seq_file *m, void *v)
 {
 	ipmi_smi_t intf = m->private;
 
-	return seq_printf(m, "%u.%u\n",
-		       ipmi_version_major(&intf->bmc->id),
-		       ipmi_version_minor(&intf->bmc->id));
+	seq_printf(m, "%u.%u\n",
+		   ipmi_version_major(&intf->bmc->id),
+		   ipmi_version_minor(&intf->bmc->id));
+
+	return seq_has_overflowed(m);
 }
 
 static int smi_version_proc_open(struct inode *inode, struct file *file)
drivers/char/ipmi/ipmi_si_intf.c +15 -11
index fd6110f..321ecb2 100644
@@ -2979,7 +2979,9 @@ static int smi_type_proc_show(struct seq_file *m, void *v)
 {
 	struct smi_info *smi = m->private;
 
-	return seq_printf(m, "%s\n", si_to_str[smi->si_type]);
+	seq_printf(m, "%s\n", si_to_str[smi->si_type]);
+
+	return seq_has_overflowed(m);
 }
 
 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)
 {
 	struct smi_info *smi = m->private;
 
-	return seq_printf(m,
-		       "%s,%s,0x%lx,rsp=%d,rsi=%d,rsh=%d,irq=%d,ipmb=%d\n",
-		       si_to_str[smi->si_type],
-		       addr_space_to_str[smi->io.addr_type],
-		       smi->io.addr_data,
-		       smi->io.regspacing,
-		       smi->io.regsize,
-		       smi->io.regshift,
-		       smi->irq,
-		       smi->slave_addr);
+	seq_printf(m,
+		   "%s,%s,0x%lx,rsp=%d,rsi=%d,rsh=%d,irq=%d,ipmb=%d\n",
+		   si_to_str[smi->si_type],
+		   addr_space_to_str[smi->io.addr_type],
+		   smi->io.addr_data,
+		   smi->io.regspacing,
+		   smi->io.regsize,
+		   smi->io.regshift,
+		   smi->irq,
+		   smi->slave_addr);
+
+	return seq_has_overflowed(m);
 }
 
 static int smi_params_proc_open(struct inode *inode, struct file *file)
drivers/char/ipmi/ipmi_ssif.c +3 -1
index 74128e6..f6e378d 100644
@@ -1196,7 +1196,9 @@ static int ssif_detect(struct i2c_client *client, struct i2c_board_info *info)
 
 static int smi_type_proc_show(struct seq_file *m, void *v)
 {
-	return seq_puts(m, "ssif\n");
+	seq_puts(m, "ssif\n");
+
+	return seq_has_overflowed(m);
 }
 
 static int smi_type_proc_open(struct inode *inode, struct file *file)
#2 lore raw
Quoted 1 line · Corey Minyard

Thanks, queued for 3.20.

Hey Corey, thanks, but I'll either have to send a new patch or an updated patch changing these new seq_has_overflowed() uses to 0.

There's no functional difference, but there is a logical one. has_overflowed(), if it returns "true" (it won't here because the first alloc seq_fs does has sufficient space) would not retry and simply not emit anything.

Anyway, do you want a new patch or a relative patch?

sorry 'bout that, Joe

#3 lore raw

Not a big deal, thanks for following up. Send a relative patch, please. I already have this queued for upstream.

-corey

Quoted 15 lines · Joe Perches
Quoted 1 line · Corey Minyard

Thanks, queued for 3.20.

Hey Corey, thanks, but I'll either have to send a new patch or an updated patch changing these new seq_has_overflowed() uses to 0.

There's no functional difference, but there is a logical one. has_overflowed(), if it returns "true" (it won't here because the first alloc seq_fs does has sufficient space) would not retry and simply not emit anything.

Anyway, do you want a new patch or a relative patch?

sorry 'bout that, Joe