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

Commit a3c3c49d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: msm_bus: Correct the timestamp signature for logging"

parents fe846d0b 9e2b939a

drivers/platform/msm/msm_bus/msm_bus_dbg.c

+6 −6
Original line number Diff line number Diff line
@@ -380,8 +380,8 @@ int msm_bus_dbg_rec_transaction(const struct msm_bus_client_handle *pdata, 
	}

	buf = cldata->buffer;

	ts = ktime_to_timespec(ktime_get());

	i += scnprintf(buf + i, MAX_BUFF_SIZE - i, "\n%d.%d\n",

		(int)ts.tv_sec, (int)ts.tv_nsec);

	i += scnprintf(buf + i, MAX_BUFF_SIZE - i, "\n%ld.%09lu\n",

		ts.tv_sec, ts.tv_nsec);

	i += scnprintf(buf + i, MAX_BUFF_SIZE - i, "master: ");



	i += scnprintf(buf + i, MAX_BUFF_SIZE - i, "%d  ", pdata->mas);
@@ -484,8 +484,8 @@ static int msm_bus_dbg_fill_cl_buffer(const struct msm_bus_scale_pdata *pdata, 
	}

	buf = cldata->buffer;

	ts = ktime_to_timespec(ktime_get());

	i += scnprintf(buf + i, MAX_BUFF_SIZE - i, "\n%d.%d\n",

		(int)ts.tv_sec, (int)ts.tv_nsec);

	i += scnprintf(buf + i, MAX_BUFF_SIZE - i, "\n%ld.%09lu\n",

		ts.tv_sec, ts.tv_nsec);

	i += scnprintf(buf + i, MAX_BUFF_SIZE - i, "curr   : %d\n", index);

	i += scnprintf(buf + i, MAX_BUFF_SIZE - i, "masters: ");
@@ -708,8 +708,8 @@ static int msm_bus_dbg_fill_fab_buffer(const char *fabname, 
	buf = fablist->buffer;

	mutex_unlock(&msm_bus_dbg_fablist_lock);

	ts = ktime_to_timespec(ktime_get());

	i += scnprintf(buf + i, MAX_BUFF_SIZE - i, "\n%d.%d\n",

		(int)ts.tv_sec, (int)ts.tv_nsec);

	i += scnprintf(buf + i, MAX_BUFF_SIZE - i, "\n%ld.%09lu\n",

		ts.tv_sec, ts.tv_nsec);



	msm_bus_rpm_fill_cdata_buffer(&i, buf, MAX_BUFF_SIZE, cdata,

		nmasters, nslaves, ntslaves);

include/trace/events/trace_msm_bus.h

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ TRACE_EVENT(bus_update_request, 
		__entry->ib = ib;

	),



	TP_printk("time= %d.%d name=%s src=%d dest=%d ab=%llu ib=%llu",

	TP_printk("time= %u.%09u name=%s src=%d dest=%d ab=%llu ib=%llu",

		__entry->sec,

		__entry->nsec,

		__get_str(name),