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

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

Merge "msm: rpm_log: Support RPM log on 8084"

parents aee16947 e1202e33

arch/arm/mach-msm/rpm_log.c

+4 −4
Original line number Diff line number Diff line
@@ -339,8 +339,8 @@ static int msm_rpm_log_probe(struct platform_device *pdev) 
		pdata->reg_base = ioremap_nocache(pdata->phys_addr_base,

					pdata->phys_size);

		if (!pdata->reg_base) {

			pr_err("%s: ERROR could not ioremap: start=%p, len=%u\n",

				__func__, (void *) pdata->phys_addr_base,

			pr_err("%s: ERROR could not ioremap: start=%pa, len=%u\n",

				__func__, &pdata->phys_addr_base,

				pdata->phys_size);

			kfree(pdata);

			return -EBUSY;
@@ -449,8 +449,8 @@ static int msm_rpm_log_probe(struct platform_device *pdev) 
		pdata->reg_base = ioremap(pdata->phys_addr_base,

				pdata->phys_size);

		if (!pdata->reg_base) {

			pr_err("%s: ERROR could not ioremap: start=%p, len=%u\n",

				__func__, (void *) pdata->phys_addr_base,

			pr_err("%s: ERROR could not ioremap: start=%pa, len=%u\n",

				__func__, &pdata->phys_addr_base,

				pdata->phys_size);

			return -EBUSY;

		}

arch/arm/mach-msm/rpm_master_stat.c

+2 −2
Original line number Diff line number Diff line
@@ -266,8 +266,8 @@ static int msm_rpm_master_stats_file_open(struct inode *inode, 
	if (!prvdata->reg_base) {

		kfree(file->private_data);

		prvdata = NULL;

		pr_err("%s: ERROR could not ioremap start=%p, len=%u\n",

			__func__, (void *)pdata->phys_addr_base,

		pr_err("%s: ERROR could not ioremap start=%pa, len=%u\n",

			__func__, &pdata->phys_addr_base,

			pdata->phys_size);

		return -EBUSY;

	}

arch/arm/mach-msm/rpm_stats.c

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

/* Copyright (c) 2011-2013, 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
@@ -271,8 +271,8 @@ static int msm_rpmstats_file_open(struct inode *inode, struct file *file) 
	if (!prvdata->reg_base) {

		kfree(file->private_data);

		prvdata = NULL;

		pr_err("%s: ERROR could not ioremap start=%p, len=%u\n",

			__func__, (void *)pdata->phys_addr_base,

		pr_err("%s: ERROR could not ioremap start=%pa, len=%u\n",

			__func__, &pdata->phys_addr_base,

			pdata->phys_size);

		return -EBUSY;

	}