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

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

Merge "msm_bus: fix compilation when CONFIG_DEBUG_FS is disabled"

parents 5f86c75f 4f6a33ec

drivers/clk/clk.c

+9 −1
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2010-2011 Canonical Ltd <jeremy.kerr@canonical.com>

 * Copyright (C) 2011-2012 Linaro Ltd <mturquette@linaro.org>

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

 * Copyright (c) 2017-2020, 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 as
@@ -3532,6 +3532,14 @@ static inline void clk_debug_reparent(struct clk_core *core, 
static inline void clk_debug_unregister(struct clk_core *core)

{

}



void clk_debug_print_hw(struct clk_core *clk, struct seq_file *f)

{

}



void clock_debug_print_enabled(bool print_parent)

{

}

#endif



/**

drivers/soc/qcom/msm_bus/msm_bus_dbg.c

+1 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2010-2012, 2014-2018, The Linux Foundation. All rights

/* Copyright (c) 2010-2012, 2014-2018, 2020, The Linux Foundation. All rights

 * reserved.

 *

 * This program is free software; you can redistribute it and/or modify
@@ -30,7 +30,6 @@ 
#include "msm_bus_core.h"

#include "msm_bus_adhoc.h"



#define CREATE_TRACE_POINTS

#include <trace/events/trace_msm_bus.h>



#define MAX_BUFF_SIZE 4096

drivers/soc/qcom/msm_bus/msm_bus_dbg_rpmh.c

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

/* Copyright (c) 2019-2020, 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
@@ -29,7 +29,6 @@ 
#include "msm_bus_core.h"

#include "msm_bus_rpmh.h"



#define CREATE_TRACE_POINTS

#include <trace/events/trace_msm_bus.h>



#define MAX_BUFF_SIZE 4096

drivers/soc/qcom/msm_bus/msm_bus_rules.c

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

/* Copyright (c) 2014-2018, 2020, 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
@@ -16,6 +16,7 @@ 
#include <linux/slab.h>

#include <linux/types.h>

#include <linux/msm-bus.h>

#define CREATE_TRACE_POINTS

#include <trace/events/trace_msm_bus.h>



struct node_vote_info {