subject:"\[PATCH 4\/4\] fix not\-and\/or errors"

Re: [PATCH 4/4] fix not-and/or errors

2007-10-17 Thread Al Viro

On Wed, Oct 17, 2007 at 03:55:29PM +0200, Roel Kluin wrote:
> if(!x & y) should either be if(!(x & y)) or if(!x && y)
> I made changes as seemed appropriate, but please review
> 
> Signed-off-by: Roel Kluin <[EMAIL PROTECTED]>
> ---
> diff --git a/arch/arm/mach-pxa/mfp.c b/arch/arm/mach-pxa/mfp.c
> index 5cd3cad..7229319 100644
> --- a/arch/arm/mach-pxa/mfp.c
> +++ b/arch/arm/mach-pxa/mfp.c
> @@ -199,7 +199,7 @@ void pxa3xx_mfp_set_edge(int mfp, int edge)
>  
>   mfpr_val &= ~MFPR_EDGE_MASK;
>   mfpr_val |= (edge & 0x3u) << MFPR_ERE_OFFSET;
> - mfpr_val |= (!edge & 0x1) << MFPR_EC_OFFSET;
> + mfpr_val |= (!(edge & 0x1)) << MFPR_EC_OFFSET;
>  
>   mfpr_writel(mfpr_off, mfpr_val);
>   mfpr_sync();

ACK

