Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2024-10-01 01:35:54 -04:00
Code Issues Packages Projects Releases Wiki Activity
6ce51b2775
DivestOS/Patches/Linux_CVEs/CVE-2016-6756/3.18/0002.patch
Tad 11c7037780 Switch to new CVE patchset
2017-11-07 17:32:46 -05:00

1594 lines
62 KiB
Diff
Raw Blame History

From 3a214ef870dc97437c7de79a1507dfe5079dce88 Mon Sep 17 00:00:00 2001
From: Azam Sadiq Pasha Kapatrala Syed <akapatra@codeaurora.org>
Date: Thu, 10 Mar 2016 15:01:06 -0800
Subject: msm: camera: Avoid exposing kernel addresses
Usage of %p exposes the kernel addresses, an easy target to
kernel write vulnerabilities. With this patch currently
%pK prints only Zeros as address. If you need actual address
echo 0 > /proc/sys/kernel/kptr_restrict
CRs-Fixed: 987011
Change-Id: I6c79f82376936fc646b723872a96a6694fe47cd9
Signed-off-by: Azam Sadiq Pasha Kapatrala Syed <akapatra@codeaurora.org>
---
.../platform/msm/camera_v2/common/cam_smmu_api.c | 32 ++++++++--------
.../platform/msm/camera_v2/common/cam_soc_api.c | 26 ++++++-------
.../msm/camera_v2/common/msm_camera_io_util.c | 26 ++++++-------
.../media/platform/msm/camera_v2/fd/msm_fd_hw.c | 2 +-
.../media/platform/msm/camera_v2/isp/msm_buf_mgr.c | 8 ++--
.../media/platform/msm/camera_v2/isp/msm_isp46.c | 2 +-
.../media/platform/msm/camera_v2/isp/msm_isp47.c | 2 +-
.../platform/msm/camera_v2/isp/msm_isp_axi_util.c | 16 ++++----
.../msm/camera_v2/isp/msm_isp_stats_util.c | 7 ++--
.../platform/msm/camera_v2/isp/msm_isp_util.c | 40 ++++++++++----------
.../media/platform/msm/camera_v2/ispif/msm_ispif.c | 4 +-
.../platform/msm/camera_v2/jpeg_10/msm_jpeg_hw.c | 6 +--
.../msm/camera_v2/jpeg_10/msm_jpeg_platform.c | 2 +-
.../platform/msm/camera_v2/jpeg_10/msm_jpeg_sync.c | 2 +-
.../msm/camera_v2/jpeg_dma/msm_jpeg_dma_hw.c | 2 +-
.../media/platform/msm/camera_v2/msm_vb2/msm_vb2.c | 4 +-
.../platform/msm/camera_v2/pproc/cpp/msm_cpp.c | 33 +++++++++--------
.../platform/msm/camera_v2/pproc/vpe/msm_vpe.c | 8 ++--
.../msm/camera_v2/sensor/actuator/msm_actuator.c | 8 ++--
.../platform/msm/camera_v2/sensor/cci/msm_cci.c | 14 +++----
.../platform/msm/camera_v2/sensor/csid/msm_csid.c | 6 +--
.../msm/camera_v2/sensor/csiphy/msm_csiphy.c | 6 +--
.../msm/camera_v2/sensor/eeprom/msm_eeprom.c | 6 +--
.../msm/camera_v2/sensor/flash/msm_flash.c | 2 +-
.../msm/camera_v2/sensor/io/msm_camera_dt_util.c | 6 +--
.../platform/msm/camera_v2/sensor/msm_sensor.c | 18 ++++-----
.../msm/camera_v2/sensor/msm_sensor_driver.c | 43 ++++++++--------------
.../msm/camera_v2/sensor/msm_sensor_init.c | 12 +++---
.../platform/msm/camera_v2/sensor/ois/msm_ois.c | 4 +-
29 files changed, 167 insertions(+), 180 deletions(-)
diff --git a/drivers/media/platform/msm/camera_v2/common/cam_smmu_api.c b/drivers/media/platform/msm/camera_v2/common/cam_smmu_api.c
index e703791..5d5ceb7 100644
--- a/drivers/media/platform/msm/camera_v2/common/cam_smmu_api.c
+++ b/drivers/media/platform/msm/camera_v2/common/cam_smmu_api.c
@@ -229,7 +229,7 @@ static void cam_smmu_print_list(int idx)
pr_err("index = %d ", idx);
list_for_each_entry(mapping,
&iommu_cb_set.cb_info[idx].smmu_buf_list, list) {
- pr_err("ion_fd = %d, paddr= 0x%p, len = %u\n",
+ pr_err("ion_fd = %d, paddr= 0x%pK, len = %u\n",
mapping->ion_fd, (void *)mapping->paddr,
(unsigned int)mapping->len);
}
@@ -240,10 +240,10 @@ static void cam_smmu_print_table(void)
int i;
for (i = 0; i < iommu_cb_set.cb_num; i++) {
- pr_err("i= %d, handle= %d, name_addr=%p\n", i,
+ pr_err("i= %d, handle= %d, name_addr=%pK\n", i,
(int)iommu_cb_set.cb_info[i].handle,
(void *)iommu_cb_set.cb_info[i].name);
- pr_err("dev = %p ", iommu_cb_set.cb_info[i].dev);
+ pr_err("dev = %pK ", iommu_cb_set.cb_info[i].dev);
}
}
@@ -306,18 +306,18 @@ static void cam_smmu_check_vaddr_in_range(int idx, void *vaddr)
end_addr = (unsigned long)mapping->paddr + mapping->len;
if (start_addr <= current_addr && current_addr < end_addr) {
- pr_err("Error: va %p is valid: range:%p-%p, fd = %d cb: %s\n",
+ pr_err("Error: va %pK is valid: range:%pK-%pK, fd = %d cb: %s\n",
vaddr, (void *)start_addr, (void *)end_addr,
mapping->ion_fd,
iommu_cb_set.cb_info[idx].name);
return;
} else {
- CDBG("va %p is not in this range: %p-%p, fd = %d\n",
+ CDBG("va %pK is not in this range: %pK-%pK, fd = %d\n",
vaddr, (void *)start_addr, (void *)end_addr,
mapping->ion_fd);
}
}
- pr_err("Cannot find vaddr:%p in SMMU. %s uses invalid virtual address\n",
+ pr_err("Cannot find vaddr:%pK in SMMU. %s uses invalid virtual address\n",
vaddr, iommu_cb_set.cb_info[idx].name);
return;
}
@@ -393,7 +393,7 @@ static int cam_smmu_iommu_fault_handler(struct iommu_domain *domain,
if (!token) {
pr_err("Error: token is NULL\n");
- pr_err("Error: domain = %p, device = %p\n", domain, dev);
+ pr_err("Error: domain = %pK, device = %pK\n", domain, dev);
pr_err("iova = %lX, flags = %d\n", iova, flags);
return 0;
}
@@ -705,7 +705,7 @@ static void cam_smmu_clean_buffer_list(int idx)
list_for_each_entry_safe(mapping_info, temp,
&iommu_cb_set.cb_info[idx].smmu_buf_list, list) {
- CDBG("Free mapping address %p, i = %d, fd = %d\n",
+ CDBG("Free mapping address %pK, i = %d, fd = %d\n",
(void *)mapping_info->paddr, idx,
mapping_info->ion_fd);
@@ -800,11 +800,11 @@ static int cam_smmu_map_buffer_and_add_to_list(int idx, int ion_fd,
}
if (table->sgl) {
- CDBG("DMA buf: %p, device: %p, attach: %p, table: %p\n",
+ CDBG("DMA buf: %pK, device: %pK, attach: %pK, table: %pK\n",
(void *)buf,
(void *)iommu_cb_set.cb_info[idx].dev,
(void *)attach, (void *)table);
- CDBG("table sgl: %p, rc: %d, dma_address: 0x%x\n",
+ CDBG("table sgl: %pK, rc: %d, dma_address: 0x%x\n",
(void *)table->sgl, rc,
(unsigned int)table->sgl->dma_address);
} else {
@@ -838,7 +838,7 @@ static int cam_smmu_map_buffer_and_add_to_list(int idx, int ion_fd,
rc = -ENOSPC;
goto err_unmap_sg;
}
- CDBG("ion_fd = %d, dev = %p, paddr= %p, len = %u\n", ion_fd,
+ CDBG("ion_fd = %d, dev = %pK, paddr= %pK, len = %u\n", ion_fd,
(void *)iommu_cb_set.cb_info[idx].dev,
(void *)*paddr_ptr, (unsigned int)*len_ptr);
@@ -862,10 +862,10 @@ static int cam_smmu_unmap_buf_and_remove_from_list(
{
if ((!mapping_info->buf) || (!mapping_info->table) ||
(!mapping_info->attach)) {
- pr_err("Error: Invalid params dev = %p, table = %p",
+ pr_err("Error: Invalid params dev = %pK, table = %pK",
(void *)iommu_cb_set.cb_info[idx].dev,
(void *)mapping_info->table);
- pr_err("Error:dma_buf = %p, attach = %p\n",
+ pr_err("Error:dma_buf = %pK, attach = %pK\n",
(void *)mapping_info->buf,
(void *)mapping_info->attach);
return -EINVAL;
@@ -989,7 +989,7 @@ static int cam_smmu_alloc_scratch_buffer_add_to_list(int idx,
CDBG("%s: nents = %lu, idx = %d, virt_len = %zx\n",
__func__, nents, idx, virt_len);
- CDBG("%s: phys_len = %zx, iommu_dir = %d, virt_addr = %p\n",
+ CDBG("%s: phys_len = %zx, iommu_dir = %d, virt_addr = %pK\n",
__func__, phys_len, iommu_dir, virt_addr);
/* This table will go inside the 'mapping' structure
@@ -1055,7 +1055,7 @@ static int cam_smmu_alloc_scratch_buffer_add_to_list(int idx,
mapping_info->ref_count = 1;
mapping_info->phys_len = phys_len;
- CDBG("%s: paddr = %p, len = %zx, phys_len = %zx",
+ CDBG("%s: paddr = %pK, len = %zx, phys_len = %zx",
__func__, (void *)mapping_info->paddr,
mapping_info->len, mapping_info->phys_len);
@@ -1093,7 +1093,7 @@ static int cam_smmu_free_scratch_buffer_remove_from_list(
&iommu_cb_set.cb_info[idx].scratch_map;
if (!mapping_info->table) {
- pr_err("Error: Invalid params: dev = %p, table = %p, ",
+ pr_err("Error: Invalid params: dev = %pK, table = %pK, ",
(void *)iommu_cb_set.cb_info[idx].dev,
(void *)mapping_info->table);
return -EINVAL;
diff --git a/drivers/media/platform/msm/camera_v2/common/cam_soc_api.c b/drivers/media/platform/msm/camera_v2/common/cam_soc_api.c
index 33e1299..21ac680 100644
--- a/drivers/media/platform/msm/camera_v2/common/cam_soc_api.c
+++ b/drivers/media/platform/msm/camera_v2/common/cam_soc_api.c
@@ -165,7 +165,7 @@ int msm_camera_get_clk_info(struct platform_device *pdev,
rc = PTR_ERR((*clk_ptr)[i]);
goto err4;
}
- CDBG("clk ptr[%d] :%p\n", i, (*clk_ptr)[i]);
+ CDBG("clk ptr[%d] :%pK\n", i, (*clk_ptr)[i]);
}
devm_kfree(&pdev->dev, rates);
@@ -289,7 +289,7 @@ int msm_camera_get_clk_info_and_rates(
rc = PTR_ERR(clks[i]);
goto err5;
}
- CDBG("clk ptr[%d] :%p\n", i, clks[i]);
+ CDBG("clk ptr[%d] :%pK\n", i, clks[i]);
}
*pclk_info = clk_info;
*pclks = clks;
@@ -405,7 +405,7 @@ long msm_camera_clk_set_rate(struct device *dev,
if (!dev || !clk || (clk_rate < 0))
return -EINVAL;
- CDBG("clk : %p, enable : %ld\n", clk, clk_rate);
+ CDBG("clk : %pK, enable : %ld\n", clk, clk_rate);
if (clk_rate > 0) {
rate = clk_round_rate(clk, clk_rate);
@@ -436,7 +436,7 @@ int msm_camera_put_clk_info(struct platform_device *pdev,
if (clk_ptr[i] != NULL)
devm_clk_put(&pdev->dev, (*clk_ptr)[i]);
- CDBG("clk ptr[%d] :%p\n", i, (*clk_ptr)[i]);
+ CDBG("clk ptr[%d] :%pK\n", i, (*clk_ptr)[i]);
}
devm_kfree(&pdev->dev, *clk_info);
devm_kfree(&pdev->dev, *clk_ptr);
@@ -460,7 +460,7 @@ int msm_camera_put_clk_info_and_rates(struct platform_device *pdev,
for (i = cnt - 1; i >= 0; i--) {
if (clk_ptr[i] != NULL)
devm_clk_put(&pdev->dev, (*clk_ptr)[i]);
- CDBG("clk ptr[%d] :%p\n", i, (*clk_ptr)[i]);
+ CDBG("clk ptr[%d] :%pK\n", i, (*clk_ptr)[i]);
}
devm_kfree(&pdev->dev, *clk_info);
devm_kfree(&pdev->dev, *clk_ptr);
@@ -531,7 +531,7 @@ int msm_camera_get_regulator_info(struct platform_device *pdev,
rc = -EINVAL;
goto err1;
}
- CDBG("vdd ptr[%d] :%p\n", i, tmp_reg[i].vdd);
+ CDBG("vdd ptr[%d] :%pK\n", i, tmp_reg[i].vdd);
}
*num_reg = cnt;
@@ -607,7 +607,7 @@ void msm_camera_put_regulators(struct platform_device *pdev,
for (i = cnt - 1; i >= 0; i--) {
if (vdd_info[i] && !IS_ERR_OR_NULL(vdd_info[i]->vdd))
devm_regulator_put(vdd_info[i]->vdd);
- CDBG("vdd ptr[%d] :%p\n", i, vdd_info[i]->vdd);
+ CDBG("vdd ptr[%d] :%pK\n", i, vdd_info[i]->vdd);
}
devm_kfree(&pdev->dev, *vdd_info);
@@ -646,7 +646,7 @@ int msm_camera_register_irq(struct platform_device *pdev,
rc = -EINVAL;
}
- CDBG("Registered irq for %s[resource - %p]\n", irq_name, irq);
+ CDBG("Registered irq for %s[resource - %pK]\n", irq_name, irq);
return rc;
}
@@ -671,7 +671,7 @@ int msm_camera_register_threaded_irq(struct platform_device *pdev,
rc = -EINVAL;
}
- CDBG("Registered irq for %s[resource - %p]\n", irq_name, irq);
+ CDBG("Registered irq for %s[resource - %pK]\n", irq_name, irq);
return rc;
}
@@ -703,7 +703,7 @@ int msm_camera_unregister_irq(struct platform_device *pdev,
return -EINVAL;
}
- CDBG("Un Registering irq for [resource - %p]\n", irq);
+ CDBG("Un Registering irq for [resource - %pK]\n", irq);
devm_free_irq(&pdev->dev, irq->start, dev_id);
return 0;
@@ -730,7 +730,7 @@ void __iomem *msm_camera_get_reg_base(struct platform_device *pdev,
}
if (reserve_mem) {
- CDBG("device:%p, mem : %p, size : %d\n",
+ CDBG("device:%pK, mem : %pK, size : %d\n",
&pdev->dev, mem, (int)resource_size(mem));
if (!devm_request_mem_region(&pdev->dev, mem->start,
resource_size(mem),
@@ -749,7 +749,7 @@ void __iomem *msm_camera_get_reg_base(struct platform_device *pdev,
return NULL;
}
- CDBG("base : %p\n", base);
+ CDBG("base : %pK\n", base);
return base;
}
EXPORT_SYMBOL(msm_camera_get_reg_base);
@@ -793,7 +793,7 @@ int msm_camera_put_reg_base(struct platform_device *pdev,
pr_err("err: mem resource %s not found\n", device_name);
return -EINVAL;
}
- CDBG("mem : %p, size : %d\n", mem, (int)resource_size(mem));
+ CDBG("mem : %pK, size : %d\n", mem, (int)resource_size(mem));
devm_iounmap(&pdev->dev, base);
if (reserve_mem)
diff --git a/drivers/media/platform/msm/camera_v2/common/msm_camera_io_util.c b/drivers/media/platform/msm/camera_v2/common/msm_camera_io_util.c
index f978f97..51a9ea8 100644
--- a/drivers/media/platform/msm/camera_v2/common/msm_camera_io_util.c
+++ b/drivers/media/platform/msm/camera_v2/common/msm_camera_io_util.c
@@ -27,7 +27,7 @@
void msm_camera_io_w(u32 data, void __iomem *addr)
{
- CDBG("%s: 0x%p %08x\n", __func__, (addr), (data));
+ CDBG("%s: 0x%pK %08x\n", __func__, (addr), (data));
writel_relaxed((data), (addr));
}
@@ -43,7 +43,7 @@ int32_t msm_camera_io_w_block(const u32 *addr, void __iomem *base,
return -EINVAL;
for (i = 0; i < len; i++) {
- CDBG("%s: len =%d val=%x base =%p\n", __func__,
+ CDBG("%s: len =%d val=%x base =%pK\n", __func__,
len, addr[i], base);
writel_relaxed(addr[i], base);
}
@@ -62,7 +62,7 @@ int32_t msm_camera_io_w_reg_block(const u32 *addr, void __iomem *base,
return -EINVAL;
for (i = 0; i < len; i = i + 2) {
- CDBG("%s: len =%d val=%x base =%p reg=%x\n", __func__,
+ CDBG("%s: len =%d val=%x base =%pK reg=%x\n", __func__,
len, addr[i + 1], base, addr[i]);
writel_relaxed(addr[i + 1], base + addr[i]);
}
@@ -71,7 +71,7 @@ int32_t msm_camera_io_w_reg_block(const u32 *addr, void __iomem *base,
void msm_camera_io_w_mb(u32 data, void __iomem *addr)
{
- CDBG("%s: 0x%p %08x\n", __func__, (addr), (data));
+ CDBG("%s: 0x%pK %08x\n", __func__, (addr), (data));
/* ensure write is done */
wmb();
writel_relaxed((data), (addr));
@@ -89,7 +89,7 @@ int32_t msm_camera_io_w_mb_block(const u32 *addr, void __iomem *base, u32 len)
for (i = 0; i < len; i++) {
/* ensure write is done */
wmb();
- CDBG("%s: len =%d val=%x base =%p\n", __func__,
+ CDBG("%s: len =%d val=%x base =%pK\n", __func__,
len, addr[i], base);
writel_relaxed(addr[i], base);
}
@@ -102,7 +102,7 @@ u32 msm_camera_io_r(void __iomem *addr)
{
uint32_t data = readl_relaxed(addr);
- CDBG("%s: 0x%p %08x\n", __func__, (addr), (data));
+ CDBG("%s: 0x%pK %08x\n", __func__, (addr), (data));
return data;
}
@@ -114,7 +114,7 @@ u32 msm_camera_io_r_mb(void __iomem *addr)
data = readl_relaxed(addr);
/* ensure read is done */
rmb();
- CDBG("%s: 0x%p %08x\n", __func__, (addr), (data));
+ CDBG("%s: 0x%pK %08x\n", __func__, (addr), (data));
return data;
}
@@ -180,7 +180,7 @@ void msm_camera_io_dump(void __iomem *addr, int size, int enable)
u32 *p = (u32 *) addr;
u32 data;
- CDBG("%s: addr=%p size=%d\n", __func__, addr, size);
+ CDBG("%s: addr=%pK size=%d\n", __func__, addr, size);
if (!p || (size <= 0) || !enable)
return;
@@ -216,12 +216,12 @@ void msm_camera_io_dump_wstring_base(void __iomem *addr,
{
int i, u = sizeof(struct msm_cam_dump_string_info);
- pr_debug("%s: addr=%p data=%p size=%d u=%d, cnt=%d\n", __func__,
+ pr_debug("%s: addr=%pK data=%pK size=%d u=%d, cnt=%d\n", __func__,
addr, dump_data, size, u,
(size/u));
if (!addr || (size <= 0) || !dump_data) {
- pr_err("%s: addr=%p data=%p size=%d\n", __func__,
+ pr_err("%s: addr=%pK data=%pK size=%d\n", __func__,
addr, dump_data, size);
return;
}
@@ -233,7 +233,7 @@ void msm_camera_io_dump_wstring_base(void __iomem *addr,
void msm_camera_io_memcpy(void __iomem *dest_addr,
void __iomem *src_addr, u32 len)
{
- CDBG("%s: %p %p %d\n", __func__, dest_addr, src_addr, len);
+ CDBG("%s: %pK %pK %d\n", __func__, dest_addr, src_addr, len);
msm_camera_io_memcpy_toio(dest_addr, src_addr, len / 4);
}
@@ -728,7 +728,7 @@ int msm_camera_request_gpio_table(struct gpio *gpio_tbl, uint8_t size,
int rc = 0, i = 0, err = 0;
if (!gpio_tbl || !size) {
- pr_err("%s:%d invalid gpio_tbl %p / size %d\n", __func__,
+ pr_err("%s:%d invalid gpio_tbl %pK / size %d\n", __func__,
__LINE__, gpio_tbl, size);
return -EINVAL;
}
@@ -772,7 +772,7 @@ int msm_camera_get_dt_reg_settings(struct device_node *of_node,
unsigned int cnt;
if (!of_node || !dt_prop_name || !size || !reg_s) {
- pr_err("%s: Error invalid args %p:%p:%p:%p\n",
+ pr_err("%s: Error invalid args %pK:%pK:%pK:%pK\n",
__func__, size, reg_s, of_node, dt_prop_name);
return -EINVAL;
}
diff --git a/drivers/media/platform/msm/camera_v2/fd/msm_fd_hw.c b/drivers/media/platform/msm/camera_v2/fd/msm_fd_hw.c
index 680bdf5..a20f40a0 100644
--- a/drivers/media/platform/msm/camera_v2/fd/msm_fd_hw.c
+++ b/drivers/media/platform/msm/camera_v2/fd/msm_fd_hw.c
@@ -669,7 +669,7 @@ int32_t msm_fd_hw_set_dt_parms_by_name(struct msm_fd_device *fd,
dt_reg_settings[i + MSM_FD_REG_ADDR_OFFSET_IDX],
dt_reg_settings[i + MSM_FD_REG_VALUE_IDX] &
dt_reg_settings[i + MSM_FD_REG_MASK_IDX]);
- pr_debug("%s:%d] %p %08x\n", __func__, __LINE__,
+ pr_debug("%s:%d] %pK %08x\n", __func__, __LINE__,
fd->iomem_base[base_idx] +
dt_reg_settings[i + MSM_FD_REG_ADDR_OFFSET_IDX],
dt_reg_settings[i + MSM_FD_REG_VALUE_IDX] &
diff --git a/drivers/media/platform/msm/camera_v2/isp/msm_buf_mgr.c b/drivers/media/platform/msm/camera_v2/isp/msm_buf_mgr.c
index 3331f0d..94e9745 100644
--- a/drivers/media/platform/msm/camera_v2/isp/msm_buf_mgr.c
+++ b/drivers/media/platform/msm/camera_v2/isp/msm_buf_mgr.c
@@ -62,13 +62,13 @@ static int msm_buf_check_head_sanity(struct msm_isp_bufq *bufq)
}
if (prev->next != &bufq->head) {
- pr_err("%s: Error! head prev->next is %p should be %p\n",
+ pr_err("%s: Error! head prev->next is %pK should be %pK\n",
__func__, prev->next, &bufq->head);
return -EINVAL;
}
if (next->prev != &bufq->head) {
- pr_err("%s: Error! head next->prev is %p should be %p\n",
+ pr_err("%s: Error! head next->prev is %pK should be %pK\n",
__func__, next->prev, &bufq->head);
return -EINVAL;
}
@@ -228,7 +228,7 @@ static void msm_isp_unprepare_v4l2_buf(
struct msm_isp_bufq *bufq = NULL;
if (!buf_mgr || !buf_info) {
- pr_err("%s: NULL ptr %p %p\n", __func__,
+ pr_err("%s: NULL ptr %pK %pK\n", __func__,
buf_mgr, buf_info);
return;
}
@@ -255,7 +255,7 @@ static int msm_isp_map_buf(struct msm_isp_buf_mgr *buf_mgr,
int ret;
if (!buf_mgr || !mapped_info) {
- pr_err_ratelimited("%s: %d] NULL ptr buf_mgr %p mapped_info %p\n",
+ pr_err_ratelimited("%s: %d] NULL ptr buf_mgr %pK mapped_info %pK\n",
__func__, __LINE__, buf_mgr, mapped_info);
return -EINVAL;
}
diff --git a/drivers/media/platform/msm/camera_v2/isp/msm_isp46.c b/drivers/media/platform/msm/camera_v2/isp/msm_isp46.c
index e1e579b..f15f234 100644
--- a/drivers/media/platform/msm/camera_v2/isp/msm_isp46.c
+++ b/drivers/media/platform/msm/camera_v2/isp/msm_isp46.c
@@ -920,7 +920,7 @@ static int msm_vfe46_start_fetch_engine(struct vfe_device *vfe_dev,
rc = vfe_dev->buf_mgr->ops->get_buf_by_index(
vfe_dev->buf_mgr, bufq_handle, fe_cfg->buf_idx, &buf);
if (rc < 0 || !buf) {
- pr_err("%s: No fetch buffer rc= %d buf= %p\n",
+ pr_err("%s: No fetch buffer rc= %d buf= %pK\n",
__func__, rc, buf);
return -EINVAL;
}
diff --git a/drivers/media/platform/msm/camera_v2/isp/msm_isp47.c b/drivers/media/platform/msm/camera_v2/isp/msm_isp47.c
index 603e83a..ebf38dd 100644
--- a/drivers/media/platform/msm/camera_v2/isp/msm_isp47.c
+++ b/drivers/media/platform/msm/camera_v2/isp/msm_isp47.c
@@ -1058,7 +1058,7 @@ static int msm_vfe47_start_fetch_engine(struct vfe_device *vfe_dev,
rc = vfe_dev->buf_mgr->ops->get_buf_by_index(
vfe_dev->buf_mgr, bufq_handle, fe_cfg->buf_idx, &buf);
if (rc < 0 || !buf) {
- pr_err("%s: No fetch buffer rc= %d buf= %p\n",
+ pr_err("%s: No fetch buffer rc= %d buf= %pK\n",
__func__, rc, buf);
return -EINVAL;
}
diff --git a/drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c b/drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c
index fbda545..a5952a5 100644
--- a/drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c
+++ b/drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c
@@ -725,7 +725,7 @@ void msm_isp_check_for_output_error(struct vfe_device *vfe_dev,
int i;
if (!vfe_dev || !sof_info) {
- pr_err("%s %d failed: vfe_dev %p sof_info %p\n", __func__,
+ pr_err("%s %d failed: vfe_dev %pK sof_info %pK\n", __func__,
__LINE__, vfe_dev, sof_info);
return;
}
@@ -1284,7 +1284,7 @@ static int msm_isp_axi_stream_enable_cfg(
!dual_vfe_res->axi_data[ISP_VFE0] ||
!dual_vfe_res->vfe_base[ISP_VFE1] ||
!dual_vfe_res->axi_data[ISP_VFE1]) {
- pr_err("%s:%d failed vfe0 %p %p vfe %p %p\n",
+ pr_err("%s:%d failed vfe0 %pK %pK vfe %pK %pK\n",
__func__, __LINE__,
dual_vfe_res->vfe_base[ISP_VFE0],
dual_vfe_res->axi_data[ISP_VFE0],
@@ -1659,7 +1659,7 @@ static int msm_isp_cfg_ping_pong_address(struct vfe_device *vfe_dev,
!dual_vfe_res->axi_data[ISP_VFE0] ||
!dual_vfe_res->vfe_base[ISP_VFE1] ||
!dual_vfe_res->axi_data[ISP_VFE1]) {
- pr_err("%s:%d failed vfe0 %p %p vfe %p %p\n",
+ pr_err("%s:%d failed vfe0 %pK %pK vfe %pK %pK\n",
__func__, __LINE__,
dual_vfe_res->vfe_base[ISP_VFE0],
dual_vfe_res->axi_data[ISP_VFE0],
@@ -1940,7 +1940,7 @@ int msm_isp_drop_frame(struct vfe_device *vfe_dev,
uint32_t pingpong_bit;
if (!vfe_dev || !stream_info || !ts || !sof_info) {
- pr_err("%s %d vfe_dev %p stream_info %p ts %p op_info %p\n",
+ pr_err("%s %d vfe_dev %pK stream_info %pK ts %pK op_info %pK\n",
__func__, __LINE__, vfe_dev, stream_info, ts,
sof_info);
return -EINVAL;
@@ -2230,7 +2230,7 @@ int msm_isp_axi_reset(struct vfe_device *vfe_dev,
unsigned long flags;
if (!reset_cmd) {
- pr_err("%s: NULL pointer reset cmd %p\n", __func__, reset_cmd);
+ pr_err("%s: NULL pointer reset cmd %pK\n", __func__, reset_cmd);
rc = -1;
return rc;
}
@@ -2928,7 +2928,7 @@ static int msm_isp_return_empty_buffer(struct vfe_device *vfe_dev,
struct msm_isp_timestamp timestamp;
if (!vfe_dev || !stream_info) {
- pr_err("%s %d failed: vfe_dev %p stream_info %p\n", __func__,
+ pr_err("%s %d failed: vfe_dev %pK stream_info %pK\n", __func__,
__LINE__, vfe_dev, stream_info);
return -EINVAL;
}
@@ -3007,7 +3007,7 @@ static int msm_isp_request_frame(struct vfe_device *vfe_dev,
bool dual_vfe = false;
if (!vfe_dev || !stream_info) {
- pr_err("%s %d failed: vfe_dev %p stream_info %p\n", __func__,
+ pr_err("%s %d failed: vfe_dev %pK stream_info %pK\n", __func__,
__LINE__, vfe_dev, stream_info);
return -EINVAL;
}
@@ -3659,7 +3659,7 @@ void msm_isp_axi_disable_all_wm(struct vfe_device *vfe_dev)
int i, j;
if (!vfe_dev || !axi_data) {
- pr_err("%s: error %p %p\n", __func__, vfe_dev, axi_data);
+ pr_err("%s: error %pK %pK\n", __func__, vfe_dev, axi_data);
return;
}
diff --git a/drivers/media/platform/msm/camera_v2/isp/msm_isp_stats_util.c b/drivers/media/platform/msm/camera_v2/isp/msm_isp_stats_util.c
index 7eaffad..03c587e 100644
--- a/drivers/media/platform/msm/camera_v2/isp/msm_isp_stats_util.c
+++ b/drivers/media/platform/msm/camera_v2/isp/msm_isp_stats_util.c
@@ -88,8 +88,9 @@ static int msm_isp_stats_cfg_ping_pong_address(struct vfe_device *vfe_dev,
!dual_vfe_res->stats_data[ISP_VFE0] ||
!dual_vfe_res->vfe_base[ISP_VFE1] ||
!dual_vfe_res->stats_data[ISP_VFE1]) {
- pr_err("%s:%d error vfe0 %p %p vfe1 %p %p\n", __func__,
- __LINE__, dual_vfe_res->vfe_base[ISP_VFE0],
+ pr_err("%s:%d error vfe0 %pK %pK vfe1 %pK %pK\n",
+ __func__, __LINE__,
+ dual_vfe_res->vfe_base[ISP_VFE0],
dual_vfe_res->stats_data[ISP_VFE0],
dual_vfe_res->vfe_base[ISP_VFE1],
dual_vfe_res->stats_data[ISP_VFE1]);
@@ -156,7 +157,7 @@ static int32_t msm_isp_stats_buf_divert(struct vfe_device *vfe_dev,
uint32_t stats_idx;
if (!vfe_dev || !ts || !buf_event || !stream_info) {
- pr_err("%s:%d failed: invalid params %p %p %p %p\n",
+ pr_err("%s:%d failed: invalid params %pK %pK %pK %pK\n",
__func__, __LINE__, vfe_dev, ts, buf_event,
stream_info);
return -EINVAL;
diff --git a/drivers/media/platform/msm/camera_v2/isp/msm_isp_util.c b/drivers/media/platform/msm/camera_v2/isp/msm_isp_util.c
index 5f1b208..dc209d7 100644
--- a/drivers/media/platform/msm/camera_v2/isp/msm_isp_util.c
+++ b/drivers/media/platform/msm/camera_v2/isp/msm_isp_util.c
@@ -468,14 +468,14 @@ static int msm_isp_get_max_clk_rate(struct vfe_device *vfe_dev, long *rate)
long round_rate = 0;
if (!vfe_dev || !rate) {
- pr_err("%s:%d failed: vfe_dev %p rate %p\n", __func__, __LINE__,
- vfe_dev, rate);
+ pr_err("%s:%d failed: vfe_dev %pK rate %pK\n", __func__,
+ __LINE__, vfe_dev, rate);
return -EINVAL;
}
*rate = 0;
if (!vfe_dev->hw_info) {
- pr_err("%s:%d failed: vfe_dev->hw_info %p\n", __func__,
+ pr_err("%s:%d failed: vfe_dev->hw_info %pK\n", __func__,
__LINE__, vfe_dev->hw_info);
return -EINVAL;
}
@@ -505,13 +505,13 @@ static int msm_isp_get_clk_rates(struct vfe_device *vfe_dev,
int32_t rc = 0;
uint32_t svs = 0, nominal = 0, turbo = 0;
if (!vfe_dev || !rates) {
- pr_err("%s:%d failed: vfe_dev %p rates %p\n", __func__,
+ pr_err("%s:%d failed: vfe_dev %pK rates %pK\n", __func__,
__LINE__, vfe_dev, rates);
return -EINVAL;
}
if (!vfe_dev->pdev) {
- pr_err("%s:%d failed: vfe_dev->pdev %p\n", __func__,
+ pr_err("%s:%d failed: vfe_dev->pdev %pK\n", __func__,
__LINE__, vfe_dev->pdev);
return -EINVAL;
}
@@ -519,7 +519,7 @@ static int msm_isp_get_clk_rates(struct vfe_device *vfe_dev,
of_node = vfe_dev->pdev->dev.of_node;
if (!of_node) {
- pr_err("%s %d failed: of_node = %p\n", __func__,
+ pr_err("%s %d failed: of_node = %pK\n", __func__,
__LINE__, of_node);
return -EINVAL;
}
@@ -728,7 +728,7 @@ static int msm_isp_set_dual_HW_master_slave_mode(
unsigned long flags;
if (!vfe_dev || !arg) {
- pr_err("%s: Error! Invalid input vfe_dev %p arg %p\n",
+ pr_err("%s: Error! Invalid input vfe_dev %pK arg %pK\n",
__func__, vfe_dev, arg);
return -EINVAL;
}
@@ -819,7 +819,7 @@ static int msm_isp_proc_cmd_list_unlocked(struct vfe_device *vfe_dev, void *arg)
struct msm_vfe_cfg_cmd_list cmd, cmd_next;
if (!vfe_dev || !arg) {
- pr_err("%s:%d failed: vfe_dev %p arg %p", __func__, __LINE__,
+ pr_err("%s:%d failed: vfe_dev %pK arg %pK", __func__, __LINE__,
vfe_dev, arg);
return -EINVAL;
}
@@ -889,7 +889,7 @@ static int msm_isp_proc_cmd_list_compat(struct vfe_device *vfe_dev, void *arg)
struct msm_vfe_cfg_cmd2 current_cmd;
if (!vfe_dev || !arg) {
- pr_err("%s:%d failed: vfe_dev %p arg %p", __func__, __LINE__,
+ pr_err("%s:%d failed: vfe_dev %pK arg %pK", __func__, __LINE__,
vfe_dev, arg);
return -EINVAL;
}
@@ -946,10 +946,10 @@ static long msm_isp_ioctl_unlocked(struct v4l2_subdev *sd,
struct vfe_device *vfe_dev = v4l2_get_subdevdata(sd);
if (!vfe_dev || !vfe_dev->vfe_base) {
- pr_err("%s:%d failed: invalid params %p\n",
+ pr_err("%s:%d failed: invalid params %pK\n",
__func__, __LINE__, vfe_dev);
if (vfe_dev)
- pr_err("%s:%d failed %p\n", __func__,
+ pr_err("%s:%d failed %pK\n", __func__,
__LINE__, vfe_dev->vfe_base);
return -EINVAL;
}
@@ -1134,10 +1134,10 @@ static long msm_isp_ioctl_compat(struct v4l2_subdev *sd,
long rc = 0;
if (!vfe_dev || !vfe_dev->vfe_base) {
- pr_err("%s:%d failed: invalid params %p\n",
+ pr_err("%s:%d failed: invalid params %pK\n",
__func__, __LINE__, vfe_dev);
if (vfe_dev)
- pr_err("%s:%d failed %p\n", __func__,
+ pr_err("%s:%d failed %pK\n", __func__,
__LINE__, vfe_dev->vfe_base);
return -EINVAL;
}
@@ -1183,13 +1183,13 @@ static int msm_isp_send_hw_cmd(struct vfe_device *vfe_dev,
uint32_t *cfg_data, uint32_t cmd_len)
{
if (!vfe_dev || !reg_cfg_cmd) {
- pr_err("%s:%d failed: vfe_dev %p reg_cfg_cmd %p\n", __func__,
+ pr_err("%s:%d failed: vfe_dev %pK reg_cfg_cmd %pK\n", __func__,
__LINE__, vfe_dev, reg_cfg_cmd);
return -EINVAL;
}
if ((reg_cfg_cmd->cmd_type != VFE_CFG_MASK) &&
(!cfg_data || !cmd_len)) {
- pr_err("%s:%d failed: cmd type %d cfg_data %p cmd_len %d\n",
+ pr_err("%s:%d failed: cmd type %d cfg_data %pK cmd_len %d\n",
__func__, __LINE__, reg_cfg_cmd->cmd_type, cfg_data,
cmd_len);
return -EINVAL;
@@ -1856,7 +1856,7 @@ static int msm_isp_process_iommu_page_fault(struct vfe_device *vfe_dev)
{
int rc = vfe_dev->buf_mgr->pagefault_debug_disable;
- pr_err("%s:%d] VFE%d Handle Page fault! vfe_dev %p\n", __func__,
+ pr_err("%s:%d] VFE%d Handle Page fault! vfe_dev %pK\n", __func__,
__LINE__, vfe_dev->pdev->id, vfe_dev);
msm_isp_halt_send_error(vfe_dev, ISP_EVENT_IOMMU_P_FAULT);
@@ -2048,7 +2048,7 @@ void msm_isp_do_tasklet(unsigned long data)
uint32_t irq_status0, irq_status1, pingpong_status;
if (vfe_dev->vfe_base == NULL || vfe_dev->vfe_open_cnt == 0) {
- ISP_DBG("%s: VFE%d open cnt = %d, device closed(base = %p)\n",
+ ISP_DBG("%s: VFE%d open cnt = %d, device closed(base = %pK)\n",
__func__, vfe_dev->pdev->id, vfe_dev->vfe_open_cnt,
vfe_dev->vfe_base);
return;
@@ -2121,7 +2121,7 @@ static void msm_vfe_iommu_fault_handler(struct iommu_domain *domain,
vfe_dev->page_fault_addr = iova;
if (!vfe_dev->buf_mgr || !vfe_dev->buf_mgr->ops ||
!vfe_dev->axi_data.num_active_stream) {
- pr_err("%s:%d buf_mgr %p active strms %d\n", __func__,
+ pr_err("%s:%d buf_mgr %pK active strms %d\n", __func__,
__LINE__, vfe_dev->buf_mgr,
vfe_dev->axi_data.num_active_stream);
goto end;
@@ -2138,7 +2138,7 @@ static void msm_vfe_iommu_fault_handler(struct iommu_domain *domain,
}
mutex_unlock(&vfe_dev->core_mutex);
} else {
- ISP_DBG("%s:%d] no token received: %p\n",
+ ISP_DBG("%s:%d] no token received: %pK\n",
__func__, __LINE__, token);
goto end;
}
@@ -2173,7 +2173,7 @@ int msm_isp_open_node(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
}
if (vfe_dev->vfe_base) {
- pr_err("%s:%d invalid params cnt %d base %p\n", __func__,
+ pr_err("%s:%d invalid params cnt %d base %pK\n", __func__,
__LINE__, vfe_dev->vfe_open_cnt, vfe_dev->vfe_base);
vfe_dev->vfe_base = NULL;
}
diff --git a/drivers/media/platform/msm/camera_v2/ispif/msm_ispif.c b/drivers/media/platform/msm/camera_v2/ispif/msm_ispif.c
index 640379d..abfae4f 100644
--- a/drivers/media/platform/msm/camera_v2/ispif/msm_ispif.c
+++ b/drivers/media/platform/msm/camera_v2/ispif/msm_ispif.c
@@ -1292,7 +1292,7 @@ static int msm_ispif_set_vfe_info(struct ispif_device *ispif,
{
if (!vfe_info || (vfe_info->num_vfe == 0) ||
(vfe_info->num_vfe > ispif->hw_num_isps)) {
- pr_err("Invalid VFE info: %p %d\n", vfe_info,
+ pr_err("Invalid VFE info: %pK %d\n", vfe_info,
(vfe_info ? vfe_info->num_vfe : 0));
return -EINVAL;
}
@@ -1327,7 +1327,7 @@ static int msm_ispif_init(struct ispif_device *ispif,
if (ispif->csid_version >= CSID_VERSION_V30) {
if (!ispif->clk_mux_mem || !ispif->clk_mux_io) {
- pr_err("%s csi clk mux mem %p io %p\n", __func__,
+ pr_err("%s csi clk mux mem %pK io %pK\n", __func__,
ispif->clk_mux_mem, ispif->clk_mux_io);
rc = -ENOMEM;
return rc;
diff --git a/drivers/media/platform/msm/camera_v2/jpeg_10/msm_jpeg_hw.c b/drivers/media/platform/msm/camera_v2/jpeg_10/msm_jpeg_hw.c
index 9339029..071ce0a 100644
--- a/drivers/media/platform/msm/camera_v2/jpeg_10/msm_jpeg_hw.c
+++ b/drivers/media/platform/msm/camera_v2/jpeg_10/msm_jpeg_hw.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012-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
@@ -805,7 +805,7 @@ void msm_jpeg_hw_write(struct msm_jpeg_hw_cmd *hw_cmd_p,
new_data = hw_cmd_p->data & hw_cmd_p->mask;
new_data |= old_data;
- JPEG_DBG("%s:%d] %p %08x\n", __func__, __LINE__,
+ JPEG_DBG("%s:%d] %pK %08x\n", __func__, __LINE__,
paddr, new_data);
msm_camera_io_w(new_data, paddr);
}
@@ -908,7 +908,7 @@ void msm_jpeg_io_dump(void *base, int size)
int i;
u32 *p = (u32 *) addr;
u32 data;
- JPEG_DBG_HIGH("%s:%d] %p %d", __func__, __LINE__, addr, size);
+ JPEG_DBG_HIGH("%s:%d] %pK %d", __func__, __LINE__, addr, size);
line_str[0] = '\0';
p_str = line_str;
for (i = 0; i < size/4; i++) {
diff --git a/drivers/media/platform/msm/camera_v2/jpeg_10/msm_jpeg_platform.c b/drivers/media/platform/msm/camera_v2/jpeg_10/msm_jpeg_platform.c
index e076d35..266a5a6 100644
--- a/drivers/media/platform/msm/camera_v2/jpeg_10/msm_jpeg_platform.c
+++ b/drivers/media/platform/msm/camera_v2/jpeg_10/msm_jpeg_platform.c
@@ -210,7 +210,7 @@ static int32_t msm_jpeg_set_init_dt_parms(struct msm_jpeg_device *pgmn_dev,
return -EINVAL;
}
for (i = 0; i < dt_count; i = i + 2) {
- JPEG_DBG("%s:%d] %p %08x\n",
+ JPEG_DBG("%s:%d] %pK %08x\n",
__func__, __LINE__,
base + dt_reg_settings[i],
dt_reg_settings[i + 1]);
diff --git a/drivers/media/platform/msm/camera_v2/jpeg_10/msm_jpeg_sync.c b/drivers/media/platform/msm/camera_v2/jpeg_10/msm_jpeg_sync.c
index 2e2841a..d27f56a 100644
--- a/drivers/media/platform/msm/camera_v2/jpeg_10/msm_jpeg_sync.c
+++ b/drivers/media/platform/msm/camera_v2/jpeg_10/msm_jpeg_sync.c
@@ -754,7 +754,7 @@ int __msm_jpeg_open(struct msm_jpeg_device *pgmn_dev)
__LINE__, rc);
goto platform_init_fail;
}
- JPEG_DBG("%s:%d] platform resources - base %p, irq %d\n",
+ JPEG_DBG("%s:%d] platform resources - base %pK, irq %d\n",
__func__, __LINE__,
pgmn_dev->base, (int)pgmn_dev->jpeg_irq_res->start);
msm_jpeg_q_cleanup(&pgmn_dev->evt_q);
diff --git a/drivers/media/platform/msm/camera_v2/jpeg_dma/msm_jpeg_dma_hw.c b/drivers/media/platform/msm/camera_v2/jpeg_dma/msm_jpeg_dma_hw.c
index 4108693..f3ceaad 100644
--- a/drivers/media/platform/msm/camera_v2/jpeg_dma/msm_jpeg_dma_hw.c
+++ b/drivers/media/platform/msm/camera_v2/jpeg_dma/msm_jpeg_dma_hw.c
@@ -93,7 +93,7 @@ static inline u32 msm_jpegdma_hw_read_reg(struct msm_jpegdma_device *dma,
static inline void msm_jpegdma_hw_write_reg(struct msm_jpegdma_device *dma,
enum msm_jpegdma_mem_resources base_idx, u32 reg, u32 value)
{
- pr_debug("%s:%d]%p %08x\n", __func__, __LINE__,
+ pr_debug("%s:%d]%pK %08x\n", __func__, __LINE__,
dma->iomem_base[base_idx] + reg,
value);
msm_camera_io_w(value, dma->iomem_base[base_idx] + reg);
diff --git a/drivers/media/platform/msm/camera_v2/msm_vb2/msm_vb2.c b/drivers/media/platform/msm/camera_v2/msm_vb2/msm_vb2.c
index f7246f2..0e4a453 100644
--- a/drivers/media/platform/msm/camera_v2/msm_vb2/msm_vb2.c
+++ b/drivers/media/platform/msm/camera_v2/msm_vb2/msm_vb2.c
@@ -248,7 +248,7 @@ static int msm_vb2_put_buf(struct vb2_buffer *vb, int session_id,
break;
}
if (WARN_ON(vb2_buf != vb)) {
- pr_err("VB buffer is INVALID vb=%p, ses_id=%d, str_id=%d\n",
+ pr_err("VB buffer is INVALID vb=%pK, ses_id=%d, str_id=%d\n",
vb, session_id, stream_id);
spin_unlock_irqrestore(&stream->stream_lock, flags);
return -EINVAL;
@@ -290,7 +290,7 @@ static int msm_vb2_buf_done(struct vb2_buffer *vb, int session_id,
break;
}
if (WARN_ON(vb2_buf != vb)) {
- pr_err("VB buffer is INVALID ses_id=%d, str_id=%d, vb=%p\n",
+ pr_err("VB buffer is INVALID ses_id=%d, str_id=%d, vb=%pK\n",
session_id, stream_id, vb);
spin_unlock_irqrestore(&stream->stream_lock, flags);
return -EINVAL;
diff --git a/drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c b/drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c
index 55fc18e..3ee49db 100644
--- a/drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c
+++ b/drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c
@@ -148,7 +148,7 @@ void msm_cpp_vbif_register_error_handler(void *dev,
int (*client_vbif_error_handler)(void *, uint32_t))
{
if (dev == NULL || client >= VBIF_CLIENT_MAX) {
- pr_err("%s: Fail to register handler! dev = %p, client %d\n",
+ pr_err("%s: Fail to register handler! dev = %pK,client %d\n",
__func__, dev, client);
return;
}
@@ -1054,7 +1054,7 @@ int cpp_vbif_error_handler(void *dev, uint32_t vbif_error)
struct cpp_device *cpp_dev = NULL;
if (dev == NULL || vbif_error >= CPP_VBIF_ERROR_MAX) {
- pr_err("failed: dev %p, vbif error %d\n", dev, vbif_error);
+ pr_err("failed: dev %pK,vbif error %d\n", dev, vbif_error);
return -EINVAL;
}
@@ -1083,13 +1083,13 @@ static int cpp_open_node(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
CPP_DBG("E\n");
if (!sd || !fh) {
- pr_err("Wrong input parameters sd %p fh %p!",
+ pr_err("Wrong input parameters sd %pK fh %pK!",
sd, fh);
return -EINVAL;
}
cpp_dev = v4l2_get_subdevdata(sd);
if (!cpp_dev) {
- pr_err("failed: cpp_dev %p\n", cpp_dev);
+ pr_err("failed: cpp_dev %pK\n", cpp_dev);
return -EINVAL;
}
mutex_lock(&cpp_dev->mutex);
@@ -1112,7 +1112,7 @@ static int cpp_open_node(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
return -ENODEV;
}
- CPP_DBG("open %d %p\n", i, &fh->vfh);
+ CPP_DBG("open %d %pK\n", i, &fh->vfh);
cpp_dev->cpp_open_cnt++;
if (cpp_dev->cpp_open_cnt == 1) {
rc = cpp_init_hardware(cpp_dev);
@@ -1158,7 +1158,7 @@ static int cpp_close_node(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
cpp_dev = v4l2_get_subdevdata(sd);
if (!cpp_dev) {
- pr_err("failed: cpp_dev %p\n", cpp_dev);
+ pr_err("failed: cpp_dev %pK\n", cpp_dev);
return -EINVAL;
}
@@ -1446,7 +1446,7 @@ static void msm_cpp_do_timeout_work(struct work_struct *work)
mutex_lock(&cpp_dev->mutex);
if (!work || (cpp_timer.data.cpp_dev->state != CPP_STATE_ACTIVE)) {
- pr_err("Invalid work:%p or state:%d\n", work,
+ pr_err("Invalid work:%pK or state:%d\n", work,
cpp_timer.data.cpp_dev->state);
/* Do not flush queue here as it is not a fatal error */
goto end;
@@ -2512,7 +2512,7 @@ static int msm_cpp_copy_from_ioctl_ptr(void *dst_ptr,
{
int ret;
if ((ioctl_ptr->ioctl_ptr == NULL) || (ioctl_ptr->len == 0)) {
- pr_err("%s: Wrong ioctl_ptr %p / len %zu\n", __func__,
+ pr_err("%s: Wrong ioctl_ptr %pK / len %zu\n", __func__,
ioctl_ptr, ioctl_ptr->len);
return -EINVAL;
}
@@ -2535,7 +2535,7 @@ static int msm_cpp_copy_from_ioctl_ptr(void *dst_ptr,
{
int ret;
if ((ioctl_ptr->ioctl_ptr == NULL) || (ioctl_ptr->len == 0)) {
- pr_err("%s: Wrong ioctl_ptr %p / len %zu\n", __func__,
+ pr_err("%s: Wrong ioctl_ptr %pK / len %zu\n", __func__,
ioctl_ptr, ioctl_ptr->len);
return -EINVAL;
}
@@ -2607,14 +2607,14 @@ static int msm_cpp_validate_input(unsigned int cmd, void *arg,
break;
default: {
if (ioctl_ptr == NULL) {
- pr_err("Wrong ioctl_ptr %p\n", ioctl_ptr);
+ pr_err("Wrong ioctl_ptr %pK\n", ioctl_ptr);
return -EINVAL;
}
*ioctl_ptr = arg;
if ((*ioctl_ptr == NULL) ||
((*ioctl_ptr)->ioctl_ptr == NULL)) {
- pr_err("Wrong arg %p\n", arg);
+ pr_err("Wrong arg %pK\n", arg);
return -EINVAL;
}
break;
@@ -2631,7 +2631,7 @@ long msm_cpp_subdev_ioctl(struct v4l2_subdev *sd,
int rc = 0;
if (sd == NULL) {
- pr_err("sd %p\n", sd);
+ pr_err("sd %pK\n", sd);
return -EINVAL;
}
cpp_dev = v4l2_get_subdevdata(sd);
@@ -2707,7 +2707,7 @@ long msm_cpp_subdev_ioctl(struct v4l2_subdev *sd,
&cpp_dev->pdev->dev);
if (rc) {
dev_err(&cpp_dev->pdev->dev,
- "Fail to loc blob %s dev %p, rc:%d\n",
+ "Fail to loc blob %s dev %pK, rc:%d\n",
cpp_dev->fw_name_bin,
&cpp_dev->pdev->dev, rc);
kfree(cpp_dev->fw_name_bin);
@@ -3170,14 +3170,15 @@ static long msm_cpp_subdev_do_ioctl(
struct v4l2_fh *vfh = NULL;
if ((arg == NULL) || (file == NULL)) {
- pr_err("Invalid input parameters arg %p, file %p\n", arg, file);
+ pr_err("Invalid input parameters arg %pK, file %pK\n",
+ arg, file);
return -EINVAL;
}
vdev = video_devdata(file);
sd = vdev_to_v4l2_subdev(vdev);
if (sd == NULL) {
- pr_err("Invalid input parameter sd %p\n", sd);
+ pr_err("Invalid input parameter sd %pK\n", sd);
return -EINVAL;
}
vfh = file->private_data;
@@ -3451,7 +3452,7 @@ static long msm_cpp_subdev_fops_compat_ioctl(struct file *file,
}
cpp_dev = v4l2_get_subdevdata(sd);
if (!vdev || !cpp_dev) {
- pr_err("Invalid vdev %p or cpp_dev %p structures!",
+ pr_err("Invalid vdev %pK or cpp_dev %pK structures!",
vdev, cpp_dev);
return -EINVAL;
}
diff --git a/drivers/media/platform/msm/camera_v2/pproc/vpe/msm_vpe.c b/drivers/media/platform/msm/camera_v2/pproc/vpe/msm_vpe.c
index bf4d359..f2f1dca 100644
--- a/drivers/media/platform/msm/camera_v2/pproc/vpe/msm_vpe.c
+++ b/drivers/media/platform/msm/camera_v2/pproc/vpe/msm_vpe.c
@@ -56,12 +56,12 @@ static void vpe_mem_dump(const char * const name, const void * const addr,
int i;
u32 *p = (u32 *) addr;
u32 data;
- VPE_DBG("%s: (%s) %p %d\n", __func__, name, addr, size);
+ VPE_DBG("%s: (%s) %pK %d\n", __func__, name, addr, size);
line_str[0] = '\0';
p_str = line_str;
for (i = 0; i < size/4; i++) {
if (i % 4 == 0) {
- snprintf(p_str, 12, "%p: ", p);
+ snprintf(p_str, 12, "%pK: ", p);
p_str += 10;
}
data = *p++;
@@ -614,7 +614,7 @@ static int vpe_open_node(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
goto err_mutex_unlock;
}
- VPE_DBG("open %d %p\n", i, &fh->vfh);
+ VPE_DBG("open %d %pK\n", i, &fh->vfh);
vpe_dev->vpe_open_cnt++;
if (vpe_dev->vpe_open_cnt == 1) {
rc = vpe_init_hardware(vpe_dev);
@@ -669,7 +669,7 @@ static int vpe_close_node(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
return -ENODEV;
}
- VPE_DBG("close %d %p\n", i, &fh->vfh);
+ VPE_DBG("close %d %pK\n", i, &fh->vfh);
vpe_dev->vpe_open_cnt--;
if (vpe_dev->vpe_open_cnt == 0) {
vpe_deinit_mem(vpe_dev);
diff --git a/drivers/media/platform/msm/camera_v2/sensor/actuator/msm_actuator.c b/drivers/media/platform/msm/camera_v2/sensor/actuator/msm_actuator.c
index 0ad3d9a..c33e66f 100644
--- a/drivers/media/platform/msm/camera_v2/sensor/actuator/msm_actuator.c
+++ b/drivers/media/platform/msm/camera_v2/sensor/actuator/msm_actuator.c
@@ -583,7 +583,7 @@ static int32_t msm_actuator_move_focus(
if ((a_ctrl->region_size <= 0) ||
(a_ctrl->region_size > MAX_ACTUATOR_REGION) ||
(!move_params->ringing_params)) {
- pr_err("Invalid-region size = %d, ringing_params = %p\n",
+ pr_err("Invalid-region size = %d, ringing_params = %pK\n",
a_ctrl->region_size, move_params->ringing_params);
return -EFAULT;
}
@@ -703,7 +703,7 @@ static int32_t msm_actuator_bivcm_move_focus(
if ((a_ctrl->region_size <= 0) ||
(a_ctrl->region_size > MAX_ACTUATOR_REGION) ||
(!move_params->ringing_params)) {
- pr_err("Invalid-region size = %d, ringing_params = %p\n",
+ pr_err("Invalid-region size = %d, ringing_params = %pK\n",
a_ctrl->region_size, move_params->ringing_params);
return -EFAULT;
}
@@ -1516,7 +1516,7 @@ static long msm_actuator_subdev_ioctl(struct v4l2_subdev *sd,
struct msm_actuator_ctrl_t *a_ctrl = v4l2_get_subdevdata(sd);
void __user *argp = (void __user *)arg;
CDBG("Enter\n");
- CDBG("%s:%d a_ctrl %p argp %p\n", __func__, __LINE__, a_ctrl, argp);
+ CDBG("%s:%d a_ctrl %pK argp %pK\n", __func__, __LINE__, a_ctrl, argp);
switch (cmd) {
case VIDIOC_MSM_SENSOR_GET_SUBDEV_ID:
return msm_actuator_get_subdev_id(a_ctrl, argp);
@@ -1777,7 +1777,7 @@ static int32_t msm_actuator_i2c_probe(struct i2c_client *client,
goto probe_failure;
}
- CDBG("client = 0x%p\n", client);
+ CDBG("client = 0x%pK\n", client);
rc = of_property_read_u32(client->dev.of_node, "cell-index",
&act_ctrl_t->subdev_id);
diff --git a/drivers/media/platform/msm/camera_v2/sensor/cci/msm_cci.c b/drivers/media/platform/msm/camera_v2/sensor/cci/msm_cci.c
index 7099d9f..817870e 100644
--- a/drivers/media/platform/msm/camera_v2/sensor/cci/msm_cci.c
+++ b/drivers/media/platform/msm/camera_v2/sensor/cci/msm_cci.c
@@ -945,7 +945,7 @@ static int32_t msm_cci_i2c_read_bytes(struct v4l2_subdev *sd,
uint16_t read_bytes = 0;
if (!sd || !c_ctrl) {
- pr_err("%s:%d sd %p c_ctrl %p\n", __func__,
+ pr_err("%s:%d sd %pK c_ctrl %pK\n", __func__,
__LINE__, sd, c_ctrl);
return -EINVAL;
}
@@ -1238,7 +1238,7 @@ static int32_t msm_cci_i2c_set_sync_prms(struct v4l2_subdev *sd,
cci_dev = v4l2_get_subdevdata(sd);
if (!cci_dev || !c_ctrl) {
- pr_err("%s:%d failed: invalid params %p %p\n", __func__,
+ pr_err("%s:%d failed: invalid params %pK %pK\n", __func__,
__LINE__, cci_dev, c_ctrl);
rc = -EINVAL;
return rc;
@@ -1260,7 +1260,7 @@ static int32_t msm_cci_init(struct v4l2_subdev *sd,
cci_dev = v4l2_get_subdevdata(sd);
if (!cci_dev || !c_ctrl) {
- pr_err("%s:%d failed: invalid params %p %p\n", __func__,
+ pr_err("%s:%d failed: invalid params %pK %pK\n", __func__,
__LINE__, cci_dev, c_ctrl);
rc = -EINVAL;
return rc;
@@ -1539,7 +1539,7 @@ static int32_t msm_cci_write(struct v4l2_subdev *sd,
cci_dev = v4l2_get_subdevdata(sd);
if (!cci_dev || !c_ctrl) {
- pr_err("%s:%d failed: invalid params %p %p\n", __func__,
+ pr_err("%s:%d failed: invalid params %pK %pK\n", __func__,
__LINE__, cci_dev, c_ctrl);
rc = -EINVAL;
return rc;
@@ -1984,7 +1984,7 @@ static int msm_cci_probe(struct platform_device *pdev)
{
struct cci_device *new_cci_dev;
int rc = 0, i = 0;
- CDBG("%s: pdev %p device id = %d\n", __func__, pdev, pdev->id);
+ CDBG("%s: pdev %pK device id = %d\n", __func__, pdev, pdev->id);
new_cci_dev = kzalloc(sizeof(struct cci_device), GFP_KERNEL);
if (!new_cci_dev) {
pr_err("%s: no enough memory\n", __func__);
@@ -1996,7 +1996,7 @@ static int msm_cci_probe(struct platform_device *pdev)
ARRAY_SIZE(new_cci_dev->msm_sd.sd.name), "msm_cci");
v4l2_set_subdevdata(&new_cci_dev->msm_sd.sd, new_cci_dev);
platform_set_drvdata(pdev, &new_cci_dev->msm_sd.sd);
- CDBG("%s sd %p\n", __func__, &new_cci_dev->msm_sd.sd);
+ CDBG("%s sd %pK\n", __func__, &new_cci_dev->msm_sd.sd);
if (pdev->dev.of_node)
of_property_read_u32((&pdev->dev)->of_node,
"cell-index", &pdev->id);
@@ -2071,7 +2071,7 @@ static int msm_cci_probe(struct platform_device *pdev)
if (!new_cci_dev->write_wq[i])
pr_err("Failed to create write wq\n");
}
- CDBG("%s cci subdev %p\n", __func__, &new_cci_dev->msm_sd.sd);
+ CDBG("%s cci subdev %pK\n", __func__, &new_cci_dev->msm_sd.sd);
CDBG("%s line %d\n", __func__, __LINE__);
return 0;
diff --git a/drivers/media/platform/msm/camera_v2/sensor/csid/msm_csid.c b/drivers/media/platform/msm/camera_v2/sensor/csid/msm_csid.c
index ef07a54..46e8594 100644
--- a/drivers/media/platform/msm/camera_v2/sensor/csid/msm_csid.c
+++ b/drivers/media/platform/msm/camera_v2/sensor/csid/msm_csid.c
@@ -265,7 +265,7 @@ static int msm_csid_config(struct csid_device *csid_dev,
void __iomem *csidbase;
csidbase = csid_dev->base;
if (!csidbase || !csid_params) {
- pr_err("%s:%d csidbase %p, csid params %p\n", __func__,
+ pr_err("%s:%d csidbase %pK, csid params %pK\n", __func__,
__LINE__, csidbase, csid_params);
return -EINVAL;
}
@@ -651,7 +651,7 @@ static int32_t msm_csid_cmd(struct csid_device *csid_dev, void __user *arg)
struct csid_cfg_data *cdata = (struct csid_cfg_data *)arg;
if (!csid_dev || !cdata) {
- pr_err("%s:%d csid_dev %p, cdata %p\n", __func__, __LINE__,
+ pr_err("%s:%d csid_dev %pK, cdata %pK\n", __func__, __LINE__,
csid_dev, cdata);
return -EINVAL;
}
@@ -792,7 +792,7 @@ static int32_t msm_csid_cmd32(struct csid_device *csid_dev, void __user *arg)
cdata = &local_arg;
if (!csid_dev || !cdata) {
- pr_err("%s:%d csid_dev %p, cdata %p\n", __func__, __LINE__,
+ pr_err("%s:%d csid_dev %pK, cdata %pK\n", __func__, __LINE__,
csid_dev, cdata);
return -EINVAL;
}
diff --git a/drivers/media/platform/msm/camera_v2/sensor/csiphy/msm_csiphy.c b/drivers/media/platform/msm/camera_v2/sensor/csiphy/msm_csiphy.c
index 8363912..7bdaf67 100644
--- a/drivers/media/platform/msm/camera_v2/sensor/csiphy/msm_csiphy.c
+++ b/drivers/media/platform/msm/camera_v2/sensor/csiphy/msm_csiphy.c
@@ -497,7 +497,7 @@ static int msm_csiphy_lane_config(struct csiphy_device *csiphy_dev,
val |= csiphy_params->csid_core;
}
msm_camera_io_w(val, csiphy_dev->clk_mux_base);
- CDBG("%s clk mux addr %p val 0x%x\n", __func__,
+ CDBG("%s clk mux addr %pK val 0x%x\n", __func__,
csiphy_dev->clk_mux_base, val);
/* ensure write is done */
mb();
@@ -924,7 +924,7 @@ static int msm_csiphy_release(struct csiphy_device *csiphy_dev, void *arg)
mipi_csiphy_glbl_pwr_cfg_addr);
} else {
if (!csi_lane_params) {
- pr_err("%s:%d failed: csi_lane_params %p\n", __func__,
+ pr_err("%s:%d failed: csi_lane_params %pK\n", __func__,
__LINE__, csi_lane_params);
return -EINVAL;
}
@@ -1030,7 +1030,7 @@ static int msm_csiphy_release(struct csiphy_device *csiphy_dev, void *arg)
mipi_csiphy_glbl_pwr_cfg_addr);
} else {
if (!csi_lane_params) {
- pr_err("%s:%d failed: csi_lane_params %p\n", __func__,
+ pr_err("%s:%d failed: csi_lane_params %pK\n", __func__,
__LINE__, csi_lane_params);
return -EINVAL;
}
diff --git a/drivers/media/platform/msm/camera_v2/sensor/eeprom/msm_eeprom.c b/drivers/media/platform/msm/camera_v2/sensor/eeprom/msm_eeprom.c
index 8e50646..c9f2c8c 100644
--- a/drivers/media/platform/msm/camera_v2/sensor/eeprom/msm_eeprom.c
+++ b/drivers/media/platform/msm/camera_v2/sensor/eeprom/msm_eeprom.c
@@ -696,7 +696,7 @@ static long msm_eeprom_subdev_ioctl(struct v4l2_subdev *sd,
struct msm_eeprom_ctrl_t *e_ctrl = v4l2_get_subdevdata(sd);
void __user *argp = (void __user *)arg;
CDBG("%s E\n", __func__);
- CDBG("%s:%d a_ctrl %p argp %p\n", __func__, __LINE__, e_ctrl, argp);
+ CDBG("%s:%d a_ctrl %pK argp %pK\n", __func__, __LINE__, e_ctrl, argp);
switch (cmd) {
case VIDIOC_MSM_SENSOR_GET_SUBDEV_ID:
return msm_eeprom_get_subdev_id(e_ctrl, argp);
@@ -795,7 +795,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 = 0x%p\n", __func__, client);
+ CDBG("%s client = 0x%pK\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__);
@@ -1521,7 +1521,7 @@ static long msm_eeprom_subdev_ioctl32(struct v4l2_subdev *sd,
void __user *argp = (void __user *)arg;
CDBG("%s E\n", __func__);
- CDBG("%s:%d a_ctrl %p argp %p\n", __func__, __LINE__, e_ctrl, argp);
+ CDBG("%s:%d a_ctrl %pK argp %pK\n", __func__, __LINE__, e_ctrl, argp);
switch (cmd) {
case VIDIOC_MSM_SENSOR_GET_SUBDEV_ID:
return msm_eeprom_get_subdev_id(e_ctrl, argp);
diff --git a/drivers/media/platform/msm/camera_v2/sensor/flash/msm_flash.c b/drivers/media/platform/msm/camera_v2/sensor/flash/msm_flash.c
index 86d61e7..84bd3fe 100644
--- a/drivers/media/platform/msm/camera_v2/sensor/flash/msm_flash.c
+++ b/drivers/media/platform/msm/camera_v2/sensor/flash/msm_flash.c
@@ -347,7 +347,7 @@ static int32_t msm_flash_i2c_release(
int32_t rc = 0;
if (!(&flash_ctrl->power_info) || !(&flash_ctrl->flash_i2c_client)) {
- pr_err("%s:%d failed: %p %p\n",
+ pr_err("%s:%d failed: %pK %pK\n",
__func__, __LINE__, &flash_ctrl->power_info,
&flash_ctrl->flash_i2c_client);
return -EINVAL;
diff --git a/drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_dt_util.c b/drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_dt_util.c
index af47235..6b867bf 100644
--- a/drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_dt_util.c
+++ b/drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_dt_util.c
@@ -34,7 +34,7 @@ int msm_camera_fill_vreg_params(struct camera_vreg_t *cam_vreg,
/* Validate input parameters */
if (!cam_vreg || !power_setting) {
- pr_err("%s:%d failed: cam_vreg %p power_setting %p", __func__,
+ pr_err("%s:%d failed: cam_vreg %pK power_setting %pK", __func__,
__LINE__, cam_vreg, power_setting);
return -EINVAL;
}
@@ -1327,7 +1327,7 @@ int msm_camera_power_up(struct msm_camera_power_ctrl_t *ctrl,
CDBG("%s:%d\n", __func__, __LINE__);
if (!ctrl || !sensor_i2c_client) {
- pr_err("failed ctrl %p sensor_i2c_client %p\n", ctrl,
+ pr_err("failed ctrl %pK sensor_i2c_client %pK\n", ctrl,
sensor_i2c_client);
return -EINVAL;
}
@@ -1549,7 +1549,7 @@ int msm_camera_power_down(struct msm_camera_power_ctrl_t *ctrl,
CDBG("%s:%d\n", __func__, __LINE__);
if (!ctrl || !sensor_i2c_client) {
- pr_err("failed ctrl %p sensor_i2c_client %p\n", ctrl,
+ pr_err("failed ctrl %pK sensor_i2c_client %pK\n", ctrl,
sensor_i2c_client);
return -EINVAL;
}
diff --git a/drivers/media/platform/msm/camera_v2/sensor/msm_sensor.c b/drivers/media/platform/msm/camera_v2/sensor/msm_sensor.c
index 6a4dcdc..d09e29d 100644
--- a/drivers/media/platform/msm/camera_v2/sensor/msm_sensor.c
+++ b/drivers/media/platform/msm/camera_v2/sensor/msm_sensor.c
@@ -106,7 +106,7 @@ int msm_sensor_power_down(struct msm_sensor_ctrl_t *s_ctrl)
struct msm_camera_i2c_client *sensor_i2c_client;
if (!s_ctrl) {
- pr_err("%s:%d failed: s_ctrl %p\n",
+ pr_err("%s:%d failed: s_ctrl %pK\n",
__func__, __LINE__, s_ctrl);
return -EINVAL;
}
@@ -119,7 +119,7 @@ int msm_sensor_power_down(struct msm_sensor_ctrl_t *s_ctrl)
sensor_i2c_client = s_ctrl->sensor_i2c_client;
if (!power_info || !sensor_i2c_client) {
- pr_err("%s:%d failed: power_info %p sensor_i2c_client %p\n",
+ pr_err("%s:%d failed: power_info %pK sensor_i2c_client %pK\n",
__func__, __LINE__, power_info, sensor_i2c_client);
return -EINVAL;
}
@@ -137,7 +137,7 @@ int msm_sensor_power_up(struct msm_sensor_ctrl_t *s_ctrl)
uint32_t retry = 0;
if (!s_ctrl) {
- pr_err("%s:%d failed: %p\n",
+ pr_err("%s:%d failed: %pK\n",
__func__, __LINE__, s_ctrl);
return -EINVAL;
}
@@ -152,7 +152,7 @@ int msm_sensor_power_up(struct msm_sensor_ctrl_t *s_ctrl)
if (!power_info || !sensor_i2c_client || !slave_info ||
!sensor_name) {
- pr_err("%s:%d failed: %p %p %p %p\n",
+ pr_err("%s:%d failed: %pK %pK %pK %pK\n",
__func__, __LINE__, power_info,
sensor_i2c_client, slave_info, sensor_name);
return -EINVAL;
@@ -208,7 +208,7 @@ int msm_sensor_match_id(struct msm_sensor_ctrl_t *s_ctrl)
const char *sensor_name;
if (!s_ctrl) {
- pr_err("%s:%d failed: %p\n",
+ pr_err("%s:%d failed: %pK\n",
__func__, __LINE__, s_ctrl);
return -EINVAL;
}
@@ -217,7 +217,7 @@ int msm_sensor_match_id(struct msm_sensor_ctrl_t *s_ctrl)
sensor_name = s_ctrl->sensordata->sensor_name;
if (!sensor_i2c_client || !slave_info || !sensor_name) {
- pr_err("%s:%d failed: %p %p %p\n",
+ pr_err("%s:%d failed: %pK %pK %pK\n",
__func__, __LINE__, sensor_i2c_client, slave_info,
sensor_name);
return -EINVAL;
@@ -1450,13 +1450,13 @@ int32_t msm_sensor_init_default_params(struct msm_sensor_ctrl_t *s_ctrl)
/* Validate input parameters */
if (!s_ctrl) {
- pr_err("%s:%d failed: invalid params s_ctrl %p\n", __func__,
+ pr_err("%s:%d failed: invalid params s_ctrl %pK\n", __func__,
__LINE__, s_ctrl);
return -EINVAL;
}
if (!s_ctrl->sensor_i2c_client) {
- pr_err("%s:%d failed: invalid params sensor_i2c_client %p\n",
+ pr_err("%s:%d failed: invalid params sensor_i2c_client %pK\n",
__func__, __LINE__, s_ctrl->sensor_i2c_client);
return -EINVAL;
}
@@ -1465,7 +1465,7 @@ int32_t msm_sensor_init_default_params(struct msm_sensor_ctrl_t *s_ctrl)
s_ctrl->sensor_i2c_client->cci_client = kzalloc(sizeof(
struct msm_camera_cci_client), GFP_KERNEL);
if (!s_ctrl->sensor_i2c_client->cci_client) {
- pr_err("%s:%d failed: no memory cci_client %p\n", __func__,
+ pr_err("%s:%d failed: no memory cci_client %pK\n", __func__,
__LINE__, s_ctrl->sensor_i2c_client->cci_client);
return -ENOMEM;
}
diff --git a/drivers/media/platform/msm/camera_v2/sensor/msm_sensor_driver.c b/drivers/media/platform/msm/camera_v2/sensor/msm_sensor_driver.c
index 36ad847..d075a6d 100644
--- a/drivers/media/platform/msm/camera_v2/sensor/msm_sensor_driver.c
+++ b/drivers/media/platform/msm/camera_v2/sensor/msm_sensor_driver.c
@@ -474,10 +474,8 @@ static int32_t msm_sensor_get_power_down_settings(void *setting,
}
/* Allocate memory for power down setting */
pd = kzalloc(sizeof(*pd) * size_down, GFP_KERNEL);
- if (!pd) {
- pr_err("failed: no memory power_setting %p", pd);
+ if (!pd)
return -EFAULT;
- }
if (slave_info->power_setting_array.power_down_setting) {
#ifdef CONFIG_COMPAT
@@ -541,10 +539,8 @@ static int32_t msm_sensor_get_power_up_settings(void *setting,
/* Allocate memory for power up setting */
pu = kzalloc(sizeof(*pu) * size, GFP_KERNEL);
- if (!pu) {
- pr_err("failed: no memory power_setting %p", pu);
+ if (!pu)
return -ENOMEM;
- }
#ifdef CONFIG_COMPAT
if (is_compat_task()) {
@@ -655,22 +651,20 @@ int32_t msm_sensor_driver_probe(void *setting,
/* Validate input parameters */
if (!setting) {
- pr_err("failed: slave_info %p", setting);
+ pr_err("failed: slave_info %pK", setting);
return -EINVAL;
}
/* Allocate memory for slave info */
slave_info = kzalloc(sizeof(*slave_info), GFP_KERNEL);
- if (!slave_info) {
- pr_err("failed: no memory slave_info %p", slave_info);
+ if (!slave_info)
return -ENOMEM;
- }
#ifdef CONFIG_COMPAT
if (is_compat_task()) {
struct msm_camera_sensor_slave_info32 *slave_info32 =
kzalloc(sizeof(*slave_info32), GFP_KERNEL);
if (!slave_info32) {
- pr_err("failed: no memory for slave_info32 %p\n",
+ pr_err("failed: no memory for slave_info32 %pK\n",
slave_info32);
rc = -ENOMEM;
goto free_slave_info;
@@ -765,13 +759,13 @@ int32_t msm_sensor_driver_probe(void *setting,
/* Extract s_ctrl from camera id */
s_ctrl = g_sctrl[slave_info->camera_id];
if (!s_ctrl) {
- pr_err("failed: s_ctrl %p for camera_id %d", s_ctrl,
+ pr_err("failed: s_ctrl %pK for camera_id %d", s_ctrl,
slave_info->camera_id);
rc = -EINVAL;
goto free_slave_info;
}
- CDBG("s_ctrl[%d] %p", slave_info->camera_id, s_ctrl);
+ CDBG("s_ctrl[%d] %pK", slave_info->camera_id, s_ctrl);
if (s_ctrl->is_probe_succeed == 1) {
/*
@@ -811,12 +805,9 @@ int32_t msm_sensor_driver_probe(void *setting,
camera_info = kzalloc(sizeof(struct msm_camera_slave_info), GFP_KERNEL);
- if (!camera_info) {
- pr_err("failed: no memory slave_info %p", camera_info);
+ if (!camera_info)
goto free_slave_info;
- }
-
s_ctrl->sensordata->slave_info = camera_info;
/* Fill sensor slave info */
@@ -828,7 +819,7 @@ int32_t msm_sensor_driver_probe(void *setting,
/* Fill CCI master, slave address and CCI default params */
if (!s_ctrl->sensor_i2c_client) {
- pr_err("failed: sensor_i2c_client %p",
+ pr_err("failed: sensor_i2c_client %pK",
s_ctrl->sensor_i2c_client);
rc = -EINVAL;
goto free_camera_info;
@@ -841,7 +832,7 @@ int32_t msm_sensor_driver_probe(void *setting,
cci_client = s_ctrl->sensor_i2c_client->cci_client;
if (!cci_client) {
- pr_err("failed: cci_client %p", cci_client);
+ pr_err("failed: cci_client %pK", cci_client);
goto free_camera_info;
}
cci_client->cci_i2c_master = s_ctrl->cci_i2c_master;
@@ -1129,7 +1120,7 @@ static int32_t msm_sensor_driver_parse(struct msm_sensor_ctrl_t *s_ctrl)
s_ctrl->sensor_i2c_client = kzalloc(sizeof(*s_ctrl->sensor_i2c_client),
GFP_KERNEL);
if (!s_ctrl->sensor_i2c_client) {
- pr_err("failed: no memory sensor_i2c_client %p",
+ pr_err("failed: no memory sensor_i2c_client %pK",
s_ctrl->sensor_i2c_client);
return -ENOMEM;
}
@@ -1138,7 +1129,7 @@ static int32_t msm_sensor_driver_parse(struct msm_sensor_ctrl_t *s_ctrl)
s_ctrl->msm_sensor_mutex = kzalloc(sizeof(*s_ctrl->msm_sensor_mutex),
GFP_KERNEL);
if (!s_ctrl->msm_sensor_mutex) {
- pr_err("failed: no memory msm_sensor_mutex %p",
+ pr_err("failed: no memory msm_sensor_mutex %pK",
s_ctrl->msm_sensor_mutex);
goto FREE_SENSOR_I2C_CLIENT;
}
@@ -1167,7 +1158,7 @@ static int32_t msm_sensor_driver_parse(struct msm_sensor_ctrl_t *s_ctrl)
/* Store sensor control structure in static database */
g_sctrl[s_ctrl->id] = s_ctrl;
- CDBG("g_sctrl[%d] %p", s_ctrl->id, g_sctrl[s_ctrl->id]);
+ CDBG("g_sctrl[%d] %pK", s_ctrl->id, g_sctrl[s_ctrl->id]);
return rc;
@@ -1191,10 +1182,8 @@ static int32_t msm_sensor_driver_platform_probe(struct platform_device *pdev)
/* Create sensor control structure */
s_ctrl = kzalloc(sizeof(*s_ctrl), GFP_KERNEL);
- if (!s_ctrl) {
- pr_err("failed: no memory s_ctrl %p", s_ctrl);
+ if (!s_ctrl)
return -ENOMEM;
- }
platform_set_drvdata(pdev, s_ctrl);
@@ -1238,10 +1227,8 @@ static int32_t msm_sensor_driver_i2c_probe(struct i2c_client *client,
/* Create sensor control structure */
s_ctrl = kzalloc(sizeof(*s_ctrl), GFP_KERNEL);
- if (!s_ctrl) {
- pr_err("failed: no memory s_ctrl %p", s_ctrl);
+ if (!s_ctrl)
return -ENOMEM;
- }
i2c_set_clientdata(client, s_ctrl);
diff --git a/drivers/media/platform/msm/camera_v2/sensor/msm_sensor_init.c b/drivers/media/platform/msm/camera_v2/sensor/msm_sensor_init.c
index 8b6e3d3..ed0b974 100644
--- a/drivers/media/platform/msm/camera_v2/sensor/msm_sensor_init.c
+++ b/drivers/media/platform/msm/camera_v2/sensor/msm_sensor_init.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2013-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
@@ -64,7 +64,7 @@ static int32_t msm_sensor_driver_cmd(struct msm_sensor_init_t *s_init,
/* Validate input parameters */
if (!s_init || !cfg) {
- pr_err("failed: s_init %p cfg %p", s_init, cfg);
+ pr_err("failed: s_init %pK cfg %pK", s_init, cfg);
return -EINVAL;
}
@@ -106,7 +106,7 @@ static long msm_sensor_init_subdev_ioctl(struct v4l2_subdev *sd,
/* Validate input parameters */
if (!s_init) {
- pr_err("failed: s_init %p", s_init);
+ pr_err("failed: s_init %pK", s_init);
return -EINVAL;
}
@@ -167,12 +167,10 @@ static int __init msm_sensor_init_module(void)
int ret = 0;
/* Allocate memory for msm_sensor_init control structure */
s_init = kzalloc(sizeof(struct msm_sensor_init_t), GFP_KERNEL);
- if (!s_init) {
- pr_err("failed: no memory s_init %p", NULL);
+ if (!s_init)
return -ENOMEM;
- }
- CDBG("MSM_SENSOR_INIT_MODULE %p", NULL);
+ CDBG("MSM_SENSOR_INIT_MODULE %pK", NULL);
/* Initialize mutex */
mutex_init(&s_init->imutex);
diff --git a/drivers/media/platform/msm/camera_v2/sensor/ois/msm_ois.c b/drivers/media/platform/msm/camera_v2/sensor/ois/msm_ois.c
index 947eeaf..82c9e5c5 100644
--- a/drivers/media/platform/msm/camera_v2/sensor/ois/msm_ois.c
+++ b/drivers/media/platform/msm/camera_v2/sensor/ois/msm_ois.c
@@ -448,7 +448,7 @@ static long msm_ois_subdev_ioctl(struct v4l2_subdev *sd,
struct msm_ois_ctrl_t *o_ctrl = v4l2_get_subdevdata(sd);
void __user *argp = (void __user *)arg;
CDBG("Enter\n");
- CDBG("%s:%d o_ctrl %p argp %p\n", __func__, __LINE__, o_ctrl, argp);
+ CDBG("%s:%d o_ctrl %pK argp %pK\n", __func__, __LINE__, o_ctrl, argp);
switch (cmd) {
case VIDIOC_MSM_SENSOR_GET_SUBDEV_ID:
return msm_ois_get_subdev_id(o_ctrl, argp);
@@ -553,7 +553,7 @@ static int32_t msm_ois_i2c_probe(struct i2c_client *client,
goto probe_failure;
}
- CDBG("client = 0x%p\n", client);
+ CDBG("client = 0x%pK\n", client);
rc = of_property_read_u32(client->dev.of_node, "cell-index",
&ois_ctrl_t->subdev_id);
--
cgit v1.1
Reference in New Issue View Git Blame Copy Permalink