Re: [PATCH v3 1/3] can: sja1000: of: add per-compatible init hook

[Marc Kleine-Budde]

On 01/12/2016 11:31 PM, Damien Riegel wrote:
> This commit adds the capability to allocate and init private data
> embedded in the sja1000_priv structure on a per-compatible basis. The
> device node is passed as a parameter of the init callback to allow
> parsing of custom device tree properties.
> 
> Signed-off-by: Damien Riegel <damien.riegel@xxxxxxxxxxxxxxxxxxxx>
> ---
>  drivers/net/can/sja1000/sja1000_platform.c | 28 +++++++++++++++++++++-------
>  1 file changed, 21 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/net/can/sja1000/sja1000_platform.c b/drivers/net/can/sja1000/sja1000_platform.c
> index 0552ed4..ea4e18b 100644
> --- a/drivers/net/can/sja1000/sja1000_platform.c
> +++ b/drivers/net/can/sja1000/sja1000_platform.c
> @@ -40,6 +40,11 @@ MODULE_DESCRIPTION("Socket-CAN driver for SJA1000 on the platform bus");
>  MODULE_ALIAS("platform:" DRV_NAME);
>  MODULE_LICENSE("GPL v2");
>  
> +struct sja1000_of_data {
> +	size_t  priv_sz;
> +	int     (*init)(struct sja1000_priv *priv, struct device_node *of);
> +};
> +
>  static u8 sp_read_reg8(const struct sja1000_priv *priv, int reg)
>  {
>  	return ioread8(priv->reg_base + reg);
> @@ -154,6 +159,12 @@ static void sp_populate_of(struct sja1000_priv *priv, struct device_node *of)
>  		priv->cdr |= CDR_CBP; /* default */
>  }
>  
> +static const struct of_device_id sp_of_table[] = {
> +	{.compatible = "nxp,sja1000"},
> +	{},
> +};
> +MODULE_DEVICE_TABLE(of, sp_of_table);
> +
>  static int sp_probe(struct platform_device *pdev)
>  {
>  	int err, irq = 0;
> @@ -163,6 +174,9 @@ static int sp_probe(struct platform_device *pdev)
>  	struct resource *res_mem, *res_irq = NULL;
>  	struct sja1000_platform_data *pdata;
>  	struct device_node *of = pdev->dev.of_node;
> +	const struct of_device_id *id = of_match_node(sp_of_table, of);

Have you tested this with of == NULL? I think it should work as
__of_find_property returns NULL if np is NULL.

> +	const struct sja1000_of_data *of_data = id ? id->data : NULL; 
> +	size_t priv_sz = of_data ? of_data->priv_sz : 0; 

I've move the code a bit around to get rid of the ? operator. I'll send
a new series.

Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |

Attachment: signature.asc
Description: OpenPGP digital signature