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

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

Merge "driver: soc: qcom: Fix function prototype"

parents 09294e8e ea2e374e

drivers/clk/qcom/common.h

+2 −2
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

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

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



#ifndef __QCOM_CLK_COMMON_H__

#define __QCOM_CLK_COMMON_H__



#include <linux/clk-provider.h>

#include <linux/reset-controller.h>



struct platform_device;
@@ -12,7 +13,6 @@ struct clk_regmap; 
struct qcom_reset_map;

struct regmap;

struct freq_tbl;

struct clk_hw;



#define PLL_LOCK_COUNT_SHIFT	8

#define PLL_LOCK_COUNT_MASK	0x3f

drivers/devfreq/arm-memlat-mon.c

+2 −1
Original line number Diff line number Diff line
@@ -607,7 +607,8 @@ static int memlat_mon_probe(struct platform_device *pdev, bool is_compute) 
		if (!cpumask_subset(&mon->cpus, &cpu_grp->cpus)) {

			dev_err(dev,

				"Mon CPUs must be a subset of cpu_grp CPUs. mon=%*pbl cpu_grp=%*pbl\n",

				mon->cpus, cpu_grp->cpus);

				cpumask_pr_args(&mon->cpus),

				cpumask_pr_args(&cpu_grp->cpus));

			ret = -EINVAL;

			goto unlock_out;

		}

drivers/devfreq/governor_bw_hwmon.h

+2 −2
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

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

 * Copyright (c) 2014-2016, 2019-2020, The Linux Foundation. All rights reserved.

 */



#ifndef _GOVERNOR_BW_HWMON_H
@@ -58,7 +58,7 @@ struct bw_hwmon { 
	struct devfreq		*df;

};



#ifdef CONFIG_DEVFREQ_GOV_QCOM_BW_HWMON

#if IS_ENABLED(CONFIG_DEVFREQ_GOV_QCOM_BW_HWMON)

int register_bw_hwmon(struct device *dev, struct bw_hwmon *hwmon);

int update_bw_hwmon(struct bw_hwmon *hwmon);

int bw_hwmon_sample_end(struct bw_hwmon *hwmon);

drivers/devfreq/governor_cache_hwmon.h

+2 −2
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (c) 2014, 2016, 2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2014, 2016, 2019-2020, The Linux Foundation. All rights reserved.

 */



#ifndef _GOVERNOR_CACHE_HWMON_H
@@ -46,7 +46,7 @@ struct cache_hwmon { 
	struct devfreq		*df;

};



#ifdef CONFIG_DEVFREQ_GOV_QCOM_CACHE_HWMON

#if IS_ENABLED(CONFIG_DEVFREQ_GOV_QCOM_CACHE_HWMON)

int register_cache_hwmon(struct device *dev, struct cache_hwmon *hwmon);

int update_cache_hwmon(struct cache_hwmon *hwmon);

#else

drivers/devfreq/governor_memlat.h

+2 −2
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

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

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

 */



#ifndef _GOVERNOR_MEMLAT_H
@@ -68,7 +68,7 @@ struct memlat_hwmon { 
	bool			should_ignore_df_monitor;

};



#ifdef CONFIG_DEVFREQ_GOV_MEMLAT

#if IS_ENABLED(CONFIG_DEVFREQ_GOV_MEMLAT)

int register_memlat(struct device *dev, struct memlat_hwmon *hw);

int register_compute(struct device *dev, struct memlat_hwmon *hw);

int update_memlat(struct memlat_hwmon *hw);