Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a40c41a1 authored by Jordan Crouse's avatar Jordan Crouse
Browse files

ion: Fix compile warnings



Fix the following compiler warning(s) from gcc 6.1.1 with -Werror enabled:

 drivers/dma-buf/dma-buf.c:1293:
   format '%ld' expects argument of type 'long int', but argument 4 has
	type 'pid_t {aka int}' [-Werror=format=]
  seq_printf(s, "\n%s (PID %ld) size: %ld\nDMA Buffers:\n",

 drivers/dma-buf/dma-buf.c:1303:
   format '%ld' expects argument of type 'long int', but argument 5 has
	type 'ktime_t {aka long long int}' [-Werror=format=]
   seq_printf(s, "%-8s\t%-8ld\t%-8ld\n",

Fixes: ac04f073 ("ion : Merge ion changes for msm-kona kernel upgrade")
Change-Id: Ic0dedbad70f34d7ffbf2dbfb20d02dfc5d9d6184
Signed-off-by: default avatarJordan Crouse <jcrouse@codeaurora.org>
parent e7fe90f3
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -1290,7 +1290,7 @@ static void write_proc(struct seq_file *s, struct dma_proc *proc)
{
	struct dma_info *tmp;

	seq_printf(s, "\n%s (PID %ld) size: %ld\nDMA Buffers:\n",
	seq_printf(s, "\n%s (PID %d) size: %ld\nDMA Buffers:\n",
		proc->name, proc->pid, proc->size);
	seq_printf(s, "%-8s\t%-8s\t%-8s\n",
		"Name", "Size (KB)", "Time Alive (sec)");
@@ -1300,7 +1300,7 @@ static void write_proc(struct seq_file *s, struct dma_proc *proc)
		ktime_t elapmstime = ktime_ms_delta(ktime_get(), dmabuf->ktime);

		elapmstime = ktime_divns(elapmstime, MSEC_PER_SEC);
		seq_printf(s, "%-8s\t%-8ld\t%-8ld\n",
		seq_printf(s, "%-8s\t%-8ld\t%-8lld\n",
				dmabuf->name,
				dmabuf->size / SZ_1K,
				elapmstime);