[PATCH 03/16] input: tnetv107x-keypad: don't treat NULL clk as an error

[PATCH 03/16] input: tnetv107x-keypad: 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: Cyril Chemparathy <cyril@ti.com>
Cc: linux-input@vger.kernel.org
Signed-off-by: Jamie Iles <jamie@jamieiles.com>
---
 drivers/input/keyboard/tnetv107x-keypad.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/input/keyboard/tnetv107x-keypad.c b/drivers/input/keyboard/tnetv107x-keypad.c
index b4a81eb..c8f097a 100644
--- a/drivers/input/keyboard/tnetv107x-keypad.c
+++ b/drivers/input/keyboard/tnetv107x-keypad.c
@@ -14,6 +14,7 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/input.h>
 #include <linux/platform_device.h>
@@ -219,9 +220,9 @@ static int __devinit keypad_probe(struct platform_device *pdev)
 	}
 
 	kp->clk = clk_get(dev, NULL);
-	if (!kp->clk) {
+	if (IS_ERR(kp->clk)) {
 		dev_err(dev, "cannot claim device clock\n");
-		error = -EINVAL;
+		error = PTR_ERR(kp->clk);
 		goto error_clk;
 	}
 
-- 
1.7.3.4

[PATCH 04/16] input: tnetv107x-touchscreen: 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: Cyril Chemparathy <cyril@ti.com>
Cc: linux-input@vger.kernel.org
Signed-off-by: Jamie Iles <jamie@jamieiles.com>
---
 drivers/input/touchscreen/tnetv107x-ts.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/input/touchscreen/tnetv107x-ts.c b/drivers/input/touchscreen/tnetv107x-ts.c
index cf1dba2..22a3411 100644
--- a/drivers/input/touchscreen/tnetv107x-ts.c
+++ b/drivers/input/touchscreen/tnetv107x-ts.c
@@ -14,6 +14,7 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/input.h>
 #include <linux/platform_device.h>
@@ -289,9 +290,9 @@ static int __devinit tsc_probe(struct platform_device *pdev)
 	}
 
 	ts->clk = clk_get(dev, NULL);
-	if (!ts->clk) {
+	if (IS_ERR(ts->clk)) {
 		dev_err(dev, "cannot claim device clock\n");
-		error = -EINVAL;
+		error = PTR_ERR(ts->clk);
 		goto error_clk;
 	}
 
-- 
1.7.3.4

Re: [PATCH 04/16] input: tnetv107x-touchscreen: don't treat NULL clk as an error

[Dmitry Torokhov]

On Tue, Jan 11, 2011 at 12:43:41PM +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: Cyril Chemparathy <cyril@ti.com>
> Cc: linux-input@vger.kernel.org
> Signed-off-by: Jamie Iles <jamie@jamieiles.com>

Applied both, thank you Jamie.

-- 
Dmitry

Re: [PATCH 04/16] input: tnetv107x-touchscreen: don't treat NULL clk as an error

[Dmitry Torokhov]

On Tue, Jan 11, 2011 at 09:56:41PM -0800, Dmitry Torokhov wrote:
> On Tue, Jan 11, 2011 at 12:43:41PM +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: Cyril Chemparathy <cyril@ti.com>
> > Cc: linux-input@vger.kernel.org
> > Signed-off-by: Jamie Iles <jamie@jamieiles.com>
> 
> Applied both, thank you Jamie.
> 

Actually, if we pass clk that is NULL along we going to get oops on many
arches, so I am going to change it to IS_ERR_OR_NULL.

Thanks.

-- 
Dmitry

Re: [PATCH 04/16] input: tnetv107x-touchscreen: don't treat NULL clk as an error

[Dmitry Torokhov]

On Mon, Jan 17, 2011 at 08:25:35PM -0800, Dmitry Torokhov wrote:
> On Tue, Jan 11, 2011 at 09:56:41PM -0800, Dmitry Torokhov wrote:
> > On Tue, Jan 11, 2011 at 12:43:41PM +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: Cyril Chemparathy <cyril@ti.com>
> > > Cc: linux-input@vger.kernel.org
> > > Signed-off-by: Jamie Iles <jamie@jamieiles.com>
> > 
> > Applied both, thank you Jamie.
> > 
> 
> Actually, if we pass clk that is NULL along we going to get oops on many
> arches, so I am going to change it to IS_ERR_OR_NULL.
> 

Oh, wait... OK, I got confused by the changelog. IS_ERR is proper,
sorry.

-- 
Dmitry