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

Commit 1c5bd0d5 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drivers : Fix formatting errors"

parents 22a3b390 076a9741

arch/arm64/mm/fault.c

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static void mem_abort_decode(unsigned int esr) 
	pr_alert("  EA = %lu, S1PTW = %lu\n",

		 (esr & ESR_ELx_EA) >> ESR_ELx_EA_SHIFT,

		 (esr & ESR_ELx_S1PTW) >> ESR_ELx_S1PTW_SHIFT);

	pr_alert("  FSC = %lu\n", (esr & ESR_ELx_FSC));

	pr_alert("  FSC = %u\n", (esr & ESR_ELx_FSC));



	if (esr_is_data_abort(esr))

		data_abort_decode(esr);

drivers/clk/clk.c

+1 −1
Original line number Diff line number Diff line
@@ -2758,7 +2758,7 @@ static void clk_summary_show_one(struct seq_file *s, struct clk_core *c, 
	if (!c)

		return;



	seq_printf(s, "%*s%-*s %7d %8d %8d %11lu %10lu %5d %6d\n",

	seq_printf(s, "%*s%-*s %7d %8d %8lu %11lu %10d %5d\n",

		   level * 3 + 1, "",

		   30 - level * 3, c->name,

		   c->enable_count, c->prepare_count, clk_core_get_rate(c),

drivers/clk/qcom/mdss/mdss-hdmi-pll-28lpm.c

+5 −5
Original line number Diff line number Diff line 
/* Copyright (c) 2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -283,8 +283,8 @@ static void hdmi_phy_pll_calculator_28lpm(unsigned long vco_rate, 
	do_div(sdm_cfg2, int_ref_clk_freq);



	pr_debug("lf_cfg0 = 0x%x    lf_cfg1 = 0x%x\n", lf_cfg0, lf_cfg1);

	pr_debug("vco_cfg0 = 0x%x   vco_cfg4 = 0x%x\n", vco_cfg0, vco_cfg4);

	pr_debug("sdm_cfg0 = 0x%x   sdm_cfg1 = 0x%x   sdm_cfg2 = 0x%x\n",

	pr_debug("vco_cfg0 = 0x%llx   vco_cfg4 = 0x%llx\n", vco_cfg0, vco_cfg4);

	pr_debug("sdm_cfg0 = 0x%llx   sdm_cfg1 = 0x%llx   sdm_cfg2 = 0x%llx\n",

				sdm_cfg0, sdm_cfg1, sdm_cfg2);



	refclk_cfg = MDSS_PLL_REG_R(pll_base, HDMI_PHY_PLL_REFCLK_CFG);
@@ -507,7 +507,7 @@ unsigned long hdmi_vco_recalc_rate_28lpm(struct clk_hw *hw, 


	if (hdmi_pll_res->vco_current_rate) {

		vco_rate = (unsigned long)hdmi_pll_res->vco_current_rate;

		pr_debug("vco_rate=%ld\n", vco_rate);

		pr_debug("vco_rate=%llu\n", vco_rate);

		return vco_rate;

	}
@@ -528,7 +528,7 @@ unsigned long hdmi_vco_recalc_rate_28lpm(struct clk_hw *hw, 
		mdss_pll_resource_enable(hdmi_pll_res, false);

	}



	pr_debug("vco_rate = %ld\n", vco_rate);

	pr_debug("vco_rate = %llu\n", vco_rate);



	return (unsigned long)vco_rate;

}

drivers/dma-buf/dma-buf.c

+2 −2
Original line number Diff line number Diff line
@@ -1329,7 +1329,7 @@ static void write_proc(struct seq_file *s, struct dma_proc *proc) 
	struct dma_info *tmp;

	int i;



	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)");
@@ -1339,7 +1339,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);

drivers/gpu/drm/msm/sde/sde_crtc.c

+1 −1
Original line number Diff line number Diff line
@@ -856,7 +856,7 @@ static ssize_t measured_fps_show(struct device *device, 
	fps_int = (unsigned int) sde_crtc->fps_info.measured_fps;

	fps_decimal = do_div(fps_int, 10);

	return scnprintf(buf, PAGE_SIZE,

		"fps: %d.%d duration:%d frame_count:%d", fps_int, fps_decimal,

		"fps: %d.%d duration:%d frame_count:%llu", fps_int, fps_decimal,

			sde_crtc->fps_info.fps_periodic_duration, frame_count);

}