Re: [PATCH] mtd: nand: gpmi: fixup return type of wait_for_completion_timeout

2015-03-30 Thread Brian Norris
On Sun, Feb 08, 2015 at 11:37:33AM -0500, Nicholas Mc Guire wrote:
> return type of wait_for_completion_timeout is unsigned long not int. The
> return variable is renamed to reflect its use and the type adjusted to
> unsigned long.
> 
> Signed-off-by: Nicholas Mc Guire 

Pushed to l2-mtd.git.

Brian
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: [PATCH] mtd: nand: gpmi: fixup return type of wait_for_completion_timeout

2015-03-30 Thread Brian Norris
On Sun, Feb 08, 2015 at 11:37:33AM -0500, Nicholas Mc Guire wrote:
 return type of wait_for_completion_timeout is unsigned long not int. The
 return variable is renamed to reflect its use and the type adjusted to
 unsigned long.
 
 Signed-off-by: Nicholas Mc Guire hof...@osadl.org

Pushed to l2-mtd.git.

Brian
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: [PATCH] mtd: nand: gpmi: fixup return type of wait_for_completion_timeout

2015-02-09 Thread Huang Shijie
On Sun, Feb 08, 2015 at 11:37:33AM -0500, Nicholas Mc Guire wrote:
> return type of wait_for_completion_timeout is unsigned long not int. The
> return variable is renamed to reflect its use and the type adjusted to
> unsigned long.
> 
> Signed-off-by: Nicholas Mc Guire 
Acked-by: Huang Shijie 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: [PATCH] mtd: nand: gpmi: fixup return type of wait_for_completion_timeout

2015-02-09 Thread Huang Shijie
On Sun, Feb 08, 2015 at 11:37:33AM -0500, Nicholas Mc Guire wrote:
 return type of wait_for_completion_timeout is unsigned long not int. The
 return variable is renamed to reflect its use and the type adjusted to
 unsigned long.
 
 Signed-off-by: Nicholas Mc Guire hof...@osadl.org
Acked-by: Huang Shijie shijie.hu...@intel.com
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: [PATCH] mtd: nand: gpmi: fixup return type of wait_for_completion_timeout

2015-02-08 Thread Boris Brezillon
On Sun,  8 Feb 2015 11:37:33 -0500
Nicholas Mc Guire  wrote:

> return type of wait_for_completion_timeout is unsigned long not int. The
> return variable is renamed to reflect its use and the type adjusted to
> unsigned long.
> 
> Signed-off-by: Nicholas Mc Guire 

Reviewed-by: Boris Brezillon 

