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

Commit 355e17f6 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "coresight: use octal numbers for permission bits" into msm-4.8

parents 82020f96 326497cf

drivers/hwtracing/coresight/coresight-etm3x.c

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

/* Copyright (c) 2011-2012, 2016, The Linux Foundation. All rights reserved.

 *

 * Description: CoreSight Program Flow Trace driver

 *
@@ -45,7 +45,7 @@ 
 * remain consistent with existing use cases for now.

 */

static int boot_enable;

module_param_named(boot_enable, boot_enable, int, S_IRUGO);

module_param_named(boot_enable, boot_enable, int, 0444);



/* The number of ETM/PTM currently registered */

static int etm_count;

drivers/hwtracing/coresight/coresight-etm4x.c

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

/* Copyright (c) 2014, 2016, 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
@@ -40,7 +40,7 @@ 
#include "coresight-etm-perf.h"



static int boot_enable;

module_param_named(boot_enable, boot_enable, int, S_IRUGO);

module_param_named(boot_enable, boot_enable, int, 0444);



/* The number of ETMv4 currently registered */

static int etm4_count;

drivers/hwtracing/coresight/coresight-stm.c

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ static int boot_nr_channel; 
 * remain consistent with existing use cases for now.

 */

module_param_named(

	boot_nr_channel, boot_nr_channel, int, S_IRUGO

	boot_nr_channel, boot_nr_channel, int, 0444

);



static void stm_hwevent_enable_hw(struct stm_drvdata *drvdata)

drivers/hwtracing/coresight/coresight-tpda.c

+8 −8
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ static ssize_t tpda_store_trig_async_enable(struct device *dev, 
	mutex_unlock(&drvdata->lock);

	return size;

}

static DEVICE_ATTR(trig_async_enable, S_IRUGO | S_IWUSR,

static DEVICE_ATTR(trig_async_enable, 0644,

		   tpda_show_trig_async_enable,

		   tpda_store_trig_async_enable);
@@ -297,7 +297,7 @@ static ssize_t tpda_store_trig_flag_ts_enable(struct device *dev, 
	mutex_unlock(&drvdata->lock);

	return size;

}

static DEVICE_ATTR(trig_flag_ts_enable, S_IRUGO | S_IWUSR,

static DEVICE_ATTR(trig_flag_ts_enable, 0644,

		   tpda_show_trig_flag_ts_enable,

		   tpda_store_trig_flag_ts_enable);
@@ -330,7 +330,7 @@ static ssize_t tpda_store_trig_freq_enable(struct device *dev, 
	mutex_unlock(&drvdata->lock);

	return size;

}

static DEVICE_ATTR(trig_freq_enable, S_IRUGO | S_IWUSR,

static DEVICE_ATTR(trig_freq_enable, 0644,

		   tpda_show_trig_freq_enable,

		   tpda_store_trig_freq_enable);
@@ -363,7 +363,7 @@ static ssize_t tpda_store_freq_ts_enable(struct device *dev, 
	mutex_unlock(&drvdata->lock);

	return size;

}

static DEVICE_ATTR(freq_ts_enable, S_IRUGO | S_IWUSR, tpda_show_freq_ts_enable,

static DEVICE_ATTR(freq_ts_enable, 0644, tpda_show_freq_ts_enable,

		   tpda_store_freq_ts_enable);



static ssize_t tpda_show_freq_req_val(struct device *dev,
@@ -392,7 +392,7 @@ static ssize_t tpda_store_freq_req_val(struct device *dev, 
	mutex_unlock(&drvdata->lock);

	return size;

}

static DEVICE_ATTR(freq_req_val, S_IRUGO | S_IWUSR, tpda_show_freq_req_val,

static DEVICE_ATTR(freq_req_val, 0644, tpda_show_freq_req_val,

		   tpda_store_freq_req_val);



static ssize_t tpda_show_freq_req(struct device *dev,
@@ -424,7 +424,7 @@ static ssize_t tpda_store_freq_req(struct device *dev, 
	mutex_unlock(&drvdata->lock);

	return size;

}

static DEVICE_ATTR(freq_req, S_IRUGO | S_IWUSR, tpda_show_freq_req,

static DEVICE_ATTR(freq_req, 0644, tpda_show_freq_req,

		   tpda_store_freq_req);



static ssize_t tpda_show_global_flush_req(struct device *dev,
@@ -478,7 +478,7 @@ static ssize_t tpda_store_global_flush_req(struct device *dev, 
	mutex_unlock(&drvdata->lock);

	return size;

}

static DEVICE_ATTR(global_flush_req, S_IRUGO | S_IWUSR,

static DEVICE_ATTR(global_flush_req, 0644,

		   tpda_show_global_flush_req, tpda_store_global_flush_req);



static ssize_t tpda_show_port_flush_req(struct device *dev,
@@ -530,7 +530,7 @@ static ssize_t tpda_store_port_flush_req(struct device *dev, 
	mutex_unlock(&drvdata->lock);

	return size;

}

static DEVICE_ATTR(port_flush_req, S_IRUGO | S_IWUSR, tpda_show_port_flush_req,

static DEVICE_ATTR(port_flush_req, 0644, tpda_show_port_flush_req,

		   tpda_store_port_flush_req);



static struct attribute *tpda_attrs[] = {

drivers/hwtracing/coresight/coresight-tpdm.c

+69 −69

File changed.

Preview size limit exceeded, changes collapsed.