A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-08 21:22:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
qctecmdr 2020-01-15 19:51:20 -08:00 • committed by Gerrit - the friendly Code Review server
commit 6dc1af0dbe
13 changed files with 27 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/clk/qcom/common.h
View file

@ -1,9 +1,10 @@
/* 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

3
drivers/devfreq/arm-memlat-mon.c
View file

@ -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;
}

4
drivers/devfreq/governor_bw_hwmon.h
View file

@ -1,6 +1,6 @@
/* 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);

4
drivers/devfreq/governor_cache_hwmon.h
View file

@ -1,6 +1,6 @@
/* 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

4
drivers/devfreq/governor_memlat.h
View file

@ -1,6 +1,6 @@
/* 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);

1
drivers/dma-buf/dma-buf-ref.c
View file

@ -77,6 +77,7 @@ void dma_buf_ref_mod(struct msm_dma_buf *msm_dma_buf, int nr)
dma_buf_ref_insert_handle(msm_dma_buf, handle, nr);
}
EXPORT_SYMBOL(dma_buf_ref_mod);
/**
* Called with dmabuf->lock held

3
drivers/gpu/msm/governor_gpubw_mon.c
View file

@ -1,13 +1,12 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2014-2019, The Linux Foundation. All rights reserved.
* Copyright (c) 2014-2020, The Linux Foundation. All rights reserved.
*/
#include <linux/devfreq.h>
#include <linux/module.h>
#include <linux/slab.h>
#include "devfreq_trace.h"
#include "../../devfreq/governor.h"
#include "msm_adreno_devfreq.h"

4
drivers/iommu/dma-mapping-fast.c
View file

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.
* Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.
*/
#include <linux/dma-contiguous.h>
@ -1028,6 +1028,7 @@ void fast_smmu_put_dma_cookie(struct iommu_domain *domain)
kfree(fast);
domain->iova_cookie = NULL;
}
EXPORT_SYMBOL(fast_smmu_put_dma_cookie);
const struct dma_map_ops *fast_smmu_get_dma_ops(void)
{
@ -1081,3 +1082,4 @@ finish:
fast_smmu_reserve_pci_windows(dev, fast);
return 0;
}
EXPORT_SYMBOL(fast_smmu_init_mapping);

1
drivers/pinctrl/qcom/pinctrl-msm.c
View file

@ -1266,6 +1266,7 @@ int msm_qup_write(u32 mode, u32 val)
return -ENOENT;
}
EXPORT_SYMBOL(msm_qup_write);
int msm_qup_read(unsigned int mode)
{

4
drivers/soc/qcom/rpmh_master_stat.h
View file

@ -1,12 +1,12 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
* Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.
*/
#ifndef __QCOM_RPM_STATS_LOG_H__
#define __QCOM_RPM_STATS_LOG_H__
#if defined(CONFIG_QTI_RPM_STATS_LOG)
#if IS_ENABLED(CONFIG_QTI_RPM_STATS_LOG)
void msm_rpmh_master_stats_update(void);

4
drivers/soc/qcom/soc_sleep_stats.c
View file

@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2011-2019, The Linux Foundation. All rights reserved.
* Copyright (c) 2011-2020, The Linux Foundation. All rights reserved.
*/
#define pr_fmt(fmt) "%s: " fmt, __func__
@ -140,7 +140,7 @@ static int soc_sleep_stats_create_sysfs(struct platform_device *pdev,
if (!drv->kobj)
return -ENOMEM;
sysfs_attr_init(drv->ka.attr);
sysfs_attr_init(&drv->ka.attr);
drv->ka.attr.mode = 0444;
drv->ka.attr.name = "stats";
drv->ka.show = stats_show;

2
drivers/thermal/fair_share.c
View file

@ -40,7 +40,7 @@ static int get_trip_level(struct thermal_zone_device *tz)
*/
if (count > 0) {
tz->ops->get_trip_type(tz, count - 1, &trip_type);
trace_thermal_zone_trip(tz, count - 1, trip_type);
trace_thermal_zone_trip(tz, count - 1, trip_type, true);
}
return count;

6
kernel/trace/power-traces.c
View file

@ -19,3 +19,9 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(cpu_idle);
EXPORT_TRACEPOINT_SYMBOL_GPL(cpu_frequency);
EXPORT_TRACEPOINT_SYMBOL_GPL(powernv_throttle);
EXPORT_TRACEPOINT_SYMBOL(memlat_dev_update);
EXPORT_TRACEPOINT_SYMBOL(memlat_dev_meas);
EXPORT_TRACEPOINT_SYMBOL(cache_hwmon_update);
EXPORT_TRACEPOINT_SYMBOL(cache_hwmon_meas);
EXPORT_TRACEPOINT_SYMBOL(bw_hwmon_update);
EXPORT_TRACEPOINT_SYMBOL(bw_hwmon_meas);