Subject: [PATCH] spi: spi-pl022: Adjust probe() to of_get_named_gpio() returning -EPROBE_DEFER

From: [email-masked] (Roland Stigge)
Date: Mon, 18 Jun 2012 13:13:18 +0200

On 06/18/2012 11:20 AM, Roland Stigge wrote:
> The patch to gpiolib-of.c providing -EPROBE_DEFER as a hint to defer
> of_get_named_gpio*() to a later probe() breaks spi-pl022.c.
> 
> This patch adjusts to this change, using -EPROBE_DEFER as indication to defer.
> 
> Signed-off-by: Roland Stigge <[email-masked]>
> 
> ---
> Applies to 3.5-rc3
> 
> Should this patch be joined with gpiolib-of's patch to of_get_named_gpio()? Or
> should they just be issued as a series?
> 
>  drivers/spi/spi-pl022.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> --- linux-2.6.orig/drivers/spi/spi-pl022.c
> +++ linux-2.6/drivers/spi/spi-pl022.c
> @@ -2075,7 +2075,7 @@ pl022_probe(struct amba_device *adev, co
>  	for (i = 0; i < num_cs; i++) {
>  		int cs_gpio = of_get_named_gpio(np, "cs-gpios", i);
>  
> -		if (cs_gpio == -ENODEV) {
> +		if (cs_gpio == -EPROBE_DEFER) {
>  			status = -EPROBE_DEFER;
>  			goto err_no_gpio;
>  		}

You can ignore this patch, Alexandre will merge this into his
yet-unapplied patch to support dt in spi-pl022.

Sorry for the noise,

Roland