From 691849c2ffa1503b12bf4f7c46f10af1d5432f25 Mon Sep 17 00:00:00 2001 From: Srinivas Kandagatla Date: Fri, 8 Jan 2016 18:04:15 +0000 Subject: [PATCH] Move to new qcom_smem_get() api Signed-off-by: Srinivas Kandagatla --- drivers/gpio/gpio-qcom-smp2p.c | 11 +++++------ drivers/gpio/gpio-qcom-smsm.c | 7 +++---- drivers/remoteproc/qcom_tz_pil.c | 4 ++-- drivers/soc/qcom/smd.c | 14 ++++++++------ drivers/soc/qcom/smem.c | 10 ++++------ 5 files changed, 22 insertions(+), 24 deletions(-) diff --git a/drivers/gpio/gpio-qcom-smp2p.c b/drivers/gpio/gpio-qcom-smp2p.c index 6e4d09a40c4a..164f39afebb3 100644 --- a/drivers/gpio/gpio-qcom-smp2p.c +++ b/drivers/gpio/gpio-qcom-smp2p.c @@ -169,7 +169,6 @@ static irqreturn_t qcom_smp2p_intr(int irq, void *data) int irq_pin; u32 status; u32 val; - int ret; int i; u8 tmp_name[SMP2P_MAX_ENTRY_NAME]; @@ -177,8 +176,8 @@ static irqreturn_t qcom_smp2p_intr(int irq, void *data) /* Acquire smem item, if not already found */ if (!in) { - ret = qcom_smem_get(pid, smem_id, (void **)&in, &size); - if (ret < 0) { + in = qcom_smem_get(pid, smem_id, &size); + if (IS_ERR(in)) { dev_err(smp2p->dev, "Unable to acquire remote smp2p item\n"); return IRQ_HANDLED; @@ -383,10 +382,10 @@ static int qcom_smp2p_alloc_outbound_item(struct qcom_smp2p *smp2p) return ret; } - ret = qcom_smem_get(pid, smem_id, (void **)&out, NULL); - if (ret < 0) { + out = qcom_smem_get(pid, smem_id, NULL); + if (IS_ERR(out)) { dev_err(smp2p->dev, "Unable to acquire local smp2p item\n"); - return ret; + return PTR_ERR(out); } memset_io(out, 0, sizeof(*out)); diff --git a/drivers/gpio/gpio-qcom-smsm.c b/drivers/gpio/gpio-qcom-smsm.c index 3bbe9bb73f84..c3e510364d14 100644 --- a/drivers/gpio/gpio-qcom-smsm.c +++ b/drivers/gpio/gpio-qcom-smsm.c @@ -226,12 +226,11 @@ static int qcom_smsm_probe(struct platform_device *pdev) return ret; } - ret = qcom_smem_get(-1, SMEM_SMSM_SHARED_STATE, - (void**)&smsm->shared_state, + smsm->shared_state = qcom_smem_get(-1, SMEM_SMSM_SHARED_STATE, &smsm->shared_state_size); - if (ret < 0) { + if (IS_ERR(smsm->shared_state)) { dev_err(&pdev->dev, "Unable to acquire shared state entry\n"); - return ret; + return PTR_ERR(smsm->shared_state); } dev_err(smsm->dev, "SMEM_SMSM_SHARED_STATE: %d, %zu\n", ret, smsm->shared_state_size); diff --git a/drivers/remoteproc/qcom_tz_pil.c b/drivers/remoteproc/qcom_tz_pil.c index f3e5442e5566..ae361fc26dd1 100644 --- a/drivers/remoteproc/qcom_tz_pil.c +++ b/drivers/remoteproc/qcom_tz_pil.c @@ -398,8 +398,8 @@ static irqreturn_t qproc_fatal_interrupt(int irq, void *dev) char *msg; int ret; - ret = qcom_smem_get(-1, qproc->crash_reason, (void**)&msg, &len); - if (!ret && len > 0 && msg[0]) + msg = qcom_smem_get(-1, qproc->crash_reason, &len); + if (IS_ERR(msg) && len > 0 && msg[0]) dev_err(qproc->dev, "fatal error received: %s\n", msg); rproc_report_crash(qproc->rproc, RPROC_FATAL_ERROR); diff --git a/drivers/soc/qcom/smd.c b/drivers/soc/qcom/smd.c index 1ce0c7e406ae..d6fd59d451b9 100644 --- a/drivers/soc/qcom/smd.c +++ b/drivers/soc/qcom/smd.c @@ -388,15 +388,17 @@ static void smd_copy_to_fifo(void __iomem *dst, /* * Copy count bytes of data using 32bit accesses, if that is required. */ -static void smd_copy_from_fifo(void *dst, - const void __iomem *src, - size_t count, - bool word_aligned) +static void smd_copy_from_fifo(void *_dst, const void __iomem *_src, size_t count, bool word_aligned) { + u32 *dst = (u32 *)_dst; + u32 *src = (u32 *)_src; + if (word_aligned) { - __ioread32_copy(dst, src, count / sizeof(u32)); + count /= sizeof(u32); + while (count--) + *dst++ = __raw_readl(src++); } else { - memcpy_fromio(dst, src, count); + memcpy_fromio(_dst, _src, count); } } diff --git a/drivers/soc/qcom/smem.c b/drivers/soc/qcom/smem.c index cbd32d67a33b..5290bb02c547 100644 --- a/drivers/soc/qcom/smem.c +++ b/drivers/soc/qcom/smem.c @@ -705,10 +705,9 @@ static void smem_debug_read_mem(struct seq_file *s) int ret, i; long flags; - ret = qcom_smem_get(QCOM_SMEM_HOST_ANY, SMEM_HEAP_INFO, - (void **)&info, &size); + info = qcom_smem_get(QCOM_SMEM_HOST_ANY, SMEM_HEAP_INFO, &size); - if (ret < 0) + if (IS_ERR(info)) seq_printf(s, "Can't get global heap information pool\n"); else { seq_printf(s, "global heap\n"); @@ -716,9 +715,8 @@ static void smem_debug_read_mem(struct seq_file *s) info[0], info[1], info[2]); for (i = 0; i < 512; i++) { - ret = qcom_smem_get(QCOM_SMEM_HOST_ANY, i, - (void **)&info, &size); - if (ret < 0) + info = qcom_smem_get(QCOM_SMEM_HOST_ANY, i, &size); + if (IS_ERR(info)) continue; seq_printf(s, " [%d]: p: %p s: %li\n", i, info, -- 2.39.2