linux-crypto.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 01/16] crypto: omap-aes: don't treat NULL clk as an error
       [not found] <1294749833-32019-1-git-send-email-jamie@jamieiles.com>
@ 2011-01-11 12:43 ` Jamie Iles
  2011-01-11 15:56   ` Aaro Koskinen
  2011-01-12 19:38   ` Tobias Karnat
  2011-01-11 12:43 ` [PATCH 02/16] crypto: omap-sham: " Jamie Iles
  1 sibling, 2 replies; 10+ messages in thread
From: Jamie Iles @ 2011-01-11 12:43 UTC (permalink / raw)
  To: linux-kernel; +Cc: Jamie Iles, Dmitry Kasatkin, linux-crypto

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: Dmitry Kasatkin <dmitry.kasatkin@nokia.com>
Cc: linux-crypto@vger.kernel.org
Signed-off-by: Jamie Iles <jamie@jamieiles.com>
---
 drivers/crypto/omap-aes.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/crypto/omap-aes.c b/drivers/crypto/omap-aes.c
index 799ca51..24d0f3f 100644
--- a/drivers/crypto/omap-aes.c
+++ b/drivers/crypto/omap-aes.c
@@ -17,6 +17,7 @@
 #include <linux/err.h>
 #include <linux/module.h>
 #include <linux/init.h>
+#include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/clk.h>
@@ -830,9 +831,9 @@ static int omap_aes_probe(struct platform_device *pdev)
 
 	/* Initializing the clock */
 	dd->iclk = clk_get(dev, "ick");