> ---
> 
> Patch was only compile tested with imx_v6_v7_defconfig
> (implies CONFIG_MTD_NAND_GPMI_NAND=y)
> 
> Patch is against 3.19.0-rc7 (localversion-next is -next-20150204)
> 
>  drivers/mtd/nand/gpmi-nand/gpmi-nand.c |   12 ++--
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c 
> b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
> index 33f3c3c..6e44d32 100644
> --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
> +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
> @@ -446,7 +446,7 @@ int start_dma_without_bch_irq(struct gpmi_nand_data *this,
>   struct dma_async_tx_descriptor *desc)
>  {
>   struct completion *dma_c = >dma_done;
> - int err;
> + unsigned long timeout;
>  
>   init_completion(dma_c);
>  
> @@ -456,8 +456,8 @@ int start_dma_without_bch_irq(struct gpmi_nand_data *this,
>   dma_async_issue_pending(get_dma_chan(this));
>  
>   /* Wait for the interrupt from the DMA block. */
> - err = wait_for_completion_timeout(dma_c, msecs_to_jiffies(1000));
> - if (!err) {
> + timeout = wait_for_completion_timeout(dma_c, msecs_to_jiffies(1000));
> + if (!timeout) {
>   dev_err(this->dev, "DMA timeout, last DMA :%d\n",
>   this->last_dma_type);
>   gpmi_dump_info(this);
> @@ -477,7 +477,7 @@ int start_dma_with_bch_irq(struct gpmi_nand_data *this,
>   struct dma_async_tx_descriptor *desc)
>  {
>   struct completion *bch_c = >bch_done;
> - int err;
> + unsigned long timeout;
>  
>   /* Prepare to receive an interrupt from the BCH block. */
>   init_completion(bch_c);
> @@ -486,8 +486,8 @@ int start_dma_with_bch_irq(struct gpmi_nand_data *this,
>   start_dma_without_bch_irq(this, desc);
>  
>   /* Wait for the interrupt from the BCH block. */
> - err = wait_for_completion_timeout(bch_c, msecs_to_jiffies(1000));
> - if (!err) {
> + timeout = wait_for_completion_timeout(bch_c, msecs_to_jiffies(1000));
> + if (!timeout) {
>   dev_err(this->dev, "BCH timeout, last DMA :%d\n",
>   this->last_dma_type);
>   gpmi_dump_info(this);



-- 
Boris Brezillon, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[PATCH] mtd: nand: gpmi: fixup return type of wait_for_completion_timeout

2015-02-08 Thread Nicholas Mc Guire
return type of wait_for_completion_timeout is unsigned long not int. The
return variable is renamed to reflect its use and the type adjusted to
unsigned long.

Signed-off-by: Nicholas Mc Guire 
---

Patch was only compile tested with imx_v6_v7_defconfig
(implies CONFIG_MTD_NAND_GPMI_NAND=y)

Patch is against 3.19.0-rc7 (localversion-next is -next-20150204)

 drivers/mtd/nand/gpmi-nand/gpmi-nand.c |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c 
b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
index 33f3c3c..6e44d32 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
@@ -446,7 +446,7 @@ int start_dma_without_bch_irq(struct gpmi_nand_data *this,
struct dma_async_tx_descriptor *desc)
 {
struct completion *dma_c = >dma_done;
-   int err;
+   unsigned long timeout;
 
init_completion(dma_c);
 
@@ -456,8 +456,8 @@ int start_dma_without_bch_irq(struct gpmi_nand_data *this,
dma_async_issue_pending(get_dma_chan(this));
 
/* Wait for the interrupt from the DMA block. */
-   err = wait_for_completion_timeout(dma_c, msecs_to_jiffies(1000));
-   if (!err) {
+   timeout = wait_for_completion_timeout(dma_c, msecs_to_jiffies(1000));
+   if (!timeout) {
dev_err(this->dev, "DMA timeout, last DMA :%d\n",
this->last_dma_type);
gpmi_dump_info(this);
@@ -477,7 +477,7 @@ int start_dma_with_bch_irq(struct gpmi_nand_data *this,
struct dma_async_tx_descriptor *desc)
 {
struct completion *bch_c = >bch_done;
-   int err;
+   unsigned long timeout;
 
/* Prepare to receive an interrupt from the BCH block. */
init_completion(bch_c);
@@ -486,8 +486,8 @@ int start_dma_with_bch_irq(struct gpmi_nand_data *this,
start_dma_without_bch_irq(this, desc);
 
/* Wait for the interrupt from the BCH block. */
-   err = wait_for_completion_timeout(bch_c, msecs_to_jiffies(1000));
-   if (!err) {
+   timeout = wait_for_completion_timeout(bch_c, msecs_to_jiffies(1000));
+   if (!timeout) {
dev_err(this->dev, "BCH timeout, last DMA :%d\n",
this->last_dma_type);
gpmi_dump_info(this);
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[PATCH] mtd: nand: gpmi: fixup return type of wait_for_completion_timeout

2015-02-08 Thread Nicholas Mc Guire
return type of wait_for_completion_timeout is unsigned long not int. The
return variable is renamed to reflect its use and the type adjusted to
unsigned long.

Signed-off-by: Nicholas Mc Guire hof...@osadl.org
---

Patch was only compile tested with imx_v6_v7_defconfig
(implies CONFIG_MTD_NAND_GPMI_NAND=y)

Patch is against 3.19.0-rc7 (localversion-next is -next-20150204)

 drivers/mtd/nand/gpmi-nand/gpmi-nand.c |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c 
b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
index 33f3c3c..6e44d32 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
@@ -446,7 +446,7 @@ int start_dma_without_bch_irq(struct gpmi_nand_data *this,
struct dma_async_tx_descriptor *desc)
 {
struct completion *dma_c = this-dma_done;
-   int err;
+   unsigned long timeout;
 
init_completion(dma_c);
 
@@ -456,8 +456,8 @@ int start_dma_without_bch_irq(struct gpmi_nand_data *this,
dma_async_issue_pending(get_dma_chan(this));
 
/* Wait for the interrupt from the DMA block. */
-   err = wait_for_completion_timeout(dma_c, msecs_to_jiffies(1000));
-   if (!err) {
+   timeout = wait_for_completion_timeout(dma_c, msecs_to_jiffies(1000));
+   if (!timeout) {
dev_err(this-dev, DMA timeout, last DMA :%d\n,
this-last_dma_type);
gpmi_dump_info(this);
@@ -477,7 +477,7 @@ int start_dma_with_bch_irq(struct gpmi_nand_data *this,
struct dma_async_tx_descriptor *desc)
 {
struct completion *bch_c = this-bch_done;
-   int err;
+   unsigned long timeout;
 
/* Prepare to receive an interrupt from the BCH block. */
init_completion(bch_c);
@@ -486,8 +486,8 @@ int start_dma_with_bch_irq(struct gpmi_nand_data *this,
start_dma_without_bch_irq(this, desc);
 
/* Wait for the interrupt from the BCH block. */
-   err = wait_for_completion_timeout(bch_c, msecs_to_jiffies(1000));
-   if (!err) {
+   timeout = wait_for_completion_timeout(bch_c, msecs_to_jiffies(1000));
+   if (!timeout) {
dev_err(this-dev, BCH timeout, last DMA :%d\n,
this-last_dma_type);
gpmi_dump_info(this);
-- 
1.7.10.4

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: [PATCH] mtd: nand: gpmi: fixup return type of wait_for_completion_timeout

2015-02-08 Thread Boris Brezillon
On Sun,  8 Feb 2015 11:37:33 -0500
Nicholas Mc Guire hof...@osadl.org wrote:

 return type of wait_for_completion_timeout is unsigned long not int. The
 return variable is renamed to reflect its use and the type adjusted to
 unsigned long.
 
 Signed-off-by: Nicholas Mc Guire hof...@osadl.org

Reviewed-by: Boris Brezillon boris.brezil...@free-electrons.com

 ---
 
 Patch was only compile tested with imx_v6_v7_defconfig
 (implies CONFIG_MTD_NAND_GPMI_NAND=y)
 
 Patch is against 3.19.0-rc7 (localversion-next is -next-20150204)
 
  drivers/mtd/nand/gpmi-nand/gpmi-nand.c |   12 ++--
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c 
 b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
 index 33f3c3c..6e44d32 100644
 --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
 +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
 @@ -446,7 +446,7 @@ int start_dma_without_bch_irq(struct gpmi_nand_data *this,
   struct dma_async_tx_descriptor *desc)
  {
   struct completion *dma_c = this-dma_done;
 - int err;
 + unsigned long timeout;
  
   init_completion(dma_c);
  
 @@ -456,8 +456,8 @@ int start_dma_without_bch_irq(struct gpmi_nand_data *this,
   dma_async_issue_pending(get_dma_chan(this));
  
   /* Wait for the interrupt from the DMA block. */
 - err = wait_for_completion_timeout(dma_c, msecs_to_jiffies(1000));
 - if (!err) {
 + timeout = wait_for_completion_timeout(dma_c, msecs_to_jiffies(1000));
 + if (!timeout) {
   dev_err(this-dev, DMA timeout, last DMA :%d\n,
   this-last_dma_type);
   gpmi_dump_info(this);
 @@ -477,7 +477,7 @@ int start_dma_with_bch_irq(struct gpmi_nand_data *this,
   struct dma_async_tx_descriptor *desc)
  {
   struct completion *bch_c = this-bch_done;
 - int err;
 + unsigned long timeout;
  
   /* Prepare to receive an interrupt from the BCH block. */
   init_completion(bch_c);
 @@ -486,8 +486,8 @@ int start_dma_with_bch_irq(struct gpmi_nand_data *this,
   start_dma_without_bch_irq(this, desc);
  
   /* Wait for the interrupt from the BCH block. */
 - err = wait_for_completion_timeout(bch_c, msecs_to_jiffies(1000));
 - if (!err) {
 + timeout = wait_for_completion_timeout(bch_c, msecs_to_jiffies(1000));
 + if (!timeout) {
   dev_err(this-dev, BCH timeout, last DMA :%d\n,
   this-last_dma_type);
   gpmi_dump_info(this);



-- 
Boris Brezillon, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/