[PATCH 15/16] spi: dw_spi: don't treat NULL clk as an error

[PATCH 15/16] spi: dw_spi: don't treat NULL clk as an error

[Jamie Iles]

clk_get() returns a struct clk cookie to the driver and some platforms
may return NULL if they only support a single clock.  clk_get() has only
failed if it returns a ERR_PTR() encoded pointer.

Cc: spi-devel-general@lists.sourceforge.net
Signed-off-by: Jamie Iles <jamie@jamieiles.com>
---
 drivers/spi/dw_spi_mmio.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/spi/dw_spi_mmio.c b/drivers/spi/dw_spi_mmio.c
index db35bd9..2fa012c 100644
--- a/drivers/spi/dw_spi_mmio.c
+++ b/drivers/spi/dw_spi_mmio.c
@@ -9,6 +9,7 @@
  */
 
 #include <linux/clk.h>
+#include <linux/err.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
@@ -68,8 +69,8 @@ static int __devinit dw_spi_mmio_probe(struct platform_device *pdev)
 	}
 
 	dwsmmio->clk = clk_get(&pdev->dev, NULL);
-	if (!dwsmmio->clk) {
-		ret = -ENODEV;
+	if (IS_ERR(dwsmmio->clk)) {
+		ret = PTR_ERR(dwsmmio->clk);
 		goto err_irq;
 	}
 	clk_enable(dwsmmio->clk);
-- 
1.7.3.4

Re: [PATCH 15/16] spi: dw_spi: don't treat NULL clk as an error

[Grant Likely]

On Tue, Jan 11, 2011 at 12:43:52PM +0000, Jamie Iles wrote:
> clk_get() returns a struct clk cookie to the driver and some platforms
> may return NULL if they only support a single clock.  clk_get() has only
> failed if it returns a ERR_PTR() encoded pointer.
> 
> Cc: spi-devel-general@lists.sourceforge.net
> Signed-off-by: Jamie Iles <jamie@jamieiles.com>

Applied, thanks.

g.

> ---
>  drivers/spi/dw_spi_mmio.c |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/spi/dw_spi_mmio.c b/drivers/spi/dw_spi_mmio.c
> index db35bd9..2fa012c 100644
> --- a/drivers/spi/dw_spi_mmio.c
> +++ b/drivers/spi/dw_spi_mmio.c
> @@ -9,6 +9,7 @@
>   */
>  
>  #include <linux/clk.h>
> +#include <linux/err.h>
>  #include <linux/interrupt.h>
>  #include <linux/platform_device.h>
>  #include <linux/slab.h>
> @@ -68,8 +69,8 @@ static int __devinit dw_spi_mmio_probe(struct platform_device *pdev)
>  	}
>  
>  	dwsmmio->clk = clk_get(&pdev->dev, NULL);
> -	if (!dwsmmio->clk) {
> -		ret = -ENODEV;
> +	if (IS_ERR(dwsmmio->clk)) {
> +		ret = PTR_ERR(dwsmmio->clk);
>  		goto err_irq;
>  	}
>  	clk_enable(dwsmmio->clk);
> -- 
> 1.7.3.4
> 
> 
> ------------------------------------------------------------------------------
> Gaining the trust of online customers is vital for the success of any company
> that requires sensitive data to be transmitted over the Web.   Learn how to 
> best implement a security strategy that keeps consumers' information secure 
> and instills the confidence they need to proceed with transactions.
> http://p.sf.net/sfu/oracle-sfdevnl 
> _______________________________________________
> spi-devel-general mailing list
> spi-devel-general@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/spi-devel-general