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

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

Merge "msm: pm: fix power driver compilation issues"

parents 091bff5f 7860079a

arch/arm/mach-msm/event_timer.c

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

/* Copyright (c) 2012, 2014, 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
@@ -73,9 +73,9 @@ struct event_timer_info *add_event_timer(void (*function)(void *), void *data) 
	event_info->data = data;

	/* Init rb node and hr timer */

	timerqueue_init(&event_info->node);

	pr_debug("%s: New Event Added. Event 0x%x.",

	pr_debug("%s: New Event Added. Event %p.",

	__func__,

	(unsigned int)event_info);

	event_info);



	return event_info;

}
@@ -169,8 +169,8 @@ static enum hrtimer_restart event_hrtimer_cb(struct hrtimer *hrtimer) 
			goto hrtimer_cb_exit;



		if (msm_event_debug_mask && MSM_EVENT_TIMER_DEBUG)

			pr_info("%s: Deleting event 0x%x @ %lu", __func__,

			(unsigned int)event,

			pr_info("%s: Deleting event %p @ %lu", __func__,

			event,

			(unsigned long)ktime_to_ns(next->expires));



		timerqueue_del(&timer_head, &event->node);
@@ -205,8 +205,8 @@ static void create_timer_smp(void *data) 
	next = timerqueue_getnext(&timer_head);

	timerqueue_add(&timer_head, &event->node);

	if (msm_event_debug_mask && MSM_EVENT_TIMER_DEBUG)

		pr_info("%s: Adding Event 0x%x for %lu", __func__,

		(unsigned int)event,

		pr_info("%s: Adding Event %p for %lu", __func__,

		event,

		(unsigned long)ktime_to_ns(event->node.expires));



	if (!next ||

arch/arm/mach-msm/pm-8x60.c

+3 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2010-2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2010-2014, 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
@@ -1550,7 +1550,7 @@ static int msm_pc_debug_counters_copy( 
	return data->len;

}



static int msm_pc_debug_counters_file_read(struct file *file,

static ssize_t msm_pc_debug_counters_file_read(struct file *file,

		char __user *bufu, size_t count, loff_t *ppos)

{

	struct msm_pc_debug_counters_buffer *data;
@@ -1588,7 +1588,7 @@ static int msm_pc_debug_counters_file_open(struct inode *inode, 
		sizeof(struct msm_pc_debug_counters_buffer), GFP_KERNEL);



	if (!file->private_data) {

		pr_err("%s: ERROR kmalloc failed to allocate %d bytes\n",

		pr_err("%s: ERROR kmalloc failed to allocate %zu bytes\n",

		__func__, sizeof(struct msm_pc_debug_counters_buffer));



		return -ENOMEM;

arch/arm/mach-msm/rpm-smd.c

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

/* Copyright (c) 2012-2014, 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
@@ -818,7 +818,8 @@ static inline int msm_rpm_get_error_from_ack(uint8_t *buf) 


	tmp += 2 * sizeof(uint32_t);



	if (!(memcmp(tmp, INV_RSC, min(req_len, sizeof(INV_RSC))-1))) {

	if (!(memcmp(tmp, INV_RSC, min_t(uint32_t, req_len,

						sizeof(INV_RSC))-1))) {

		pr_err("%s(): RPM NACK Unsupported resource\n", __func__);

		rc = -EINVAL;

	} else {
@@ -932,7 +933,7 @@ static void msm_rpm_log_request(struct msm_rpm_request *cdata) 
			for (j = 0; j < cdata->kvp[i].nbytes; j += 4) {

				value = 0;

				memcpy(&value, &cdata->kvp[i].value[j],

					min(sizeof(uint32_t),

					min_t(uint32_t, sizeof(uint32_t),

						cdata->kvp[i].nbytes - j));

				pos += scnprintf(buf + pos, buflen - pos, "%u",

						value);
@@ -964,7 +965,7 @@ static void msm_rpm_log_request(struct msm_rpm_request *cdata) 
			for (j = 0; j < cdata->kvp[i].nbytes; j += 4) {

				value = 0;

				memcpy(&value, &cdata->kvp[i].value[j],

					min(sizeof(uint32_t),

					min_t(uint32_t, sizeof(uint32_t),

						cdata->kvp[i].nbytes - j));

				pos += scnprintf(buf + pos, buflen - pos, "%u",

						value);

arch/arm/mach-msm/rpm_log.c

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

/* Copyright (c) 2010-2011, 2013-2014, 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
@@ -269,7 +270,7 @@ static int msm_rpm_log_file_open(struct inode *inode, struct file *file) 
	file->private_data =

		   kmalloc(sizeof(struct msm_rpm_log_buffer), GFP_KERNEL);

	if (!file->private_data) {

		pr_err("%s: ERROR kmalloc failed to allocate %d bytes\n",

		pr_err("%s: ERROR kmalloc failed to allocate %zu bytes\n",

			__func__, sizeof(struct msm_rpm_log_buffer));

		return -ENOMEM;

	}

arch/arm/mach-msm/rpm_master_stat.c

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

/* Copyright (c) 2012-2014, 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
@@ -219,8 +219,8 @@ static int msm_rpm_master_copy_stats( 
	return RPM_MASTERS_BUF_LEN - count;

}



static int msm_rpm_master_stats_file_read(struct file *file, char __user *bufu,

				  size_t count, loff_t *ppos)

static ssize_t msm_rpm_master_stats_file_read(struct file *file,

				char __user *bufu, size_t count, loff_t *ppos)

{

	struct msm_rpm_master_stats_private_data *prvdata;

	struct msm_rpm_master_stats_platform_data *pdata;