android: misc seq_printf fixes for 4.4

Update seq_printf usage in aosp patches, according to mainline commit
6798a8caaf64 "fs/seq_file: convert int seq_vprint/seq_printf/etc... returns to void",
to fix following build errors:

---------------------
  CC      net/netfilter/xt_qtaguid.o
  CC      net/activity_stats.o
  CC      drivers/misc/uid_stat.o
net/activity_stats.c: In function ‘activity_stats_show’:
net/activity_stats.c:71:7: error: void value not ignored as it ought to be
   ret = seq_printf(m, "%15d %lu\n", 1 << i, activity_stats[i]);
       ^
make[1]: *** [net/activity_stats.o] Error 1
make[1]: *** Waiting for unfinished jobs....
drivers/misc/uid_stat.c: In function ‘uid_stat_atomic_int_show’:
drivers/misc/uid_stat.c:58:2: error: void value not ignored as it ought to be
  return seq_printf(m, "%u\n", bytes);
  ^
drivers/misc/uid_stat.c:59:1: warning: control reaches end of non-void function [-Wreturn-type]
 }
 ^
make[2]: *** [drivers/misc/uid_stat.o] Error 1
make[1]: *** [drivers/misc] Error 2
make[1]: *** Waiting for unfinished jobs....
net/netfilter/xt_qtaguid.c: In function ‘pp_stats_line’:
net/netfilter/xt_qtaguid.c:2565:6: error: void value not ignored as it ought to be
  ret = seq_printf(m, "%d %s 0x%llx %u %u "
      ^
make[2]: *** [net/netfilter/xt_qtaguid.o] Error 1
make[1]: *** [net/netfilter] Error 2
---------------------

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>

3 files changed, 7 insertions, 8 deletions

diff --git a/drivers/misc/uid_stat.c b/drivers/misc/uid_stat.c
index 4766c1f83b94..8b8c9a22360b 100644
--- a/drivers/misc/uid_stat.c
+++ b/drivers/misc/uid_stat.c
@@ -55,7 +55,8 @@ static int uid_stat_atomic_int_show(struct seq_file *m, void *v)
 	atomic_t *counter = m->private;
 
 	bytes = (unsigned int) (atomic_read(counter) + INT_MIN);
-	return seq_printf(m, "%u\n", bytes);
+	seq_printf(m, "%u\n", bytes);
+	return seq_has_overflowed(m) ? -ENOSPC : 0;
 }
 
 static int uid_stat_read_atomic_int_open(struct inode *inode, struct file *file)
diff --git a/net/activity_stats.c b/net/activity_stats.c
index 4609ce2043eb..3bf92d80b8b9 100644
--- a/net/activity_stats.c
+++ b/net/activity_stats.c
@@ -63,14 +63,13 @@ void activity_stats_update(void)
 static int activity_stats_show(struct seq_file *m, void *v)
 {
 	int i;
-	int ret;
 
 	seq_printf(m, "Min Bucket(sec) Count\n");
 
 	for (i = 0; i < BUCKET_MAX; i++) {
-		ret = seq_printf(m, "%15d %lu\n", 1 << i, activity_stats[i]);
-		if (ret)
-			return ret;
+		seq_printf(m, "%15d %lu\n", 1 << i, activity_stats[i]);
+		if (seq_has_overflowed(m))
+			return -ENOSPC;
 	}
 
 	return 0;
diff --git a/net/netfilter/xt_qtaguid.c b/net/netfilter/xt_qtaguid.c
index 90b2c6aac7d8..07916d20010b 100644
--- a/net/netfilter/xt_qtaguid.c
+++ b/net/netfilter/xt_qtaguid.c
@@ -2542,7 +2542,6 @@ static void pp_stats_header(struct seq_file *m)
 static int pp_stats_line(struct seq_file *m, struct tag_stat *ts_entry,
 			 int cnt_set)
 {
-	int ret;
 	struct data_counters *cnts;
 	tag_t tag = ts_entry->tn.tag;
 	uid_t stat_uid = get_uid_from_tag(tag);
@@ -2561,7 +2560,7 @@ static int pp_stats_line(struct seq_file *m, struct tag_stat *ts_entry,
 	}
 	ppi->item_index++;
 	cnts = &ts_entry->counters;
-	ret = seq_printf(m, "%d %s 0x%llx %u %u "
+	seq_printf(m, "%d %s 0x%llx %u %u "
 		"%llu %llu "
 		"%llu %llu "
 		"%llu %llu "
@@ -2591,7 +2590,7 @@ static int pp_stats_line(struct seq_file *m, struct tag_stat *ts_entry,
 		cnts->bpc[cnt_set][IFS_TX][IFS_UDP].packets,
 		cnts->bpc[cnt_set][IFS_TX][IFS_PROTO_OTHER].bytes,
 		cnts->bpc[cnt_set][IFS_TX][IFS_PROTO_OTHER].packets);
-	return ret ?: 1;
+	return seq_has_overflowed(m) ? -ENOSPC : 1;
 }
 
 static bool pp_sets(struct seq_file *m, struct tag_stat *ts_entry)