Skip to content

Commit 8666071

Browse files
yuzhenfschinamathieupoirier
yuzhenfschina
authored and
mathieupoirier
committed
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>
1 parent e0e01de commit 8666071

7 files changed

Lines changed: 41 additions & 41 deletions

File tree

‎drivers/remoteproc/da8xx_remoteproc.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ struct da8xx_rproc {
8484
*/
8585
static irqreturn_t handle_event(int irq, void *p)
8686
{
87-
struct rproc *rproc = (struct rproc *)p;
87+
struct rproc *rproc = p;
8888

8989
/* Process incoming buffers on all our vrings */
9090
rproc_vq_interrupt(rproc, 0);
@@ -104,8 +104,8 @@ static irqreturn_t handle_event(int irq, void *p)
104104
*/
105105
static irqreturn_t da8xx_rproc_callback(int irq, void *p)
106106
{
107-
struct rproc *rproc = (struct rproc *)p;
108-
struct da8xx_rproc *drproc = (struct da8xx_rproc *)rproc->priv;
107+
struct rproc *rproc = p;
108+
struct da8xx_rproc *drproc = rproc->priv;
109109
u32 chipsig;
110110

111111
chipsig = readl(drproc->chipsig);
@@ -133,7 +133,7 @@ static irqreturn_t da8xx_rproc_callback(int irq, void *p)
133133
static int da8xx_rproc_start(struct rproc *rproc)
134134
{
135135
struct device *dev = rproc->dev.parent;
136-
struct da8xx_rproc *drproc = (struct da8xx_rproc *)rproc->priv;
136+
struct da8xx_rproc *drproc = rproc->priv;
137137
struct clk *dsp_clk = drproc->dsp_clk;
138138
struct reset_control *dsp_reset = drproc->dsp_reset;
139139
int ret;
@@ -183,7 +183,7 @@ static int da8xx_rproc_stop(struct rproc *rproc)
183183
/* kick a virtqueue */
184184
static void da8xx_rproc_kick(struct rproc *rproc, int vqid)
185185
{
186-
struct da8xx_rproc *drproc = (struct da8xx_rproc *)rproc->priv;
186+
struct da8xx_rproc *drproc = rproc->priv;
187187

188188
/* Interrupt remote proc */
189189
writel(SYSCFG_CHIPSIG2, drproc->chipsig);
@@ -360,7 +360,7 @@ static int da8xx_rproc_probe(struct platform_device *pdev)
360360
static int da8xx_rproc_remove(struct platform_device *pdev)
361361
{
362362
struct rproc *rproc = platform_get_drvdata(pdev);
363-
struct da8xx_rproc *drproc = (struct da8xx_rproc *)rproc->priv;
363+
struct da8xx_rproc *drproc = rproc->priv;
364364
struct device *dev = &pdev->dev;
365365

366366
/*

‎drivers/remoteproc/mtk_scp.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ static void scp_wdt_handler(struct mtk_scp *scp, u32 scp_to_host)
7474

7575
static void scp_init_ipi_handler(void *data, unsigned int len, void *priv)
7676
{
77-
struct mtk_scp *scp = (struct mtk_scp *)priv;
78-
struct scp_run *run = (struct scp_run *)data;
77+
struct mtk_scp *scp = priv;
78+
struct scp_run *run = data;
7979

8080
scp->run.signaled = run->signaled;
8181
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)
498498

499499
static int scp_start(struct rproc *rproc)
500500
{
501-
struct mtk_scp *scp = (struct mtk_scp *)rproc->priv;
501+
struct mtk_scp *scp = rproc->priv;
502502
struct device *dev = scp->dev;
503503
struct scp_run *run = &scp->run;
504504
int ret;
@@ -587,7 +587,7 @@ static void *mt8192_scp_da_to_va(struct mtk_scp *scp, u64 da, size_t len)
587587

588588
static void *scp_da_to_va(struct rproc *rproc, u64 da, size_t len, bool *is_iomem)
589589
{
590-
struct mtk_scp *scp = (struct mtk_scp *)rproc->priv;
590+
struct mtk_scp *scp = rproc->priv;
591591

592592
return scp->data->scp_da_to_va(scp, da, len);
593593
}
@@ -627,7 +627,7 @@ static void mt8195_scp_stop(struct mtk_scp *scp)
627627

628628
static int scp_stop(struct rproc *rproc)
629629
{
630-
struct mtk_scp *scp = (struct mtk_scp *)rproc->priv;
630+
struct mtk_scp *scp = rproc->priv;
631631
int ret;
632632

633633
ret = clk_prepare_enable(scp->clk);
@@ -829,7 +829,7 @@ static int scp_probe(struct platform_device *pdev)
829829
if (!rproc)
830830
return dev_err_probe(dev, -ENOMEM, "unable to allocate remoteproc\n");
831831

832-
scp = (struct mtk_scp *)rproc->priv;
832+
scp = rproc->priv;
833833
scp->rproc = rproc;
834834
scp->dev = dev;
835835
scp->data = of_device_get_match_data(dev);

‎drivers/remoteproc/qcom_q6v5_adsp.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ static int qcom_adsp_shutdown(struct qcom_adsp *adsp)
321321

322322
static int adsp_load(struct rproc *rproc, const struct firmware *fw)
323323
{
324-
struct qcom_adsp *adsp = (struct qcom_adsp *)rproc->priv;
324+
struct qcom_adsp *adsp = rproc->priv;
325325
int ret;
326326

327327
ret = qcom_mdt_load_no_init(adsp->dev, fw, rproc->firmware, 0,
@@ -379,7 +379,7 @@ static int adsp_map_carveout(struct rproc *rproc)
379379

380380
static int adsp_start(struct rproc *rproc)
381381
{
382-
struct qcom_adsp *adsp = (struct qcom_adsp *)rproc->priv;
382+
struct qcom_adsp *adsp = rproc->priv;
383383
int ret;
384384
unsigned int val;
385385

@@ -469,7 +469,7 @@ static void qcom_adsp_pil_handover(struct qcom_q6v5 *q6v5)
469469

470470
static int adsp_stop(struct rproc *rproc)
471471
{
472-
struct qcom_adsp *adsp = (struct qcom_adsp *)rproc->priv;
472+
struct qcom_adsp *adsp = rproc->priv;
473473
int handover;
474474
int ret;
475475

@@ -492,7 +492,7 @@ static int adsp_stop(struct rproc *rproc)
492492

493493
static void *adsp_da_to_va(struct rproc *rproc, u64 da, size_t len, bool *is_iomem)
494494
{
495-
struct qcom_adsp *adsp = (struct qcom_adsp *)rproc->priv;
495+
struct qcom_adsp *adsp = rproc->priv;
496496
int offset;
497497

498498
offset = da - adsp->mem_reloc;
@@ -696,7 +696,7 @@ static int adsp_probe(struct platform_device *pdev)
696696
rproc->has_iommu = desc->has_iommu;
697697
rproc_coredump_set_elf_info(rproc, ELFCLASS32, EM_NONE);
698698

699-
adsp = (struct qcom_adsp *)rproc->priv;
699+
adsp = rproc->priv;
700700
adsp->dev = &pdev->dev;
701701
adsp->rproc = rproc;
702702
adsp->info_name = desc->sysmon_name;

‎drivers/remoteproc/qcom_q6v5_mss.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1562,7 +1562,7 @@ static void qcom_q6v5_dump_segment(struct rproc *rproc,
15621562

15631563
static int q6v5_start(struct rproc *rproc)
15641564
{
1565-
struct q6v5 *qproc = (struct q6v5 *)rproc->priv;
1565+
struct q6v5 *qproc = rproc->priv;
15661566
int xfermemop_ret;
15671567
int ret;
15681568

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

16051605
static int q6v5_stop(struct rproc *rproc)
16061606
{
1607-
struct q6v5 *qproc = (struct q6v5 *)rproc->priv;
1607+
struct q6v5 *qproc = rproc->priv;
16081608
int ret;
16091609

16101610
ret = qcom_q6v5_request_stop(&qproc->q6v5, qproc->sysmon);
@@ -1662,7 +1662,7 @@ static int qcom_q6v5_register_dump_segments(struct rproc *rproc,
16621662

16631663
static unsigned long q6v5_panic(struct rproc *rproc)
16641664
{
1665-
struct q6v5 *qproc = (struct q6v5 *)rproc->priv;
1665+
struct q6v5 *qproc = rproc->priv;
16661666

16671667
return qcom_q6v5_panic(&qproc->q6v5);
16681668
}
@@ -1977,7 +1977,7 @@ static int q6v5_probe(struct platform_device *pdev)
19771977
rproc->auto_boot = false;
19781978
rproc_coredump_set_elf_info(rproc, ELFCLASS32, EM_NONE);
19791979

1980-
qproc = (struct q6v5 *)rproc->priv;
1980+
qproc = rproc->priv;
19811981
qproc->dev = &pdev->dev;
19821982
qproc->rproc = rproc;
19831983
qproc->hexagon_mdt_image = "modem.mdt";

‎drivers/remoteproc/qcom_q6v5_pas.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ static int adsp_shutdown_poll_decrypt(struct qcom_adsp *adsp)
186186

187187
static int adsp_unprepare(struct rproc *rproc)
188188
{
189-
struct qcom_adsp *adsp = (struct qcom_adsp *)rproc->priv;
189+
struct qcom_adsp *adsp = rproc->priv;
190190

191191
/*
192192
* adsp_load() did pass pas_metadata to the SCM driver for storing
@@ -203,7 +203,7 @@ static int adsp_unprepare(struct rproc *rproc)
203203

204204
static int adsp_load(struct rproc *rproc, const struct firmware *fw)
205205
{
206-
struct qcom_adsp *adsp = (struct qcom_adsp *)rproc->priv;
206+
struct qcom_adsp *adsp = rproc->priv;
207207
int ret;
208208

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

245245
static int adsp_start(struct rproc *rproc)
246246
{
247-
struct qcom_adsp *adsp = (struct qcom_adsp *)rproc->priv;
247+
struct qcom_adsp *adsp = rproc->priv;
248248
int ret;
249249

250250
ret = qcom_q6v5_prepare(&adsp->q6v5);
@@ -360,7 +360,7 @@ static void qcom_pas_handover(struct qcom_q6v5 *q6v5)
360360

361361
static int adsp_stop(struct rproc *rproc)
362362
{
363-
struct qcom_adsp *adsp = (struct qcom_adsp *)rproc->priv;
363+
struct qcom_adsp *adsp = rproc->priv;
364364
int handover;
365365
int ret;
366366

@@ -390,7 +390,7 @@ static int adsp_stop(struct rproc *rproc)
390390

391391
static void *adsp_da_to_va(struct rproc *rproc, u64 da, size_t len, bool *is_iomem)
392392
{
393-
struct qcom_adsp *adsp = (struct qcom_adsp *)rproc->priv;
393+
struct qcom_adsp *adsp = rproc->priv;
394394
int offset;
395395

396396
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
405405

406406
static unsigned long adsp_panic(struct rproc *rproc)
407407
{
408-
struct qcom_adsp *adsp = (struct qcom_adsp *)rproc->priv;
408+
struct qcom_adsp *adsp = rproc->priv;
409409

410410
return qcom_q6v5_panic(&adsp->q6v5);
411411
}
@@ -683,7 +683,7 @@ static int adsp_probe(struct platform_device *pdev)
683683
rproc->auto_boot = desc->auto_boot;
684684
rproc_coredump_set_elf_info(rproc, ELFCLASS32, EM_NONE);
685685

686-
adsp = (struct qcom_adsp *)rproc->priv;
686+
adsp = rproc->priv;
687687
adsp->dev = &pdev->dev;
688688
adsp->rproc = rproc;
689689
adsp->minidump_id = desc->minidump_id;

‎drivers/remoteproc/qcom_wcnss.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ static const struct wcnss_data pronto_v3_data = {
154154

155155
static int wcnss_load(struct rproc *rproc, const struct firmware *fw)
156156
{
157-
struct qcom_wcnss *wcnss = (struct qcom_wcnss *)rproc->priv;
157+
struct qcom_wcnss *wcnss = rproc->priv;
158158
int ret;
159159

160160
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)
227227

228228
static int wcnss_start(struct rproc *rproc)
229229
{
230-
struct qcom_wcnss *wcnss = (struct qcom_wcnss *)rproc->priv;
230+
struct qcom_wcnss *wcnss = rproc->priv;
231231
int ret, i;
232232

233233
mutex_lock(&wcnss->iris_lock);
@@ -293,7 +293,7 @@ static int wcnss_start(struct rproc *rproc)
293293

294294
static int wcnss_stop(struct rproc *rproc)
295295
{
296-
struct qcom_wcnss *wcnss = (struct qcom_wcnss *)rproc->priv;
296+
struct qcom_wcnss *wcnss = rproc->priv;
297297
int ret;
298298

299299
if (wcnss->state) {
@@ -320,7 +320,7 @@ static int wcnss_stop(struct rproc *rproc)
320320

321321
static void *wcnss_da_to_va(struct rproc *rproc, u64 da, size_t len, bool *is_iomem)
322322
{
323-
struct qcom_wcnss *wcnss = (struct qcom_wcnss *)rproc->priv;
323+
struct qcom_wcnss *wcnss = rproc->priv;
324324
int offset;
325325

326326
offset = da - wcnss->mem_reloc;
@@ -566,7 +566,7 @@ static int wcnss_probe(struct platform_device *pdev)
566566
}
567567
rproc_coredump_set_elf_info(rproc, ELFCLASS32, EM_NONE);
568568

569-
wcnss = (struct qcom_wcnss *)rproc->priv;
569+
wcnss = rproc->priv;
570570
wcnss->dev = &pdev->dev;
571571
wcnss->rproc = rproc;
572572
platform_set_drvdata(pdev, wcnss);

‎drivers/remoteproc/xlnx_r5_remoteproc.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ static int add_mem_regions_carveout(struct rproc *rproc)
441441
struct reserved_mem *rmem;
442442
int i = 0;
443443

444-
r5_core = (struct zynqmp_r5_core *)rproc->priv;
444+
r5_core = rproc->priv;
445445

446446
/* Register associated reserved memory regions */
447447
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)
572572
size_t bank_size;
573573
char *bank_name;
574574

575-
r5_core = (struct zynqmp_r5_core *)rproc->priv;
575+
r5_core = rproc->priv;
576576
dev = r5_core->dev;
577577
num_banks = r5_core->tcm_bank_count;
578578

@@ -641,7 +641,7 @@ static int add_tcm_carveout_lockstep_mode(struct rproc *rproc)
641641
u32 pm_domain_id;
642642
char *bank_name;
643643

644-
r5_core = (struct zynqmp_r5_core *)rproc->priv;
644+
r5_core = rproc->priv;
645645
dev = r5_core->dev;
646646

647647
/* Go through zynqmp banks for r5 node */
@@ -711,7 +711,7 @@ static int add_tcm_banks(struct rproc *rproc)
711711
struct zynqmp_r5_core *r5_core;
712712
struct device *dev;
713713

714-
r5_core = (struct zynqmp_r5_core *)rproc->priv;
714+
r5_core = rproc->priv;
715715
if (!r5_core)
716716
return -EINVAL;
717717

@@ -804,7 +804,7 @@ static int zynqmp_r5_rproc_unprepare(struct rproc *rproc)
804804
u32 pm_domain_id;
805805
int i;
806806

807-
r5_core = (struct zynqmp_r5_core *)rproc->priv;
807+
r5_core = rproc->priv;
808808

809809
for (i = 0; i < r5_core->tcm_bank_count; i++) {
810810
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)
859859
}
860860

861861
r5_rproc->auto_boot = false;
862-
r5_core = (struct zynqmp_r5_core *)r5_rproc->priv;
862+
r5_core = r5_rproc->priv;
863863
r5_core->dev = cdev;
864864
r5_core->np = dev_of_node(cdev);
865865
if (!r5_core->np) {
@@ -1143,12 +1143,12 @@ static int zynqmp_r5_cluster_init(struct zynqmp_r5_cluster *cluster)
11431143

11441144
static void zynqmp_r5_cluster_exit(void *data)
11451145
{
1146-
struct platform_device *pdev = (struct platform_device *)data;
1146+
struct platform_device *pdev = data;
11471147
struct zynqmp_r5_cluster *cluster;
11481148
struct zynqmp_r5_core *r5_core;
11491149
int i;
11501150

1151-
cluster = (struct zynqmp_r5_cluster *)platform_get_drvdata(pdev);
1151+
cluster = platform_get_drvdata(pdev);
11521152
if (!cluster)
11531153
return;
11541154

0 commit comments

Comments
 (0)