Re: [PATCH v2] spi: spi-mpc512x-psc: don't use obsolet cell-index property

[Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>]

On Fri, 11 Jan 2013 01:05:48 +0100, Anatolij Gustschin <agust-ynQEQJNshbs@public.gmane.org> wrote:
> Remove deprecated cell-index property and use spi alias to
> obtain the SPI PSC number used for SPI bus id.
> 
> Signed-off-by: Anatolij Gustschin <agust-ynQEQJNshbs@public.gmane.org>
> ---
> v2:
>  - use of_alias_get_id() to get spi bus number
> 

Applied, thanks.

g.

>  drivers/spi/spi-mpc512x-psc.c |   16 +++++-----------
>  1 files changed, 5 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/spi/spi-mpc512x-psc.c b/drivers/spi/spi-mpc512x-psc.c
> index cb3a310..88e5441 100644
> --- a/drivers/spi/spi-mpc512x-psc.c
> +++ b/drivers/spi/spi-mpc512x-psc.c
> @@ -522,17 +522,11 @@ static int mpc512x_psc_spi_of_probe(struct platform_device *op)
>  	regaddr64 = of_translate_address(op->dev.of_node, regaddr_p);
>  
>  	/* get PSC id (0..11, used by port_config) */
> -	if (op->dev.platform_data == NULL) {
> -		const u32 *psc_nump;
> -
> -		psc_nump = of_get_property(op->dev.of_node, "cell-index", NULL);
> -		if (!psc_nump || *psc_nump > 11) {
> -			dev_err(&op->dev, "mpc512x_psc_spi: Device node %s "
> -				"has invalid cell-index property\n",
> -				op->dev.of_node->full_name);
> -			return -EINVAL;
> -		}
> -		id = *psc_nump;
> +	id = of_alias_get_id(op->dev.of_node, "spi");
> +	if (id < 0) {
> +		dev_err(&op->dev, "no alias id for %s\n",
> +			op->dev.of_node->full_name);
> +		return id;
>  	}
>  
>  	return mpc512x_psc_spi_do_probe(&op->dev, (u32) regaddr64, (u32) size64,
> -- 
> 1.7.5.4
> 

-- 
Grant Likely, B.Sc, P.Eng.
Secret Lab Technologies, Ltd.

------------------------------------------------------------------------------
Free Next-Gen Firewall Hardware Offer
Buy your Sophos next-gen firewall before the end March 2013 
and get the hardware for free! Learn more.
http://p.sf.net/sfu/sophos-d2d-feb