Merge "msm: camera: Format specifier correction" (100dfff0) · Commits · e / devices / samsung / android_kernel_samsung_msm8916

drivers/media/platform/msm/camera_v2/sensor/actuator/msm_actuator.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -865,7 +865,7 @@ static int32_t msm_actuator_i2c_probe(struct i2c_client *client,
		goto probe_failure;
		}

		CDBG("client = %x\n", (unsigned int) client);
		CDBG("client = 0x%p\n", client);

		rc = of_property_read_u32(client->dev.of_node, "cell-index",
		&act_ctrl_t->subdev_id);

drivers/media/platform/msm/camera_v2/sensor/eeprom/msm_eeprom.c

+2 −2

Original line number	Diff line number	Diff line
		/* Copyright (c) 2011-2013, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2011-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
		@@ -453,7 +453,7 @@ static int msm_eeprom_i2c_probe(struct i2c_client *client,
		}
		e_ctrl->eeprom_v4l2_subdev_ops = &msm_eeprom_subdev_ops;
		e_ctrl->eeprom_mutex = &msm_eeprom_mutex;
		CDBG("%s client = %x\n", __func__, (unsigned int)client);
		CDBG("%s client = 0x%p\n", __func__, client);
		e_ctrl->eboard_info = (struct msm_eeprom_board_info *)(id->driver_data);
		if (!e_ctrl->eboard_info) {
		pr_err("%s:%d board info NULL\n", __func__, __LINE__);

drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_io_util.c

+7 −7

Original line number	Diff line number	Diff line
		/* Copyright (c) 2011-2013, The Linux Foundataion. All rights reserved.
		/* Copyright (c) 2011-2014, The Linux Foundataion. 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
		@@ -32,13 +32,13 @@

		void msm_camera_io_w(u32 data, void __iomem *addr)
		{
		CDBG("%s: %08x %08x\n", __func__, (int) (addr), (data));
		CDBG("%s: 0x%p %08x\n", __func__, (addr), (data));
		writel_relaxed((data), (addr));
		}

		void msm_camera_io_w_mb(u32 data, void __iomem *addr)
		{
		CDBG("%s: %08x %08x\n", __func__, (int) (addr), (data));
		CDBG("%s: 0x%p %08x\n", __func__, (addr), (data));
		wmb();
		writel_relaxed((data), (addr));
		wmb();
		@@ -47,7 +47,7 @@ void msm_camera_io_w_mb(u32 data, void __iomem *addr)
		u32 msm_camera_io_r(void __iomem *addr)
		{
		uint32_t data = readl_relaxed(addr);
		CDBG("%s: %08x %08x\n", __func__, (int) (addr), (data));
		CDBG("%s: 0x%p %08x\n", __func__, (addr), (data));
		return data;
		}

		@@ -57,7 +57,7 @@ u32 msm_camera_io_r_mb(void __iomem *addr)
		rmb();
		data = readl_relaxed(addr);
		rmb();
		CDBG("%s: %08x %08x\n", __func__, (int) (addr), (data));
		CDBG("%s: 0x%p %08x\n", __func__, (addr), (data));
		return data;
		}

		@@ -83,11 +83,11 @@ void msm_camera_io_dump(void __iomem *addr, int size)
		p_str = line_str;
		for (i = 0; i < size/4; i++) {
		if (i % 4 == 0) {
		snprintf(p_str, 12, "%08x: ", (u32) p);
		snprintf(p_str, 12, "0x%p: ", p);
		p_str += 10;
		}
		data = readl_relaxed(p++);
		snprintf(p_str, 12, "%08x ", data);
		snprintf(p_str, 12, "%d ", data);
		p_str += 9;
		if ((i + 1) % 4 == 0) {
		CDBG("%s\n", line_str);