Commit 86660713 authored by Yu Zhe's avatar Yu Zhe Committed by Mathieu Poirier
Browse files

remoteproc: Remove unnecessary (void*) conversions 



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

Signed-off-by: default avatarYu 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: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
parent e0e01de8

drivers/remoteproc/da8xx_remoteproc.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -84,7 +84,7 @@ struct da8xx_rproc { 
 */

 */

static irqreturn_t handle_event(int irq, void *p)

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 */

	/* Process incoming buffers on all our vrings */

	rproc_vq_interrupt(rproc, 0);

	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)

static irqreturn_t da8xx_rproc_callback(int irq, void *p)

{

{

	struct rproc *rproc = (struct rproc *)p;

	struct rproc *rproc = p;

	struct da8xx_rproc *drproc = (struct da8xx_rproc *)rproc->priv;

	struct da8xx_rproc *drproc = rproc->priv;

	u32 chipsig;

	u32 chipsig;





	chipsig = readl(drproc->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)

static int da8xx_rproc_start(struct rproc *rproc)

{

{

	struct device *dev = rproc->dev.parent;

	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 clk *dsp_clk = drproc->dsp_clk;

	struct reset_control *dsp_reset = drproc->dsp_reset;

	struct reset_control *dsp_reset = drproc->dsp_reset;

	int ret;

	int ret;
@@ -183,7 +183,7 @@ static int da8xx_rproc_stop(struct rproc *rproc) 
/* kick a virtqueue */

/* kick a virtqueue */

static void da8xx_rproc_kick(struct rproc *rproc, int vqid)

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 */

	/* Interrupt remote proc */

	writel(SYSCFG_CHIPSIG2, drproc->chipsig);

	writel(SYSCFG_CHIPSIG2, drproc->chipsig);
@@ -360,7 +360,7 @@ static int da8xx_rproc_probe(struct platform_device *pdev) 
static int da8xx_rproc_remove(struct platform_device *pdev)

static int da8xx_rproc_remove(struct platform_device *pdev)

{

{

	struct rproc *rproc = platform_get_drvdata(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;

	struct device *dev = &pdev->dev;





	/*

	/*

drivers/remoteproc/mtk_scp.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -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)

static void scp_init_ipi_handler(void *data, unsigned int len, void *priv)

{

{

	struct mtk_scp *scp = (struct mtk_scp *)priv;

	struct mtk_scp *scp = priv;

	struct scp_run *run = (struct scp_run *)data;

	struct scp_run *run = data;





	scp->run.signaled = run->signaled;

	scp->run.signaled = run->signaled;

	strscpy(scp->run.fw_ver, run->fw_ver, SCP_FW_VER_LEN);

	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)

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 device *dev = scp->dev;

	struct scp_run *run = &scp->run;

	struct scp_run *run = &scp->run;

	int ret;

	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)

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);

	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)

static int scp_stop(struct rproc *rproc)

{

{

	struct mtk_scp *scp = (struct mtk_scp *)rproc->priv;

	struct mtk_scp *scp = rproc->priv;

	int ret;

	int ret;





	ret = clk_prepare_enable(scp->clk);

	ret = clk_prepare_enable(scp->clk);
@@ -829,7 +829,7 @@ static int scp_probe(struct platform_device *pdev) 
	if (!rproc)

	if (!rproc)

		return dev_err_probe(dev, -ENOMEM, "unable to allocate remoteproc\n");

		return dev_err_probe(dev, -ENOMEM, "unable to allocate remoteproc\n");





	scp = (struct mtk_scp *)rproc->priv;

	scp = rproc->priv;

	scp->rproc = rproc;

	scp->rproc = rproc;

	scp->dev = dev;

	scp->dev = dev;

	scp->data = of_device_get_match_data(dev);

	scp->data = of_device_get_match_data(dev);

drivers/remoteproc/qcom_q6v5_adsp.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -321,7 +321,7 @@ static int qcom_adsp_shutdown(struct qcom_adsp *adsp) 




static int adsp_load(struct rproc *rproc, const struct firmware *fw)

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;

	int ret;





	ret = qcom_mdt_load_no_init(adsp->dev, fw, rproc->firmware, 0,

	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)

static int adsp_start(struct rproc *rproc)

{

{

	struct qcom_adsp *adsp = (struct qcom_adsp *)rproc->priv;

	struct qcom_adsp *adsp = rproc->priv;

	int ret;

	int ret;

	unsigned int val;

	unsigned int val;
@@ -469,7 +469,7 @@ static void qcom_adsp_pil_handover(struct qcom_q6v5 *q6v5) 




static int adsp_stop(struct rproc *rproc)

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 handover;

	int ret;

	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)

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;

	int offset;





	offset = da - adsp->mem_reloc;

	offset = da - adsp->mem_reloc;
@@ -696,7 +696,7 @@ static int adsp_probe(struct platform_device *pdev) 
	rproc->has_iommu = desc->has_iommu;

	rproc->has_iommu = desc->has_iommu;

	rproc_coredump_set_elf_info(rproc, ELFCLASS32, EM_NONE);

	rproc_coredump_set_elf_info(rproc, ELFCLASS32, EM_NONE);





	adsp = (struct qcom_adsp *)rproc->priv;

	adsp = rproc->priv;

	adsp->dev = &pdev->dev;

	adsp->dev = &pdev->dev;

	adsp->rproc = rproc;

	adsp->rproc = rproc;

	adsp->info_name = desc->sysmon_name;

	adsp->info_name = desc->sysmon_name;

drivers/remoteproc/qcom_q6v5_mss.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -1562,7 +1562,7 @@ static void qcom_q6v5_dump_segment(struct rproc *rproc, 




static int q6v5_start(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 xfermemop_ret;

	int ret;

	int ret;
@@ -1604,7 +1604,7 @@ static int q6v5_start(struct rproc *rproc) 




static int q6v5_stop(struct rproc *rproc)

static int q6v5_stop(struct rproc *rproc)

{

{

	struct q6v5 *qproc = (struct q6v5 *)rproc->priv;

	struct q6v5 *qproc = rproc->priv;

	int ret;

	int ret;





	ret = qcom_q6v5_request_stop(&qproc->q6v5, qproc->sysmon);

	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)

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);

	return qcom_q6v5_panic(&qproc->q6v5);

}

}
@@ -1977,7 +1977,7 @@ static int q6v5_probe(struct platform_device *pdev) 
	rproc->auto_boot = false;

	rproc->auto_boot = false;

	rproc_coredump_set_elf_info(rproc, ELFCLASS32, EM_NONE);

	rproc_coredump_set_elf_info(rproc, ELFCLASS32, EM_NONE);





	qproc = (struct q6v5 *)rproc->priv;

	qproc = rproc->priv;

	qproc->dev = &pdev->dev;

	qproc->dev = &pdev->dev;

	qproc->rproc = rproc;

	qproc->rproc = rproc;

	qproc->hexagon_mdt_image = "modem.mdt";

	qproc->hexagon_mdt_image = "modem.mdt";

drivers/remoteproc/qcom_q6v5_pas.c

+7 −7
Original line number Original line Diff line number Diff line
@@ -186,7 +186,7 @@ static int adsp_shutdown_poll_decrypt(struct qcom_adsp *adsp) 




static int adsp_unprepare(struct rproc *rproc)

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

	 * 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)

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;

	int ret;





	/* Store firmware handle to be used in adsp_start() */

	/* Store firmware handle to be used in adsp_start() */
@@ -244,7 +244,7 @@ static int adsp_load(struct rproc *rproc, const struct firmware *fw) 




static int adsp_start(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;

	int ret;





	ret = qcom_q6v5_prepare(&adsp->q6v5);

	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)

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 handover;

	int ret;

	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)

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;

	int offset;





	offset = da - adsp->mem_reloc;

	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)

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);

	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->auto_boot = desc->auto_boot;

	rproc_coredump_set_elf_info(rproc, ELFCLASS32, EM_NONE);

	rproc_coredump_set_elf_info(rproc, ELFCLASS32, EM_NONE);





	adsp = (struct qcom_adsp *)rproc->priv;

	adsp = rproc->priv;

	adsp->dev = &pdev->dev;

	adsp->dev = &pdev->dev;

	adsp->rproc = rproc;

	adsp->rproc = rproc;

	adsp->minidump_id = desc->minidump_id;

	adsp->minidump_id = desc->minidump_id;