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

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

Merge "drivers: cpuidle: lpm-levels: Remove unused code"

parents 71b84c6f 9ccdecfb

drivers/cpuidle/lpm-levels.c

+0 −3
Original line number Diff line number Diff line
@@ -121,9 +121,6 @@ static void cluster_prepare(struct lpm_cluster *cluster, 
		const struct cpumask *cpu, int child_idx, bool from_idle,

		int64_t time);



static bool menu_select;

module_param_named(menu_select, menu_select, bool, 0664);



static int msm_pm_sleep_time_override;

module_param_named(sleep_time_override,

	msm_pm_sleep_time_override, int, 0664);

drivers/cpuidle/lpm-levels.h

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ struct lpm_cpu_level { 
	struct power_params pwr;

	unsigned int psci_id;

	bool is_reset;

	bool hyp_psci;

	int reset_level;

};

include/trace/events/trace_msm_low_power.h

+1 −19
Original line number Diff line number Diff line 
/* Copyright (c) 2012, 2014-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012, 2014-2017, 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
@@ -250,24 +250,6 @@ TRACE_EVENT(cluster_pred_hist, 
		__entry->sample, __entry->tmr)

);



TRACE_EVENT(pre_pc_cb,



	TP_PROTO(int tzflag),



	TP_ARGS(tzflag),



	TP_STRUCT__entry(

		__field(int, tzflag)

	),



	TP_fast_assign(

		__entry->tzflag = tzflag;

	),



	TP_printk("tzflag:%d",

		__entry->tzflag

	)

);

#endif

#define TRACE_INCLUDE_FILE trace_msm_low_power

#include <trace/define_trace.h>