Skip to content

Commit

Permalink
can: sja1000: Change the return type as void for SoC specific init
Browse files Browse the repository at this point in the history
Change the return type as void for SoC specific init function as it
always return 0.

Link: https://lore.kernel.org/all/20220710115248.190280-6-biju.das.jz@bp.renesas.com
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  • Loading branch information
Biju Das authored and Marc Kleine-Budde committed Jul 19, 2022
1 parent 63ab1b6 commit 6d5fe10
Showing 1 changed file with 4 additions and 9 deletions.
13 changes: 4 additions & 9 deletions drivers/net/can/sja1000/sja1000_platform.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ MODULE_LICENSE("GPL v2");

struct sja1000_of_data {
size_t priv_sz;
int (*init)(struct sja1000_priv *priv, struct device_node *of);
void (*init)(struct sja1000_priv *priv, struct device_node *of);
};

struct technologic_priv {
Expand Down Expand Up @@ -94,15 +94,13 @@ static void sp_technologic_write_reg16(const struct sja1000_priv *priv,
spin_unlock_irqrestore(&tp->io_lock, flags);
}

static int sp_technologic_init(struct sja1000_priv *priv, struct device_node *of)
static void sp_technologic_init(struct sja1000_priv *priv, struct device_node *of)
{
struct technologic_priv *tp = priv->priv;

priv->read_reg = sp_technologic_read_reg16;
priv->write_reg = sp_technologic_write_reg16;
spin_lock_init(&tp->io_lock);

return 0;
}

static void sp_populate(struct sja1000_priv *priv,
Expand Down Expand Up @@ -266,11 +264,8 @@ static int sp_probe(struct platform_device *pdev)
if (of) {
sp_populate_of(priv, of);

if (of_data && of_data->init) {
err = of_data->init(priv, of);
if (err)
goto exit_free;
}
if (of_data && of_data->init)
of_data->init(priv, of);
} else {
sp_populate(priv, pdata, res_mem->flags);
}
Expand Down

0 comments on commit 6d5fe10

Please sign in to comment.