-	if (!dd->iclk) {
+	if (IS_ERR(dd->iclk)) {
 		dev_err(dev, "clock intialization failed.\n");
-		err = -ENODEV;
+		err = PTR_ERR(dd->iclk);
 		goto err_res;
 	}
 
-- 
1.7.3.4

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [PATCH 02/16] crypto: omap-sham: don't treat NULL clk as an error
       [not found] <1294749833-32019-1-git-send-email-jamie@jamieiles.com>
  2011-01-11 12:43 ` [PATCH 01/16] crypto: omap-aes: don't treat NULL clk as an error Jamie Iles
@ 2011-01-11 12:43 ` Jamie Iles
  2011-01-11 15:56   ` Aaro Koskinen
  1 sibling, 1 reply; 10+ messages in thread
From: Jamie Iles @ 2011-01-11 12:43 UTC (permalink / raw)
  To: linux-kernel; +Cc: Jamie Iles, Dmitry Kasatkin, linux-crypto

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: Dmitry Kasatkin <dmitry.kasatkin@nokia.com>
Cc: linux-crypto@vger.kernel.org
Signed-off-by: Jamie Iles <jamie@jamieiles.com>
---
 drivers/crypto/omap-sham.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/crypto/omap-sham.c b/drivers/crypto/omap-sham.c
index a081c7c..1acfcd2 100644
--- a/drivers/crypto/omap-sham.c
+++ b/drivers/crypto/omap-sham.c
@@ -1150,9 +1150,9 @@ static int __devinit omap_sham_probe(struct platform_device *pdev)
 
 	/* Initializing the clock */
 	dd->iclk = clk_get(dev, "ick");
-	if (!dd->iclk) {
+	if (IS_ERR(dd->iclk)) {
 		dev_err(dev, "clock intialization failed.\n");
-		err = -ENODEV;
+		err = PTR_ERR(dd->iclk);
 		goto clk_err;
 	}
 
-- 
1.7.3.4

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* Re: [PATCH 01/16] crypto: omap-aes: don't treat NULL clk as an error
  2011-01-11 12:43 ` [PATCH 01/16] crypto: omap-aes: don't treat NULL clk as an error Jamie Iles
@ 2011-01-11 15:56   ` Aaro Koskinen
  2011-01-12 14:32     ` Dmitry Kasatkin
  2011-01-12 19:38   ` Tobias Karnat
  1 sibling, 1 reply; 10+ messages in thread
From: Aaro Koskinen @ 2011-01-11 15:56 UTC (permalink / raw)
  To: Jamie Iles; +Cc: linux-kernel, Dmitry Kasatkin, linux-crypto

Hi,

On Tue, 11 Jan 2011, 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: Dmitry Kasatkin <dmitry.kasatkin@nokia.com>
> Cc: linux-crypto@vger.kernel.org
> Signed-off-by: Jamie Iles <jamie@jamieiles.com>

Reviewed-by: Aaro Koskinen <aaro.koskinen@nokia.com>

> ---
> drivers/crypto/omap-aes.c |    5 +++--
> 1 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/crypto/omap-aes.c b/drivers/crypto/omap-aes.c
> index 799ca51..24d0f3f 100644
> --- a/drivers/crypto/omap-aes.c
> +++ b/drivers/crypto/omap-aes.c
> @@ -17,6 +17,7 @@
> #include <linux/err.h>
> #include <linux/module.h>
> #include <linux/init.h>
> +#include <linux/err.h>
> #include <linux/errno.h>
> #include <linux/kernel.h>
> #include <linux/clk.h>
> @@ -830,9 +831,9 @@ static int omap_aes_probe(struct platform_device *pdev)
>
> 	/* Initializing the clock */
> 	dd->iclk = clk_get(dev, "ick");
> -	if (!dd->iclk) {
> +	if (IS_ERR(dd->iclk)) {
> 		dev_err(dev, "clock intialization failed.\n");
> -		err = -ENODEV;
> +		err = PTR_ERR(dd->iclk);
> 		goto err_res;
> 	}
>
> -- 
> 1.7.3.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
>

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH 02/16] crypto: omap-sham: don't treat NULL clk as an error
  2011-01-11 12:43 ` [PATCH 02/16] crypto: omap-sham: " Jamie Iles
@ 2011-01-11 15:56   ` Aaro Koskinen
  2011-01-12 14:32     ` Dmitry Kasatkin
  0 siblings, 1 reply; 10+ messages in thread
From: Aaro Koskinen @ 2011-01-11 15:56 UTC (permalink / raw)
  To: Jamie Iles; +Cc: linux-kernel, Dmitry Kasatkin, linux-crypto

Hi,

On Tue, 11 Jan 2011, 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: Dmitry Kasatkin <dmitry.kasatkin@nokia.com>
> Cc: linux-crypto@vger.kernel.org
> Signed-off-by: Jamie Iles <jamie@jamieiles.com>

Reviewed-by: Aaro Koskinen <aaro.koskinen@nokia.com>

> ---
> drivers/crypto/omap-sham.c |    4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/crypto/omap-sham.c b/drivers/crypto/omap-sham.c
> index a081c7c..1acfcd2 100644
> --- a/drivers/crypto/omap-sham.c
> +++ b/drivers/crypto/omap-sham.c
> @@ -1150,9 +1150,9 @@ static int __devinit omap_sham_probe(struct platform_device *pdev)
>
> 	/* Initializing the clock */
> 	dd->iclk = clk_get(dev, "ick");
> -	if (!dd->iclk) {
> +	if (IS_ERR(dd->iclk)) {
> 		dev_err(dev, "clock intialization failed.\n");
> -		err = -ENODEV;
> +		err = PTR_ERR(dd->iclk);
> 		goto clk_err;
> 	}
>
> -- 
> 1.7.3.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
>

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH 01/16] crypto: omap-aes: don't treat NULL clk as an error
  2011-01-11 15:56   ` Aaro Koskinen
@ 2011-01-12 14:32     ` Dmitry Kasatkin
  0 siblings, 0 replies; 10+ messages in thread
From: Dmitry Kasatkin @ 2011-01-12 14:32 UTC (permalink / raw)
  To: Aaro Koskinen; +Cc: Jamie Iles, linux-kernel, linux-crypto

Hi,

Indeed, thanks

On 11/01/11 17:56, Aaro Koskinen wrote:
> Hi,
>
> On Tue, 11 Jan 2011, 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: Dmitry Kasatkin <dmitry.kasatkin@nokia.com>
>> Cc: linux-crypto@vger.kernel.org
>> Signed-off-by: Jamie Iles <jamie@jamieiles.com>
>
> Reviewed-by: Aaro Koskinen <aaro.koskinen@nokia.com>
Reviewed-by: Dmitry Kasatkin <dmitry.kasatkin@nokia.com>
>
>> ---
>> drivers/crypto/omap-aes.c |    5 +++--
>> 1 files changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/crypto/omap-aes.c b/drivers/crypto/omap-aes.c
>> index 799ca51..24d0f3f 100644
>> --- a/drivers/crypto/omap-aes.c
>> +++ b/drivers/crypto/omap-aes.c
>> @@ -17,6 +17,7 @@
>> #include <linux/err.h>
>> #include <linux/module.h>
>> #include <linux/init.h>
>> +#include <linux/err.h>
>> #include <linux/errno.h>
>> #include <linux/kernel.h>
>> #include <linux/clk.h>
>> @@ -830,9 +831,9 @@ static int omap_aes_probe(struct platform_device
>> *pdev)
>>
>>     /* Initializing the clock */
>>     dd->iclk = clk_get(dev, "ick");
>> -    if (!dd->iclk) {
>> +    if (IS_ERR(dd->iclk)) {
>>         dev_err(dev, "clock intialization failed.\n");
>> -        err = -ENODEV;
>> +        err = PTR_ERR(dd->iclk);
>>         goto err_res;
>>     }
>>
>> -- 
>> 1.7.3.4
>>
>> -- 
>> To unsubscribe from this list: send the line "unsubscribe
>> linux-kernel" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>> Please read the FAQ at  http://www.tux.org/lkml/
>>

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH 02/16] crypto: omap-sham: don't treat NULL clk as an error
  2011-01-11 15:56   ` Aaro Koskinen
@ 2011-01-12 14:32     ` Dmitry Kasatkin
  2011-01-29  5:01       ` Herbert Xu
  0 siblings, 1 reply; 10+ messages in thread
From: Dmitry Kasatkin @ 2011-01-12 14:32 UTC (permalink / raw)
  To: Aaro Koskinen; +Cc: Jamie Iles, linux-kernel, linux-crypto

Thanks.


On 11/01/11 17:56, Aaro Koskinen wrote:
> Hi,
>
> On Tue, 11 Jan 2011, 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: Dmitry Kasatkin <dmitry.kasatkin@nokia.com>
>> Cc: linux-crypto@vger.kernel.org
>> Signed-off-by: Jamie Iles <jamie@jamieiles.com>
>
> Reviewed-by: Aaro Koskinen <aaro.koskinen@nokia.com>
>
Reviewed-by: Dmitry Kasatkin <dmitry.kasatkin@nokia.com>
>> ---
>> drivers/crypto/omap-sham.c |    4 ++--
>> 1 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/crypto/omap-sham.c b/drivers/crypto/omap-sham.c
>> index a081c7c..1acfcd2 100644
>> --- a/drivers/crypto/omap-sham.c
>> +++ b/drivers/crypto/omap-sham.c
>> @@ -1150,9 +1150,9 @@ static int __devinit omap_sham_probe(struct
>> platform_device *pdev)
>>
>>     /* Initializing the clock */
>>     dd->iclk = clk_get(dev, "ick");
>> -    if (!dd->iclk) {
>> +    if (IS_ERR(dd->iclk)) {
>>         dev_err(dev, "clock intialization failed.\n");
>> -        err = -ENODEV;
>> +        err = PTR_ERR(dd->iclk);
>>         goto clk_err;
>>     }
>>
>> -- 
>> 1.7.3.4
>>
>> -- 
>> To unsubscribe from this list: send the line "unsubscribe
>> linux-kernel" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>> Please read the FAQ at  http://www.tux.org/lkml/
>>

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH 01/16] crypto: omap-aes: don't treat NULL clk as an error
  2011-01-11 12:43 ` [PATCH 01/16] crypto: omap-aes: don't treat NULL clk as an error Jamie Iles
  2011-01-11 15:56   ` Aaro Koskinen
@ 2011-01-12 19:38   ` Tobias Karnat
  2011-01-12 21:51     ` Jamie Iles
  1 sibling, 1 reply; 10+ messages in thread
From: Tobias Karnat @ 2011-01-12 19:38 UTC (permalink / raw)
  To: Jamie Iles; +Cc: Dmitry Kasatkin, Aaro Koskinen, linux-kernel, linux-crypto

Hi,

You have included linux/err.h a second time.

-Tobias

Am Dienstag, den 11.01.2011, 12:43 +0000 schrieb 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: Dmitry Kasatkin <dmitry.kasatkin@nokia.com>
> Cc: linux-crypto@vger.kernel.org
> Signed-off-by: Jamie Iles <jamie@jamieiles.com>
> ---
>  drivers/crypto/omap-aes.c |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/crypto/omap-aes.c b/drivers/crypto/omap-aes.c
> index 799ca51..24d0f3f 100644
> --- a/drivers/crypto/omap-aes.c
> +++ b/drivers/crypto/omap-aes.c
> @@ -17,6 +17,7 @@
>  #include <linux/err.h>
>  #include <linux/module.h>
>  #include <linux/init.h>
> +#include <linux/err.h>
>  #include <linux/errno.h>
>  #include <linux/kernel.h>
>  #include <linux/clk.h>
> @@ -830,9 +831,9 @@ static int omap_aes_probe(struct platform_device *pdev)
>  
>  	/* Initializing the clock */
>  	dd->iclk = clk_get(dev, "ick");
> -	if (!dd->iclk) {
> +	if (IS_ERR(dd->iclk)) {
>  		dev_err(dev, "clock intialization failed.\n");
> -		err = -ENODEV;
> +		err = PTR_ERR(dd->iclk);
>  		goto err_res;
>  	}
>  

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH 01/16] crypto: omap-aes: don't treat NULL clk as an error
  2011-01-12 19:38   ` Tobias Karnat
@ 2011-01-12 21:51     ` Jamie Iles
  2011-01-13  2:25       ` Tobias Karnat
  0 siblings, 1 reply; 10+ messages in thread
From: Jamie Iles @ 2011-01-12 21:51 UTC (permalink / raw)
  To: Tobias Karnat
  Cc: Jamie Iles, Dmitry Kasatkin, Aaro Koskinen, linux-kernel,
	linux-crypto

On Wed, Jan 12, 2011 at 08:38:55PM +0100, Tobias Karnat wrote:
> You have included linux/err.h a second time.

Doh!  Good spot, thanks.  I've checked the rest of the series and this 
was the only patch with the duplicated include.

Jamie

8<-------------------------------------------------------------------

>From 75cef47f02ea19b94203f287eaaddc644c51ce30 Mon Sep 17 00:00:00 2001
From: Jamie Iles <jamie@jamieiles.com>
Date: Tue, 11 Jan 2011 09:48:26 +0000
Subject: [PATCH] crypto: omap-aes: don't treat NULL clk as an error

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: Dmitry Kasatkin <dmitry.kasatkin@nokia.com>
Cc: linux-crypto@vger.kernel.org
Signed-off-by: Jamie Iles <jamie@jamieiles.com>
---
 drivers/crypto/omap-aes.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/crypto/omap-aes.c b/drivers/crypto/omap-aes.c
index 799ca51..10a9180 100644
--- a/drivers/crypto/omap-aes.c
+++ b/drivers/crypto/omap-aes.c
@@ -830,9 +830,9 @@ static int omap_aes_probe(struct platform_device *pdev)
 
 	/* Initializing the clock */
 	dd->iclk = clk_get(dev, "ick");
-	if (!dd->iclk) {
+	if (IS_ERR(dd->iclk)) {
 		dev_err(dev, "clock intialization failed.\n");
-		err = -ENODEV;
+		err = PTR_ERR(dd->iclk);
 		goto err_res;
 	}
 
-- 
1.7.3.4

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* Re: [PATCH 01/16] crypto: omap-aes: don't treat NULL clk as an error
  2011-01-12 21:51     ` Jamie Iles
@ 2011-01-13  2:25       ` Tobias Karnat
  0 siblings, 0 replies; 10+ messages in thread
From: Tobias Karnat @ 2011-01-13  2:25 UTC (permalink / raw)
  To: Jamie Iles; +Cc: Dmitry Kasatkin, Aaro Koskinen, linux-kernel, linux-crypto

Am Mittwoch, den 12.01.2011, 21:51 +0000 schrieb Jamie Iles:
> Doh!  Good spot, thanks.  I've checked the rest of the series and this 
> was the only patch with the duplicated include.

It can happen, thanks.

-Tobias

> 8<-------------------------------------------------------------------
> 
> >From 75cef47f02ea19b94203f287eaaddc644c51ce30 Mon Sep 17 00:00:00 2001
> From: Jamie Iles <jamie@jamieiles.com>
> Date: Tue, 11 Jan 2011 09:48:26 +0000
> Subject: [PATCH] crypto: omap-aes: don't treat NULL clk as an error
> 
> 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: Dmitry Kasatkin <dmitry.kasatkin@nokia.com>
> Cc: linux-crypto@vger.kernel.org
> Signed-off-by: Jamie Iles <jamie@jamieiles.com>
Reviewed-and-tested-by: Tobias Karnat <tobias.karnat@googlemail.com>
> ---
>  drivers/crypto/omap-aes.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/crypto/omap-aes.c b/drivers/crypto/omap-aes.c
> index 799ca51..10a9180 100644
> --- a/drivers/crypto/omap-aes.c
> +++ b/drivers/crypto/omap-aes.c
> @@ -830,9 +830,9 @@ static int omap_aes_probe(struct platform_device *pdev)
>  
>  	/* Initializing the clock */
>  	dd->iclk = clk_get(dev, "ick");
> -	if (!dd->iclk) {
> +	if (IS_ERR(dd->iclk)) {
>  		dev_err(dev, "clock intialization failed.\n");
> -		err = -ENODEV;
> +		err = PTR_ERR(dd->iclk);
>  		goto err_res;
>  	}
>  

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH 02/16] crypto: omap-sham: don't treat NULL clk as an error
  2011-01-12 14:32     ` Dmitry Kasatkin
@ 2011-01-29  5:01       ` Herbert Xu
  0 siblings, 0 replies; 10+ messages in thread
From: Herbert Xu @ 2011-01-29  5:01 UTC (permalink / raw)
  To: Dmitry Kasatkin; +Cc: Aaro Koskinen, Jamie Iles, linux-kernel, linux-crypto

On Wed, Jan 12, 2011 at 02:32:50PM +0000, Dmitry Kasatkin wrote:
>
> >> Cc: Dmitry Kasatkin <dmitry.kasatkin@nokia.com>
> >> Cc: linux-crypto@vger.kernel.org
> >> Signed-off-by: Jamie Iles <jamie@jamieiles.com>
> >
> > Reviewed-by: Aaro Koskinen <aaro.koskinen@nokia.com>
> >
> Reviewed-by: Dmitry Kasatkin <dmitry.kasatkin@nokia.com>

Both pathces applied.

Thanks!
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2011-01-29  5:02 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <1294749833-32019-1-git-send-email-jamie@jamieiles.com>
2011-01-11 12:43 ` [PATCH 01/16] crypto: omap-aes: don't treat NULL clk as an error Jamie Iles
2011-01-11 15:56   ` Aaro Koskinen
2011-01-12 14:32     ` Dmitry Kasatkin
2011-01-12 19:38   ` Tobias Karnat
2011-01-12 21:51     ` Jamie Iles
2011-01-13  2:25       ` Tobias Karnat
2011-01-11 12:43 ` [PATCH 02/16] crypto: omap-sham: " Jamie Iles
2011-01-11 15:56   ` Aaro Koskinen
2011-01-12 14:32     ` Dmitry Kasatkin
2011-01-29  5:01       ` Herbert Xu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).