> diff --git a/arch/sh/drivers/dma/dma-sh.c b/arch/sh/drivers/dma/dma-sh.c
> index 958bac1..e8f9c85 100644
> --- a/arch/sh/drivers/dma/dma-sh.c
> +++ b/arch/sh/drivers/dma/dma-sh.c
> @@ -89,7 +89,7 @@ static irqreturn_t dma_tei(int irq, void *dev_id)
>  
>  static int sh_dmac_request_dma(struct dma_channel *chan)
>  {
> - if (unlikely(!chan->flags & DMA_TEI_CAPABLE))
> + if (unlikely(!(chan->flags & DMA_TEI_CAPABLE)))
>   return 0;
>  
>   return request_irq(get_dmte_irq(chan->chan), dma_tei,

ACK

> --- a/drivers/acpi/asus_acpi.c
> +++ b/drivers/acpi/asus_acpi.c
> @@ -596,7 +596,7 @@ write_led(const char __user * buffer, unsigned long count,
>   (led_out) ? (hotk->status | ledmask) : (hotk->status & ~ledmask);
>  
>   if (invert) /* invert target value */
> - led_out = !led_out & 0x1;
> + led_out = !(led_out & 0x1);

No, simply !led_out

> + if ((!battery->flags.battery_present_prev && 
> acpi_battery_present(battery))
> + || (battery->flags.battery_present_prev && 
> !acpi_battery_present(battery))) {

ITYM != and you've missed another one like that in the same file.

The rest is covered by earlier patches
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 4/4] fix not-and/or errors

2007-10-17 Thread Peter Zijlstra

On Wed, 2007-10-17 at 15:55 +0200, Roel Kluin wrote:
> if(!x & y) should either be if(!(x & y)) or if(!x && y)
> I made changes as seemed appropriate, but please review
> 
> Signed-off-by: Roel Kluin <[EMAIL PROTECTED]>

and 3 and 4 look good too..

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

[PATCH 4/4] fix not-and/or errors

2007-10-17 Thread Roel Kluin

if(!x & y) should either be if(!(x & y)) or if(!x && y)
I made changes as seemed appropriate, but please review

Signed-off-by: Roel Kluin <[EMAIL PROTECTED]>
---
diff --git a/arch/arm/mach-pxa/mfp.c b/arch/arm/mach-pxa/mfp.c
index 5cd3cad..7229319 100644
--- a/arch/arm/mach-pxa/mfp.c
+++ b/arch/arm/mach-pxa/mfp.c
@@ -199,7 +199,7 @@ void pxa3xx_mfp_set_edge(int mfp, int edge)
 
mfpr_val &= ~MFPR_EDGE_MASK;
mfpr_val |= (edge & 0x3u) << MFPR_ERE_OFFSET;
-   mfpr_val |= (!edge & 0x1) << MFPR_EC_OFFSET;
+   mfpr_val |= (!(edge & 0x1)) << MFPR_EC_OFFSET;
 
mfpr_writel(mfpr_off, mfpr_val);
mfpr_sync();
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index 3d45d24..7d78d22 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -858,7 +858,7 @@ int acpi_map_lsapic(acpi_handle handle, int *pcpu)
lsapic = (struct acpi_madt_local_sapic *)obj->buffer.pointer;
 
if ((lsapic->header.type != ACPI_MADT_TYPE_LOCAL_SAPIC) ||
-   (!lsapic->lapic_flags & ACPI_MADT_ENABLED)) {
+   (!(lsapic->lapic_flags & ACPI_MADT_ENABLED))) {
kfree(buffer.pointer);
return -EINVAL;
}
diff --git a/arch/sh/drivers/dma/dma-sh.c b/arch/sh/drivers/dma/dma-sh.c
index 958bac1..e8f9c85 100644
--- a/arch/sh/drivers/dma/dma-sh.c
+++ b/arch/sh/drivers/dma/dma-sh.c
@@ -89,7 +89,7 @@ static irqreturn_t dma_tei(int irq, void *dev_id)
 
 static int sh_dmac_request_dma(struct dma_channel *chan)
 {
-   if (unlikely(!chan->flags & DMA_TEI_CAPABLE))
+   if (unlikely(!(chan->flags & DMA_TEI_CAPABLE)))
return 0;
 
return request_irq(get_dmte_irq(chan->chan), dma_tei,
diff --git a/arch/sparc64/kernel/time.c b/arch/sparc64/kernel/time.c
index cd8c740..a2cf955 100644
--- a/arch/sparc64/kernel/time.c
+++ b/arch/sparc64/kernel/time.c
@@ -1070,7 +1070,7 @@ static int set_rtc_mmss(unsigned long nowtime)
 * Not having a register set can lead to trouble.
 * Also starfire doesn't have a tod clock.
 */
-   if (!mregs && !dregs & !bregs)
+   if (!mregs && !dregs && !bregs)
return -1;
 
if (mregs) {
diff --git a/drivers/acpi/asus_acpi.c b/drivers/acpi/asus_acpi.c
index d915fec..5a67a87 100644
--- a/drivers/acpi/asus_acpi.c
+++ b/drivers/acpi/asus_acpi.c
@@ -596,7 +596,7 @@ write_led(const char __user * buffer, unsigned long count,
(led_out) ? (hotk->status | ledmask) : (hotk->status & ~ledmask);
 
if (invert) /* invert target value */
-   led_out = !led_out & 0x1;
+   led_out = !(led_out & 0x1);
 
if (!write_acpi_int(hotk->handle, ledname, led_out, NULL))
printk(KERN_WARNING "Asus ACPI: LED (%s) write failed\n",
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 9b2c0f7..48fbe9e 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -420,8 +420,8 @@ static int acpi_battery_update(struct acpi_battery *battery,
result = acpi_battery_get_status(battery);
if (result)
goto end;
-   if ((!battery->flags.battery_present_prev & 
acpi_battery_present(battery))
-   || (battery->flags.battery_present_prev & 
!acpi_battery_present(battery))) {
+   if ((!battery->flags.battery_present_prev && 
acpi_battery_present(battery))
+   || (battery->flags.battery_present_prev && 
!acpi_battery_present(battery))) {
result = acpi_battery_init_update(battery);
if (result)
goto end;
diff --git a/drivers/block/paride/pt.c b/drivers/block/paride/pt.c
index 9f4e67e..37079d9 100644
--- a/drivers/block/paride/pt.c
+++ b/drivers/block/paride/pt.c
@@ -660,11 +660,11 @@ static int pt_open(struct inode *inode, struct file *file)
pt_identify(tape);
 
err = -ENODEV;
-   if (!tape->flags & PT_MEDIA)
+   if (!(tape->flags & PT_MEDIA))
goto out;
 
err = -EROFS;
-   if ((!tape->flags & PT_WRITE_OK) && (file->f_mode & 2))
+   if ((!(tape->flags & PT_WRITE_OK)) && (file->f_mode & 2))
goto out;
 
if (!(iminor(inode) & 128))

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

[PATCH 4/4] fix not-and/or errors

2007-10-17 Thread Roel Kluin

if(!x  y) should either be if(!(x  y)) or if(!x  y)
I made changes as seemed appropriate, but please review

Signed-off-by: Roel Kluin [EMAIL PROTECTED]
---
diff --git a/arch/arm/mach-pxa/mfp.c b/arch/arm/mach-pxa/mfp.c
index 5cd3cad..7229319 100644
--- a/arch/arm/mach-pxa/mfp.c
+++ b/arch/arm/mach-pxa/mfp.c
@@ -199,7 +199,7 @@ void pxa3xx_mfp_set_edge(int mfp, int edge)
 
mfpr_val = ~MFPR_EDGE_MASK;
mfpr_val |= (edge  0x3u)  MFPR_ERE_OFFSET;
-   mfpr_val |= (!edge  0x1)  MFPR_EC_OFFSET;
+   mfpr_val |= (!(edge  0x1))  MFPR_EC_OFFSET;
 
mfpr_writel(mfpr_off, mfpr_val);
mfpr_sync();
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index 3d45d24..7d78d22 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -858,7 +858,7 @@ int acpi_map_lsapic(acpi_handle handle, int *pcpu)
lsapic = (struct acpi_madt_local_sapic *)obj-buffer.pointer;
 
if ((lsapic-header.type != ACPI_MADT_TYPE_LOCAL_SAPIC) ||
-   (!lsapic-lapic_flags  ACPI_MADT_ENABLED)) {
+   (!(lsapic-lapic_flags  ACPI_MADT_ENABLED))) {
kfree(buffer.pointer);
return -EINVAL;
}
diff --git a/arch/sh/drivers/dma/dma-sh.c b/arch/sh/drivers/dma/dma-sh.c
index 958bac1..e8f9c85 100644
--- a/arch/sh/drivers/dma/dma-sh.c
+++ b/arch/sh/drivers/dma/dma-sh.c
@@ -89,7 +89,7 @@ static irqreturn_t dma_tei(int irq, void *dev_id)
 
 static int sh_dmac_request_dma(struct dma_channel *chan)
 {
-   if (unlikely(!chan-flags  DMA_TEI_CAPABLE))
+   if (unlikely(!(chan-flags  DMA_TEI_CAPABLE)))
return 0;
 
return request_irq(get_dmte_irq(chan-chan), dma_tei,
diff --git a/arch/sparc64/kernel/time.c b/arch/sparc64/kernel/time.c
index cd8c740..a2cf955 100644
--- a/arch/sparc64/kernel/time.c
+++ b/arch/sparc64/kernel/time.c
@@ -1070,7 +1070,7 @@ static int set_rtc_mmss(unsigned long nowtime)
 * Not having a register set can lead to trouble.
 * Also starfire doesn't have a tod clock.
 */
-   if (!mregs  !dregs  !bregs)
+   if (!mregs  !dregs  !bregs)
return -1;
 
if (mregs) {
diff --git a/drivers/acpi/asus_acpi.c b/drivers/acpi/asus_acpi.c
index d915fec..5a67a87 100644
--- a/drivers/acpi/asus_acpi.c
+++ b/drivers/acpi/asus_acpi.c
@@ -596,7 +596,7 @@ write_led(const char __user * buffer, unsigned long count,
(led_out) ? (hotk-status | ledmask) : (hotk-status  ~ledmask);
 
if (invert) /* invert target value */
-   led_out = !led_out  0x1;
+   led_out = !(led_out  0x1);
 
if (!write_acpi_int(hotk-handle, ledname, led_out, NULL))
printk(KERN_WARNING Asus ACPI: LED (%s) write failed\n,
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 9b2c0f7..48fbe9e 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -420,8 +420,8 @@ static int acpi_battery_update(struct acpi_battery *battery,
result = acpi_battery_get_status(battery);
if (result)
goto end;
-   if ((!battery-flags.battery_present_prev  
acpi_battery_present(battery))
-   || (battery-flags.battery_present_prev  
!acpi_battery_present(battery))) {
+   if ((!battery-flags.battery_present_prev  
acpi_battery_present(battery))
+   || (battery-flags.battery_present_prev  
!acpi_battery_present(battery))) {
result = acpi_battery_init_update(battery);
if (result)
goto end;
diff --git a/drivers/block/paride/pt.c b/drivers/block/paride/pt.c
index 9f4e67e..37079d9 100644
--- a/drivers/block/paride/pt.c
+++ b/drivers/block/paride/pt.c
@@ -660,11 +660,11 @@ static int pt_open(struct inode *inode, struct file *file)
pt_identify(tape);
 
err = -ENODEV;
-   if (!tape-flags  PT_MEDIA)
+   if (!(tape-flags  PT_MEDIA))
goto out;
 
err = -EROFS;
-   if ((!tape-flags  PT_WRITE_OK)  (file-f_mode  2))
+   if ((!(tape-flags  PT_WRITE_OK))  (file-f_mode  2))
goto out;
 
if (!(iminor(inode)  128))

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

Re: [PATCH 4/4] fix not-and/or errors

2007-10-17 Thread Peter Zijlstra

On Wed, 2007-10-17 at 15:55 +0200, Roel Kluin wrote:
 if(!x  y) should either be if(!(x  y)) or if(!x  y)
 I made changes as seemed appropriate, but please review
 
 Signed-off-by: Roel Kluin [EMAIL PROTECTED]

and 3 and 4 look good too..

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

Re: [PATCH 4/4] fix not-and/or errors

2007-10-17 Thread Al Viro

On Wed, Oct 17, 2007 at 03:55:29PM +0200, Roel Kluin wrote:
 if(!x  y) should either be if(!(x  y)) or if(!x  y)
 I made changes as seemed appropriate, but please review
 
 Signed-off-by: Roel Kluin [EMAIL PROTECTED]
 ---
 diff --git a/arch/arm/mach-pxa/mfp.c b/arch/arm/mach-pxa/mfp.c
 index 5cd3cad..7229319 100644
 --- a/arch/arm/mach-pxa/mfp.c
 +++ b/arch/arm/mach-pxa/mfp.c
 @@ -199,7 +199,7 @@ void pxa3xx_mfp_set_edge(int mfp, int edge)
  
   mfpr_val = ~MFPR_EDGE_MASK;
   mfpr_val |= (edge  0x3u)  MFPR_ERE_OFFSET;
 - mfpr_val |= (!edge  0x1)  MFPR_EC_OFFSET;
 + mfpr_val |= (!(edge  0x1))  MFPR_EC_OFFSET;
  
   mfpr_writel(mfpr_off, mfpr_val);
   mfpr_sync();

ACK

 diff --git a/arch/sh/drivers/dma/dma-sh.c b/arch/sh/drivers/dma/dma-sh.c
 index 958bac1..e8f9c85 100644
 --- a/arch/sh/drivers/dma/dma-sh.c
 +++ b/arch/sh/drivers/dma/dma-sh.c
 @@ -89,7 +89,7 @@ static irqreturn_t dma_tei(int irq, void *dev_id)
  
  static int sh_dmac_request_dma(struct dma_channel *chan)
  {
 - if (unlikely(!chan-flags  DMA_TEI_CAPABLE))
 + if (unlikely(!(chan-flags  DMA_TEI_CAPABLE)))
   return 0;
  
   return request_irq(get_dmte_irq(chan-chan), dma_tei,

ACK

 --- a/drivers/acpi/asus_acpi.c
 +++ b/drivers/acpi/asus_acpi.c
 @@ -596,7 +596,7 @@ write_led(const char __user * buffer, unsigned long count,
   (led_out) ? (hotk-status | ledmask) : (hotk-status  ~ledmask);
  
   if (invert) /* invert target value */
 - led_out = !led_out  0x1;
 + led_out = !(led_out  0x1);

No, simply !led_out

 + if ((!battery-flags.battery_present_prev  
 acpi_battery_present(battery))
 + || (battery-flags.battery_present_prev  
 !acpi_battery_present(battery))) {

ITYM != and you've missed another one like that in the same file.

The rest is covered by earlier patches
-
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 4/4] fix not-and/or errors

Re: [PATCH 4/4] fix not-and/or errors

[PATCH 4/4] fix not-and/or errors

[PATCH 4/4] fix not-and/or errors

Re: [PATCH 4/4] fix not-and/or errors

Re: [PATCH 4/4] fix not-and/or errors

6 matches

Site Navigation

Mail list logo

Footer information