remoteproc: Remove unnecessary (void*) conversions

Pointer variables of void * type do not require type cast.

Signed-off-by: Yu Zhe <yuzhe@nfschina.com>
Link: https://lore.kernel.org/r/20230328024907.29791-1-yuzhe@nfschina.com
[Fixed merge conflict in xlnx_r5_remoteproc.c]
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>

diff --git a/drivers/remoteproc/da8xx_remoteproc.c b/drivers/remoteproc/da8xx_remoteproc.c
index 98e0be9..768217f 100644 (file)
--- a/drivers/remoteproc/da8xx_remoteproc.c
+++ b/drivers/remoteproc/da8xx_remoteproc.c
@@ -84,7 +84,7 @@ struct da8xx_rproc {
  */
 static irqreturn_t handle_event(int irq, void *p)
 {
-       struct rproc *rproc = (struct rproc *)p;
+       struct rproc *rproc = p;
 
        /* Process incoming buffers on all our vrings */
        rproc_vq_interrupt(rproc, 0);
@@ -104,8 +104,8 @@ static irqreturn_t handle_event(int irq, void *p)
  */
 static irqreturn_t da8xx_rproc_callback(int irq, void *p)
 {
-       struct rproc *rproc = (struct rproc *)p;
-       struct da8xx_rproc *drproc = (struct da8xx_rproc *)rproc->priv;
+       struct rproc *rproc = p;
+       struct da8xx_rproc *drproc = rproc->priv;
        u32 chipsig;
 
        chipsig = readl(drproc->chipsig);
@@ -133,7 +133,7 @@ static irqreturn_t da8xx_rproc_callback(int irq, void *p)
 static int da8xx_rproc_start(struct rproc *rproc)
 {
        struct device *dev = rproc->dev.parent;
-       struct da8xx_rproc *drproc = (struct da8xx_rproc *)rproc->priv;
+       struct da8xx_rproc *drproc = rproc->priv;
        struct clk *dsp_clk = drproc->dsp_clk;
        struct reset_control *dsp_reset = drproc->dsp_reset;
        int ret;
@@ -183,7 +183,7 @@ static int da8xx_rproc_stop(struct rproc *rproc)
 /* kick a virtqueue */
 static void da8xx_rproc_kick(struct rproc *rproc, int vqid)
 {
-       struct da8xx_rproc *drproc = (struct da8xx_rproc *)rproc->priv;
+       struct da8xx_rproc *drproc = rproc->priv;
 
        /* Interrupt remote proc */
        writel(SYSCFG_CHIPSIG2, drproc->chipsig);
@@ -360,7 +360,7 @@ free_mem:
 static int da8xx_rproc_remove(struct platform_device *pdev)
 {
        struct rproc *rproc = platform_get_drvdata(pdev);
-       struct da8xx_rproc *drproc = (struct da8xx_rproc *)rproc->priv;
+       struct da8xx_rproc *drproc = rproc->priv;
        struct device *dev = &pdev->dev;
 
        /*

diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c
index 0861b76..e1d93e6 100644 (file)
--- a/drivers/remoteproc/mtk_scp.c
+++ b/drivers/remoteproc/mtk_scp.c
@@ -74,8 +74,8 @@ static void scp_wdt_handler(struct mtk_scp *scp, u32 scp_to_host)
 
 static void scp_init_ipi_handler(void *data, unsigned int len, void *priv)
 {
-       struct mtk_scp *scp = (struct mtk_scp *)priv;
-       struct scp_run *run = (struct scp_run *)data;
+       struct mtk_scp *scp = priv;
+       struct scp_run *run = data;
 
        scp->run.signaled = run->signaled;
        strscpy(scp->run.fw_ver, run->fw_ver, SCP_FW_VER_LEN);
@@ -498,7 +498,7 @@ static int scp_parse_fw(struct rproc *rproc, const struct firmware *fw)
 
 static int scp_start(struct rproc *rproc)
 {
-       struct mtk_scp *scp = (struct mtk_scp *)rproc->priv;
+       struct mtk_scp *scp = rproc->priv;
        struct device *dev = scp->dev;
        struct scp_run *run = &scp->run;
        int ret;
@@ -587,7 +587,7 @@ static void *mt8192_scp_da_to_va(struct mtk_scp *scp, u64 da, size_t len)
 
 static void *scp_da_to_va(struct rproc *rproc, u64 da, size_t len, bool *is_iomem)
 {
-       struct mtk_scp *scp = (struct mtk_scp *)rproc->priv;
+       struct mtk_scp *scp = rproc->priv;
 
        return scp->data->scp_da_to_va(scp, da, len);
 }
@@ -627,7 +627,7 @@ static void mt8195_scp_stop(struct mtk_scp *scp)
 
 static int scp_stop(struct rproc *rproc)
 {
-       struct mtk_scp *scp = (struct mtk_scp *)rproc->priv;
+       struct mtk_scp *scp = rproc->priv;
        int ret;
 
        ret = clk_prepare_enable(scp->clk);
@@ -829,7 +829,7 @@ static int scp_probe(struct platform_device *pdev)
        if (!rproc)
                return dev_err_probe(dev, -ENOMEM, "unable to allocate remoteproc\n");
 
-       scp = (struct mtk_scp *)rproc->priv;
+       scp = rproc->priv;
        scp->rproc = rproc;
        scp->dev = dev;
        scp->data = of_device_get_match_data(dev);

diff --git a/drivers/remoteproc/qcom_q6v5_adsp.c b/drivers/remoteproc/qcom_q6v5_adsp.c
index 08d8dad..d546ab9 100644 (file)
--- a/drivers/remoteproc/qcom_q6v5_adsp.c
+++ b/drivers/remoteproc/qcom_q6v5_adsp.c
@@ -321,7 +321,7 @@ reset:
 
 static int adsp_load(struct rproc *rproc, const struct firmware *fw)
 {
-       struct qcom_adsp *adsp = (struct qcom_adsp *)rproc->priv;
+       struct qcom_adsp *adsp = rproc->priv;
        int ret;
 
        ret = qcom_mdt_load_no_init(adsp->dev, fw, rproc->firmware, 0,
@@ -379,7 +379,7 @@ static int adsp_map_carveout(struct rproc *rproc)
 
 static int adsp_start(struct rproc *rproc)
 {
-       struct qcom_adsp *adsp = (struct qcom_adsp *)rproc->priv;
+       struct qcom_adsp *adsp = rproc->priv;
        int ret;
        unsigned int val;
 
@@ -469,7 +469,7 @@ static void qcom_adsp_pil_handover(struct qcom_q6v5 *q6v5)
 
 static int adsp_stop(struct rproc *rproc)
 {
-       struct qcom_adsp *adsp = (struct qcom_adsp *)rproc->priv;
+       struct qcom_adsp *adsp = rproc->priv;
        int handover;
        int ret;
 
@@ -492,7 +492,7 @@ static int adsp_stop(struct rproc *rproc)
 
 static void *adsp_da_to_va(struct rproc *rproc, u64 da, size_t len, bool *is_iomem)
 {
-       struct qcom_adsp *adsp = (struct qcom_adsp *)rproc->priv;
+       struct qcom_adsp *adsp = rproc->priv;
        int offset;
 
        offset = da - adsp->mem_reloc;
@@ -696,7 +696,7 @@ static int adsp_probe(struct platform_device *pdev)
        rproc->has_iommu = desc->has_iommu;
        rproc_coredump_set_elf_info(rproc, ELFCLASS32, EM_NONE);
 
-       adsp = (struct qcom_adsp *)rproc->priv;
+       adsp = rproc->priv;
        adsp->dev = &pdev->dev;
        adsp->rproc = rproc;
        adsp->info_name = desc->sysmon_name;

diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c
index ab05308..e7a67c8 100644 (file)
--- a/drivers/remoteproc/qcom_q6v5_mss.c
+++ b/drivers/remoteproc/qcom_q6v5_mss.c
@@ -1562,7 +1562,7 @@ static void qcom_q6v5_dump_segment(struct rproc *rproc,
 
 static int q6v5_start(struct rproc *rproc)
 {
-       struct q6v5 *qproc = (struct q6v5 *)rproc->priv;
+       struct q6v5 *qproc = rproc->priv;
        int xfermemop_ret;
        int ret;
 
@@ -1604,7 +1604,7 @@ reclaim_mpss:
 
 static int q6v5_stop(struct rproc *rproc)
 {
-       struct q6v5 *qproc = (struct q6v5 *)rproc->priv;
+       struct q6v5 *qproc = rproc->priv;
        int ret;
 
        ret = qcom_q6v5_request_stop(&qproc->q6v5, qproc->sysmon);
@@ -1662,7 +1662,7 @@ static int qcom_q6v5_register_dump_segments(struct rproc *rproc,
 
 static unsigned long q6v5_panic(struct rproc *rproc)
 {
-       struct q6v5 *qproc = (struct q6v5 *)rproc->priv;
+       struct q6v5 *qproc = rproc->priv;
 
        return qcom_q6v5_panic(&qproc->q6v5);
 }
@@ -1977,7 +1977,7 @@ static int q6v5_probe(struct platform_device *pdev)
        rproc->auto_boot = false;
        rproc_coredump_set_elf_info(rproc, ELFCLASS32, EM_NONE);
 
-       qproc = (struct q6v5 *)rproc->priv;
+       qproc = rproc->priv;
        qproc->dev = &pdev->dev;
        qproc->rproc = rproc;
        qproc->hexagon_mdt_image = "modem.mdt";

diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c
index 0871108..8eec881 100644 (file)
--- a/drivers/remoteproc/qcom_q6v5_pas.c
+++ b/drivers/remoteproc/qcom_q6v5_pas.c
@@ -186,7 +186,7 @@ static int adsp_shutdown_poll_decrypt(struct qcom_adsp *adsp)
 
 static int adsp_unprepare(struct rproc *rproc)
 {
-       struct qcom_adsp *adsp = (struct qcom_adsp *)rproc->priv;
+       struct qcom_adsp *adsp = rproc->priv;
 
        /*
         * adsp_load() did pass pas_metadata to the SCM driver for storing
@@ -203,7 +203,7 @@ static int adsp_unprepare(struct rproc *rproc)
 
 static int adsp_load(struct rproc *rproc, const struct firmware *fw)
 {
-       struct qcom_adsp *adsp = (struct qcom_adsp *)rproc->priv;
+       struct qcom_adsp *adsp = rproc->priv;
        int ret;
 
        /* Store firmware handle to be used in adsp_start() */
@@ -244,7 +244,7 @@ release_dtb_firmware:
 
 static int adsp_start(struct rproc *rproc)
 {
-       struct qcom_adsp *adsp = (struct qcom_adsp *)rproc->priv;
+       struct qcom_adsp *adsp = rproc->priv;
        int ret;
 
        ret = qcom_q6v5_prepare(&adsp->q6v5);
@@ -360,7 +360,7 @@ static void qcom_pas_handover(struct qcom_q6v5 *q6v5)
 
 static int adsp_stop(struct rproc *rproc)
 {
-       struct qcom_adsp *adsp = (struct qcom_adsp *)rproc->priv;
+       struct qcom_adsp *adsp = rproc->priv;
        int handover;
        int ret;
 
@@ -390,7 +390,7 @@ static int adsp_stop(struct rproc *rproc)
 
 static void *adsp_da_to_va(struct rproc *rproc, u64 da, size_t len, bool *is_iomem)
 {
-       struct qcom_adsp *adsp = (struct qcom_adsp *)rproc->priv;
+       struct qcom_adsp *adsp = rproc->priv;
        int offset;
 
        offset = da - adsp->mem_reloc;
@@ -405,7 +405,7 @@ static void *adsp_da_to_va(struct rproc *rproc, u64 da, size_t len, bool *is_iom
 
 static unsigned long adsp_panic(struct rproc *rproc)
 {
-       struct qcom_adsp *adsp = (struct qcom_adsp *)rproc->priv;
+       struct qcom_adsp *adsp = rproc->priv;
 
        return qcom_q6v5_panic(&adsp->q6v5);
 }
@@ -683,7 +683,7 @@ static int adsp_probe(struct platform_device *pdev)
        rproc->auto_boot = desc->auto_boot;
        rproc_coredump_set_elf_info(rproc, ELFCLASS32, EM_NONE);
 
-       adsp = (struct qcom_adsp *)rproc->priv;
+       adsp = rproc->priv;
        adsp->dev = &pdev->dev;
        adsp->rproc = rproc;
        adsp->minidump_id = desc->minidump_id;

diff --git a/drivers/remoteproc/qcom_wcnss.c b/drivers/remoteproc/qcom_wcnss.c
index 9d4d04f..0fc3172 100644 (file)
--- a/drivers/remoteproc/qcom_wcnss.c
+++ b/drivers/remoteproc/qcom_wcnss.c
@@ -154,7 +154,7 @@ static const struct wcnss_data pronto_v3_data = {
 
 static int wcnss_load(struct rproc *rproc, const struct firmware *fw)
 {
-       struct qcom_wcnss *wcnss = (struct qcom_wcnss *)rproc->priv;
+       struct qcom_wcnss *wcnss = rproc->priv;
        int ret;
 
        ret = qcom_mdt_load(wcnss->dev, fw, rproc->firmware, WCNSS_PAS_ID,
@@ -227,7 +227,7 @@ static void wcnss_configure_iris(struct qcom_wcnss *wcnss)
 
 static int wcnss_start(struct rproc *rproc)
 {
-       struct qcom_wcnss *wcnss = (struct qcom_wcnss *)rproc->priv;
+       struct qcom_wcnss *wcnss = rproc->priv;
        int ret, i;
 
        mutex_lock(&wcnss->iris_lock);
@@ -293,7 +293,7 @@ release_iris_lock:
 
 static int wcnss_stop(struct rproc *rproc)
 {
-       struct qcom_wcnss *wcnss = (struct qcom_wcnss *)rproc->priv;
+       struct qcom_wcnss *wcnss = rproc->priv;
        int ret;
 
        if (wcnss->state) {
@@ -320,7 +320,7 @@ static int wcnss_stop(struct rproc *rproc)
 
 static void *wcnss_da_to_va(struct rproc *rproc, u64 da, size_t len, bool *is_iomem)
 {
-       struct qcom_wcnss *wcnss = (struct qcom_wcnss *)rproc->priv;
+       struct qcom_wcnss *wcnss = rproc->priv;
        int offset;
 
        offset = da - wcnss->mem_reloc;
@@ -566,7 +566,7 @@ static int wcnss_probe(struct platform_device *pdev)
        }
        rproc_coredump_set_elf_info(rproc, ELFCLASS32, EM_NONE);
 
-       wcnss = (struct qcom_wcnss *)rproc->priv;
+       wcnss = rproc->priv;
        wcnss->dev = &pdev->dev;
        wcnss->rproc = rproc;
        platform_set_drvdata(pdev, wcnss);

diff --git a/drivers/remoteproc/xlnx_r5_remoteproc.c b/drivers/remoteproc/xlnx_r5_remoteproc.c
index 53e3e4b..feca6de 100644 (file)
--- a/drivers/remoteproc/xlnx_r5_remoteproc.c
+++ b/drivers/remoteproc/xlnx_r5_remoteproc.c
@@ -441,7 +441,7 @@ static int add_mem_regions_carveout(struct rproc *rproc)
        struct reserved_mem *rmem;
        int i = 0;
 
-       r5_core = (struct zynqmp_r5_core *)rproc->priv;
+       r5_core = rproc->priv;
 
        /* Register associated reserved memory regions */
        of_phandle_iterator_init(&it, r5_core->np, "memory-region", NULL, 0);
@@ -572,7 +572,7 @@ static int add_tcm_carveout_split_mode(struct rproc *rproc)
        size_t bank_size;
        char *bank_name;
 
-       r5_core = (struct zynqmp_r5_core *)rproc->priv;
+       r5_core = rproc->priv;
        dev = r5_core->dev;
        num_banks = r5_core->tcm_bank_count;
 
@@ -641,7 +641,7 @@ static int add_tcm_carveout_lockstep_mode(struct rproc *rproc)
        u32 pm_domain_id;
        char *bank_name;
 
-       r5_core = (struct zynqmp_r5_core *)rproc->priv;
+       r5_core = rproc->priv;
        dev = r5_core->dev;
 
        /* Go through zynqmp banks for r5 node */
@@ -711,7 +711,7 @@ static int add_tcm_banks(struct rproc *rproc)
        struct zynqmp_r5_core *r5_core;
        struct device *dev;
 
-       r5_core = (struct zynqmp_r5_core *)rproc->priv;
+       r5_core = rproc->priv;
        if (!r5_core)
                return -EINVAL;
 
@@ -804,7 +804,7 @@ static int zynqmp_r5_rproc_unprepare(struct rproc *rproc)
        u32 pm_domain_id;
        int i;
 
-       r5_core = (struct zynqmp_r5_core *)rproc->priv;
+       r5_core = rproc->priv;
 
        for (i = 0; i < r5_core->tcm_bank_count; i++) {
                pm_domain_id = r5_core->tcm_banks[i]->pm_domain_id;
@@ -859,7 +859,7 @@ static struct zynqmp_r5_core *zynqmp_r5_add_rproc_core(struct device *cdev)
        }
 
        r5_rproc->auto_boot = false;
-       r5_core = (struct zynqmp_r5_core *)r5_rproc->priv;
+       r5_core = r5_rproc->priv;
        r5_core->dev = cdev;
        r5_core->np = dev_of_node(cdev);
        if (!r5_core->np) {
@@ -1143,12 +1143,12 @@ release_r5_cores:
 
 static void zynqmp_r5_cluster_exit(void *data)
 {
-       struct platform_device *pdev = (struct platform_device *)data;
+       struct platform_device *pdev = data;
        struct zynqmp_r5_cluster *cluster;
        struct zynqmp_r5_core *r5_core;
        int i;
 
-       cluster = (struct zynqmp_r5_cluster *)platform_get_drvdata(pdev);
+       cluster = platform_get_drvdata(pdev);
        if (!cluster)
                return;