Skip to content

Commit

Permalink
remoteproc: remove unnecessary (void*) conversions
Browse files Browse the repository at this point in the history 
Pointer variables of void * type do not require type cast.

Signed-off-by: Yu Zhe <yuzhe@nfschina.com>
  • Loading branch information
@yuzhenfschina @intel-lab-lkp
yuzhenfschina authored and intel-lab-lkp committed Mar 20, 2023
1 parent e8d018d commit 3833530
Show file tree
Hide file tree
Showing 12 changed files with 46 additions and 46 deletions.
12 changes: 6 additions & 6 deletions drivers/remoteproc/da8xx_remoteproc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -360,7 +360,7 @@ static int da8xx_rproc_probe(struct platform_device *pdev)
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;

/*
Expand Down
12 changes: 6 additions & 6 deletions drivers/remoteproc/mtk_scp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
10 changes: 5 additions & 5 deletions drivers/remoteproc/qcom_q6v5_adsp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ static int qcom_adsp_shutdown(struct qcom_adsp *adsp)

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,
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions drivers/remoteproc/qcom_q6v5_mss.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -1604,7 +1604,7 @@ static int q6v5_start(struct rproc *rproc)

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);
Expand Down Expand Up @@ -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);
}
Expand Down Expand Up @@ -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";
Expand Down
14 changes: 7 additions & 7 deletions drivers/remoteproc/qcom_q6v5_pas.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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() */
Expand Down Expand Up @@ -244,7 +244,7 @@ static int adsp_load(struct rproc *rproc, const struct firmware *fw)

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);
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;
Expand All @@ -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);
}
Expand Down Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions drivers/remoteproc/qcom_wcnss.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -293,7 +293,7 @@ static int wcnss_start(struct rproc *rproc)

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) {
Expand All @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion drivers/remoteproc/remoteproc_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2584,7 +2584,7 @@ EXPORT_SYMBOL(rproc_del);

static void devm_rproc_free(struct device *dev, void *res)
{
rproc_free(*(struct rproc **)res);
rproc_free(res);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion drivers/remoteproc/st_remoteproc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ static int st_rproc_probe(struct platform_device *pdev)

rproc->has_iommu = false;
ddata = rproc->priv;
ddata->config = (struct st_rproc_config *)match->data;
ddata->config = match->data;

platform_set_drvdata(pdev, rproc);

Expand Down
2 changes: 1 addition & 1 deletion drivers/remoteproc/stm32_rproc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,7 @@ stm32_rproc_get_loaded_rsc_table(struct rproc *rproc, size_t *table_sz)
* entire area by overwriting it with the initial values stored in rproc->clean_table.
*/
*table_sz = RSC_TBL_SIZE;
return (struct resource_table *)ddata->rsc_va;
return ddata->rsc_va;
}

static const struct rproc_ops st_rproc_ops = {
Expand Down
2 changes: 1 addition & 1 deletion drivers/remoteproc/ti_k3_dsp_remoteproc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ static struct resource_table *k3_dsp_get_loaded_rsc_table(struct rproc *rproc,
* the hard-coded value suffices to support the IPC-only mode.
*/
*rsc_table_sz = 256;
return (struct resource_table *)kproc->rmem[0].cpu_addr;
return kproc->rmem[0].cpu_addr;
}

/*
Expand Down
2 changes: 1 addition & 1 deletion drivers/remoteproc/ti_k3_r5_remoteproc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -708,7 +708,7 @@ static struct resource_table *k3_r5_get_loaded_rsc_table(struct rproc *rproc,
* the hard-coded value suffices to support the IPC-only mode.
*/
*rsc_table_sz = 256;
return (struct resource_table *)kproc->rmem[0].cpu_addr;
return kproc->rmem[0].cpu_addr;
}

/*
Expand Down
16 changes: 8 additions & 8 deletions drivers/remoteproc/xlnx_r5_remoteproc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ static int add_mem_regions_carveout(struct rproc *rproc)
struct reserved_mem *rmem;
int i, num_mem_regions;

r5_core = (struct zynqmp_r5_core *)rproc->priv;
r5_core = rproc->priv;
num_mem_regions = r5_core->rmem_count;

for (i = 0; i < num_mem_regions; i++) {
Expand Down Expand Up @@ -363,7 +363,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;

Expand Down Expand Up @@ -432,7 +432,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 */
Expand Down Expand Up @@ -502,7 +502,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;

Expand Down Expand Up @@ -595,7 +595,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;
Expand Down Expand Up @@ -649,7 +649,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) {
Expand Down Expand Up @@ -978,12 +978,12 @@ static int zynqmp_r5_cluster_init(struct zynqmp_r5_cluster *cluster)

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;

Expand Down

0 comments on commit 3833530

Please sign in to comment.