linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* RE: [PATCH] 2.4.5pre3 warning fixes
@ 2001-05-17 19:49 Bingner Sam J. Contractor RSIS
  2001-05-17 21:21 ` Alan Cox
  2001-05-18  4:44 ` Albert D. Cahalan
  0 siblings, 2 replies; 7+ messages in thread
From: Bingner Sam J. Contractor RSIS @ 2001-05-17 19:49 UTC (permalink / raw)
  To: 'Alan Cox', richbaum; +Cc: linux-kernel, torvalds

Looks to me like it's adding { and } on each side of the
"c->devices->prev=d;" statement... so changing from:

if (c->devices != NULL)
	c->devices->prev=d;

to 

if (c->devices != NULL){
	c->devices->prev=d;
}

I assume the new compiler likes the if to have explicit brackets instead of
using the next statement...

	Sam Bingner

-----Original Message-----
From: Alan Cox [mailto:alan@lxorguk.ukuu.org.uk]
Sent: Thursday, May 17, 2001 9:40 AM
To: richbaum@acm.org
Cc: linux-kernel@vger.kernel.org; torvalds@transmeta.com;
alan@lxorguk.ukuu.org.uk
Subject: Re: [PATCH] 2.4.5pre3 warning fixes


> --- linux/drivers/i2o/i2o_core.c	Thu May 17 11:38:28 2001
> +++ rb/drivers/i2o/i2o_core.c	Thu May 17 11:48:08 2001
> @@ -380,8 +380,9 @@
>  	d->owner=NULL;
>  	d->next=c->devices;
>  	d->prev=NULL;
> -	if (c->devices != NULL)
> +	if (c->devices != NULL){
>  		c->devices->prev=d;
> +	}

What does this have to do with gcc compiler warnings ?????

-
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] 7+ messages in thread

* Re: [PATCH] 2.4.5pre3 warning fixes
  2001-05-17 19:49 [PATCH] 2.4.5pre3 warning fixes Bingner Sam J. Contractor RSIS
@ 2001-05-17 21:21 ` Alan Cox
  2001-05-18  4:44 ` Albert D. Cahalan
  1 sibling, 0 replies; 7+ messages in thread
From: Alan Cox @ 2001-05-17 21:21 UTC (permalink / raw)
  To: Bingner Sam J. Contractor RSIS
  Cc: 'Alan Cox', richbaum, linux-kernel, torvalds

> if (c->devices != NULL){
> 	c->devices->prev=d;
> }
> 
> I assume the new compiler likes the if to have explicit brackets instead of
> using the next statement...

Then its not a C compiler

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

* Re: [PATCH] 2.4.5pre3 warning fixes
  2001-05-17 19:49 [PATCH] 2.4.5pre3 warning fixes Bingner Sam J. Contractor RSIS
  2001-05-17 21:21 ` Alan Cox
@ 2001-05-18  4:44 ` Albert D. Cahalan
  1 sibling, 0 replies; 7+ messages in thread
From: Albert D. Cahalan @ 2001-05-18  4:44 UTC (permalink / raw)
  To: Bingner Sam J. Contractor RSIS; +Cc: richbaum, linux-kernel

Bingner Sam J. Con writes:

> Looks to me like it's adding { and } on each side of the
> "c->devices->prev=d;" statement... so changing from:
> 
> if (c->devices != NULL)
> 	c->devices->prev=d;
> 
> to 
> 
> if (c->devices != NULL){
> 	c->devices->prev=d;
> }
> 
> I assume the new compiler likes the if to have explicit
> brackets instead of using the next statement...

Maybe one of these will make it happy:

(void)(c->devices && (c->devices->prev=d));

!c->devices ?: (c->devices->prev=d);

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

* Re: [PATCH] 2.4.5pre3 warning fixes
  2001-05-17 19:33 Rich Baum
  2001-05-17 19:40 ` Alan Cox
  2001-05-17 19:48 ` Jeff Garzik
@ 2001-05-17 20:01 ` Mohammad A. Haque
  2 siblings, 0 replies; 7+ messages in thread
From: Mohammad A. Haque @ 2001-05-17 20:01 UTC (permalink / raw)
  To: Rich Baum; +Cc: linux-kernel, torvalds, Alan Cox

On Thu, 17 May 2001, Rich Baum wrote:

> This patch fixes warnings in 2.4.5pre3 about extra tokens at the end of
> #endif statements and labels at the end of compound statements when using gcc
> 3.0 snapshots.
>
> -	if (c->devices != NULL)
> +	if (c->devices != NULL){
>  		c->devices->prev=d;
> +	}
>  	c->devices=d;
>

It didn't really complain about this one did it? Braces are optional
here or is that not part of ANSI C?

--

=====================================================================
Mohammad A. Haque                              http://www.haque.net/
                                               mhaque@haque.net

  "Alcohol and calculus don't mix.             Project Lead
   Don't drink and derive." --Unknown          http://wm.themes.org/
                                               batmanppc@themes.org
=====================================================================


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

* Re: [PATCH] 2.4.5pre3 warning fixes
  2001-05-17 19:33 Rich Baum
  2001-05-17 19:40 ` Alan Cox
@ 2001-05-17 19:48 ` Jeff Garzik
  2001-05-17 20:01 ` Mohammad A. Haque
  2 siblings, 0 replies; 7+ messages in thread
From: Jeff Garzik @ 2001-05-17 19:48 UTC (permalink / raw)
  To: Rich Baum; +Cc: linux-kernel, torvalds, Alan Cox

Rich Baum wrote:
> @@ -1543,6 +1543,7 @@
>           EXCEPTION(EX_INTERNAL | 0x116);
>           return;
>  #endif /* PARANOID */
> +         ;
>         }
>      }
>    else if ( (st0_tag == TAG_Valid) || (st0_tag == TW_Denormal) )
> @@ -437,7 +437,7 @@
>         /* XXX shouldn't we *start* by deregistering the device? */
>         atm_dev_deregister(fore200e->atm_dev);
> 
> -    case FORE200E_STATE_BLANK:
> +    case FORE200E_STATE_BLANK:;
>         /* nothing to do for that state */
>      }
>  }
> @@ -556,7 +556,7 @@
>                 }
>                 break;
>  #endif
> -       default:
> +       default:;
>                 /* nothing */
>         }
> 

IMHO the ":;" form is really easy to miss or mistake.

Can't you put a "break;" after the "nothing" comment instead?  The
compiled code is not bigger, and while the source gets a bit bigger, I
think the extra "break;" helps maintenance in the long term.

	Jeff


-- 
Jeff Garzik      | Game called on account of naked chick
Building 1024    |
MandrakeSoft     |

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

* Re: [PATCH] 2.4.5pre3 warning fixes
  2001-05-17 19:33 Rich Baum
@ 2001-05-17 19:40 ` Alan Cox
  2001-05-17 19:48 ` Jeff Garzik
  2001-05-17 20:01 ` Mohammad A. Haque
  2 siblings, 0 replies; 7+ messages in thread
From: Alan Cox @ 2001-05-17 19:40 UTC (permalink / raw)
  To: Rich Baum; +Cc: linux-kernel, torvalds, Alan Cox

> --- linux/drivers/i2o/i2o_core.c	Thu May 17 11:38:28 2001
> +++ rb/drivers/i2o/i2o_core.c	Thu May 17 11:48:08 2001
> @@ -380,8 +380,9 @@
>  	d->owner=NULL;
>  	d->next=c->devices;
>  	d->prev=NULL;
> -	if (c->devices != NULL)
> +	if (c->devices != NULL){
>  		c->devices->prev=d;
> +	}

What does this have to do with gcc compiler warnings ?????


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

* [PATCH] 2.4.5pre3 warning fixes
@ 2001-05-17 19:33 Rich Baum
  2001-05-17 19:40 ` Alan Cox
                   ` (2 more replies)
  0 siblings, 3 replies; 7+ messages in thread
From: Rich Baum @ 2001-05-17 19:33 UTC (permalink / raw)
  To: linux-kernel; +Cc: torvalds, Alan Cox

This patch fixes warnings in 2.4.5pre3 about extra tokens at the end of 
#endif statements and labels at the end of compound statements when using gcc 
3.0 snapshots.

Rich

diff -urN -X /linux/dontdiff linux/arch/i386/math-emu/fpu_trig.c 
rb/arch/i386/math-emu/fpu_trig.c
--- linux/arch/i386/math-emu/fpu_trig.c	Sat Apr 28 18:13:25 2001
+++ rb/arch/i386/math-emu/fpu_trig.c	Wed May 16 12:04:24 2001
@@ -1543,6 +1543,7 @@
 	  EXCEPTION(EX_INTERNAL | 0x116);
 	  return;
 #endif /* PARANOID */
+	  ;
 	}
     }
   else if ( (st0_tag == TAG_Valid) || (st0_tag == TW_Denormal) )
diff -urN -X /linux/dontdiff linux/drivers/atm/fore200e.c 
rb/drivers/atm/fore200e.c
--- linux/drivers/atm/fore200e.c	Fri Feb  9 14:30:22 2001
+++ rb/drivers/atm/fore200e.c	Tue May 15 21:39:07 2001
@@ -437,7 +437,7 @@
 	/* XXX shouldn't we *start* by deregistering the device? */
 	atm_dev_deregister(fore200e->atm_dev);
 
-    case FORE200E_STATE_BLANK:
+    case FORE200E_STATE_BLANK:;
 	/* nothing to do for that state */
     }
 }
diff -urN -X /linux/dontdiff linux/drivers/cdrom/sbpcd.c 
rb/drivers/cdrom/sbpcd.c
--- linux/drivers/cdrom/sbpcd.c	Sat Apr 28 18:13:35 2001
+++ rb/drivers/cdrom/sbpcd.c	Tue May 15 21:39:47 2001
@@ -1118,7 +1118,7 @@
 	return (0);
 }
 /*==========================================================================*
/
-#endif 00000
+#endif /* 00000 */
 /*==========================================================================*
/
 static int ResponseInfo(void)
 {
diff -urN -X /linux/dontdiff linux/drivers/i2o/i2o_core.c 
rb/drivers/i2o/i2o_core.c
--- linux/drivers/i2o/i2o_core.c	Thu May 17 11:38:28 2001
+++ rb/drivers/i2o/i2o_core.c	Thu May 17 11:48:08 2001
@@ -380,8 +380,9 @@
 	d->owner=NULL;
 	d->next=c->devices;
 	d->prev=NULL;
-	if (c->devices != NULL)
+	if (c->devices != NULL){
 		c->devices->prev=d;
+	}
 	c->devices=d;
 	*d->dev_name = 0;
 
diff -urN -X /linux/dontdiff linux/drivers/i2o/i2o_lan.c 
rb/drivers/i2o/i2o_lan.c
--- linux/drivers/i2o/i2o_lan.c	Fri Feb  9 14:30:23 2001
+++ rb/drivers/i2o/i2o_lan.c	Tue May 15 21:38:19 2001
@@ -938,7 +938,7 @@
 	spin_unlock_irq(&priv->tx_lock);
 	return 0;
 }
-#endif CONFIG_NET_FC
+#endif /* CONFIG_NET_FC */
 
 /*
  * i2o_lan_packet_send(): Send a packet as is, including the MAC header.
diff -urN -X /linux/dontdiff linux/drivers/media/video/tuner.c 
rb/drivers/media/video/tuner.c
--- linux/drivers/media/video/tuner.c	Mon Feb 19 17:43:36 2001
+++ rb/drivers/media/video/tuner.c	Thu May 17 12:28:59 2001
@@ -556,7 +556,7 @@
 		}
 		break;
 #endif
-	default:
+	default:;
 		/* nothing */
 	}
 	
diff -urN -X /linux/dontdiff linux/drivers/net/tokenring/ibmtr.c 
rb/drivers/net/tokenring/ibmtr.c
--- linux/drivers/net/tokenring/ibmtr.c	Tue Mar 20 15:05:00 2001
+++ rb/drivers/net/tokenring/ibmtr.c	Tue May 15 21:40:09 2001
@@ -1185,7 +1185,7 @@
 				isa_writeb(~CMD_IN_SRB, ti->mmio + ACA_OFFSET + ACA_RESET + ISRA_ODD);
 				isa_writeb(~SRB_RESP_INT, ti->mmio + ACA_OFFSET + ACA_RESET + ISRP_ODD);
 
-			  skip_reset:
+			  skip_reset:;
 			} /* SRB response */
 
 			if (status & ASB_FREE_INT) { /* ASB response */
diff -urN -X /linux/dontdiff linux/drivers/net/wan/hdlc.c 
rb/drivers/net/wan/hdlc.c
--- linux/drivers/net/wan/hdlc.c	Sat Apr 28 18:13:46 2001
+++ rb/drivers/net/wan/hdlc.c	Tue May 15 21:41:23 2001
@@ -1082,7 +1082,7 @@
 			}
 			break;
 
-		default:		/* to be defined */
+		default:;		/* to be defined */
 		}
 
 		dev_kfree_skb(skb);
diff -urN -X /linux/dontdiff linux/drivers/net/wan/sdla_fr.c 
rb/drivers/net/wan/sdla_fr.c
--- linux/drivers/net/wan/sdla_fr.c	Sat Apr 28 18:13:46 2001
+++ rb/drivers/net/wan/sdla_fr.c	Tue May 15 21:41:00 2001
@@ -4435,7 +4435,7 @@
 		trigger_fr_poll(dev);
 		
 		break;
-	default:  // ARP's and RARP's -- Shouldn't happen.
+	default:;  // ARP's and RARP's -- Shouldn't happen.
 	}
 
 	return 0;	
diff -urN -X /linux/dontdiff linux/drivers/net/wan/sdla_x25.c 
rb/drivers/net/wan/sdla_x25.c
--- linux/drivers/net/wan/sdla_x25.c	Sat Apr 28 18:13:47 2001
+++ rb/drivers/net/wan/sdla_x25.c	Tue May 15 21:40:42 2001
@@ -3108,7 +3108,7 @@
 	case 0x08:	/* modem failure */
 #ifndef MODEM_NOT_LOG
 		printk(KERN_INFO "%s: modem failure!\n", card->devname);
-#endif MODEM_NOT_LOG
+#endif /* MODEM_NOT_LOG */
 		api_oob_event(card,mb);
 		break;
 
diff -urN -X /linux/dontdiff linux/drivers/scsi/NCR53c406a.c 
rb/drivers/scsi/NCR53c406a.c
--- linux/drivers/scsi/NCR53c406a.c	Fri Mar  2 14:12:11 2001
+++ rb/drivers/scsi/NCR53c406a.c	Tue May 15 21:47:25 2001
@@ -221,7 +221,7 @@
     (void *)0xc8000
 };
 #define ADDRESS_COUNT (sizeof( addresses ) / sizeof( unsigned ))
-#endif USE_BIOS
+#endif /* USE_BIOS */
 		       
 /* possible i/o port addresses */
 static unsigned short ports[] =
@@ -244,7 +244,7 @@
     { "Copyright (C) Acculogic, Inc.\r\n2.8M Diskette Extension Bios ver 
4.04.03 03/01/1993", 61, 82 },
 };
 #define SIGNATURE_COUNT (sizeof( signatures ) / sizeof( struct signature ))
-#endif USE_BIOS
+#endif /* USE_BIOS */
 
 /* ============================================================ */
 
@@ -347,7 +347,7 @@
     
     return tmp;
 }
-#endif USE_DMA
+#endif /* USE_DMA */
 
 #if USE_PIO
 static __inline__ int NCR53c406a_pio_read(unsigned char *request, 
@@ -455,7 +455,7 @@
     }
     return 0;
 }
-#endif USE_PIO
+#endif /* USE_PIO */
 
 int  __init 
 NCR53c406a_detect(Scsi_Host_Template * tpnt){
@@ -481,7 +481,7 @@
     }
     
     DEB(printk("NCR53c406a BIOS found at %X\n", (unsigned int) bios_base););
-#endif USE_BIOS
+#endif /* USE_BIOS */
     
 #ifdef PORT_BASE
     if (!request_region(port_base, 0x10, "NCR53c406a")) /* ports already 
snatched */
@@ -511,7 +511,7 @@
             }
         }
     }
-#endif PORT_BASE
+#endif /* PORT_BASE */
     
     if(!port_base){		/* no ports found */
         printk("NCR53c406a: no available ports found\n");
@@ -549,7 +549,7 @@
 #if USE_DMA
         printk("NCR53c406a: No interrupts found and DMA mode defined. Giving 
up.\n");
         goto err_release;
-#endif USE_DMA
+#endif /* USE_DMA */
     }
     else {
         DEB(printk("NCR53c406a: Shouldn't get here!\n"));
@@ -564,7 +564,7 @@
     }
     
     DEB(printk("Allocated DMA channel %d\n", dma_chan));
-#endif USE_DMA 
+#endif /* USE_DMA */
     
     tpnt->present = 1;
     tpnt->proc_name = "NCR53c406a";
@@ -819,8 +819,8 @@
     printk("\n");
 #else
     printk(", pio=%02x\n", pio_status);
-#endif USE_DMA
-#endif NCR53C406A_DEBUG
+#endif /* USE_DMA */
+#endif /* NCR53C406A_DEBUG */
     
     if(int_reg & 0x80){         /* SCSI reset intr */
         rtrc(3);
@@ -839,7 +839,7 @@
         current_SC->scsi_done(current_SC);
         return;
     }
-#endif USE_PIO
+#endif /* USE_PIO */
     
     if(status & 0x20) {		/* Parity error */
         printk("NCR53c406a: Warning: parity error!\n");
@@ -884,7 +884,7 @@
 #if USE_DMA			/* No s/g support for DMA */
             NCR53c406a_dma_write(current_SC->request_buffer, 
                                  current_SC->request_bufflen);
-#endif USE_DMA
+#endif /* USE_DMA */
             outb(TRANSFER_INFO | DMA_OP, CMD_REG); 
 #if USE_PIO
             if (!current_SC->use_sg) /* Don't use scatter-gather */
@@ -899,7 +899,7 @@
                 }
             }
             REG0;
-#endif USE_PIO
+#endif /* USE_PIO */
         }
         break;
         
@@ -913,7 +913,7 @@
 #if USE_DMA			/* No s/g support for DMA */
             NCR53c406a_dma_read(current_SC->request_buffer, 
                                 current_SC->request_bufflen);
-#endif USE_DMA
+#endif /* USE_DMA */
             outb(TRANSFER_INFO | DMA_OP, CMD_REG); 
 #if USE_PIO
             if (!current_SC->use_sg) /* Don't use scatter-gather */
@@ -928,7 +928,7 @@
                 }
             }
             REG0;
-#endif USE_PIO
+#endif /* USE_PIO */
         }
         break;
         
@@ -1010,7 +1010,7 @@
     
     return irq;
 }
-#endif IRQ_LEV
+#endif /* IRQ_LEV */
 
 static void chip_init()
 {
diff -urN -X /linux/dontdiff linux/drivers/scsi/aic7xxx_old.c 
rb/drivers/scsi/aic7xxx_old.c
--- linux/drivers/scsi/aic7xxx_old.c	Sat Apr 28 18:13:51 2001
+++ rb/drivers/scsi/aic7xxx_old.c	Tue May 15 21:44:16 2001
@@ -10100,7 +10100,7 @@
       } /* while(pdev=....) */
     } /* for PCI_DEVICES */
   } /* PCI BIOS present */
-#endif CONFIG_PCI
+#endif /* CONFIG_PCI */
 
 #if defined(__i386__) || defined(__alpha__)
   /*
diff -urN -X /linux/dontdiff linux/drivers/scsi/osst.c rb/drivers/scsi/osst.c
--- linux/drivers/scsi/osst.c	Thu Jan  4 16:00:55 2001
+++ rb/drivers/scsi/osst.c	Tue May 15 21:48:37 2001
@@ -3668,7 +3668,7 @@
 #if DEBUG
 		if (debugging)
 		    printk(OSST_DEB_MSG "osst%d: Locking drive door.\n", dev);
-#endif;
+#endif
 		break;
 
 	 case MTUNLOCK:
@@ -3678,7 +3678,7 @@
 #if DEBUG
 		if (debugging)
 		   printk(OSST_DEB_MSG "osst%d: Unlocking drive door.\n", dev);
-#endif;
+#endif
 	break;
 
 	 case MTSETBLK:           /* Set block length */
diff -urN -X /linux/dontdiff linux/drivers/scsi/scsi.c rb/drivers/scsi/scsi.c
--- linux/drivers/scsi/scsi.c	Thu May 17 11:38:31 2001
+++ rb/drivers/scsi/scsi.c	Thu May 17 11:35:30 2001
@@ -2357,7 +2357,7 @@
 	case MODULE_SCSI_CONST:
 	case MODULE_SCSI_IOCTL:
 		break;
-	default:
+	default:;
 	}
 	return;
 }
diff -urN -X /linux/dontdiff linux/drivers/scsi/sym53c8xx.c 
rb/drivers/scsi/sym53c8xx.c
--- linux/drivers/scsi/sym53c8xx.c	Sat Apr 28 18:13:52 2001
+++ rb/drivers/scsi/sym53c8xx.c	Tue May 15 21:47:56 2001
@@ -11563,7 +11563,7 @@
 out_clrack:
 	OUTL_DSP (NCB_SCRIPT_PHYS (np, clrack));
 	return;
-out_stuck:
+out_stuck:;
 }
 
 
diff -urN -X /linux/dontdiff linux/drivers/sound/gus_wave.c 
rb/drivers/sound/gus_wave.c
--- linux/drivers/sound/gus_wave.c	Sun Nov 12 23:35:35 2000
+++ rb/drivers/sound/gus_wave.c	Tue May 15 21:53:09 2001
@@ -2101,7 +2101,7 @@
 			restore_flags(flags);
 			break;
 
-		default:
+		default:;
 	}
 }
 
@@ -3281,7 +3281,7 @@
 		}
 		break;
 
-		default:
+		default:;
 	}
 	restore_flags(flags);
 }
@@ -3422,7 +3422,7 @@
 				}
 				break;
 
-			default:
+			default:;
 	}
 	status = gus_look8(0x49);	/*
 					 * Get Sampling IRQ Status
diff -urN -X /linux/dontdiff linux/drivers/sound/pss.c rb/drivers/sound/pss.c
--- linux/drivers/sound/pss.c	Sun Feb  4 13:05:29 2001
+++ rb/drivers/sound/pss.c	Tue May 15 21:49:53 2001
@@ -765,7 +765,7 @@
 			nonstandard_microcode = 0;
 			break;
 
-		default:
+		default:;
 	}
 	return 0;
 }
diff -urN -X /linux/dontdiff linux/drivers/sound/wavfront.c 
rb/drivers/sound/wavfront.c
--- linux/drivers/sound/wavfront.c	Fri Mar  2 14:12:11 2001
+++ rb/drivers/sound/wavfront.c	Tue May 15 21:52:02 2001
@@ -131,7 +131,7 @@
 #if    OSS_SUPPORT_LEVEL & OSS_SUPPORT_SEQ
 static int (*midi_load_patch) (int devno, int format, const char *addr,
 			       int offs, int count, int pmgr_flag) = NULL;
-#endif OSS_SUPPORT_SEQ
+#endif /* OSS_SUPPORT_SEQ */
 
 /* if WF_DEBUG not defined, no run-time debugging messages will
    be available via the debug flag setting. Given the current
@@ -279,7 +279,7 @@
         int fx_mididev;                    /* devno for FX MIDI interface */
 #if OSS_SUPPORT_LEVEL & OSS_SUPPORT_SEQ
 	int oss_dev;                      /* devno for OSS sequencer synth */
-#endif OSS_SUPPORT_SEQ
+#endif /* OSS_SUPPORT_SEQ */
 
 	char fw_version[2];                /* major = [0], minor = [1] */
 	char hw_version[2];                /* major = [0], minor = [1] */
@@ -2139,7 +2139,7 @@
 	bender:		midi_synth_bender,
 	setup_voice:	midi_synth_setup_voice
 };
-#endif OSS_SUPPORT_SEQ
+#endif /* OSS_SUPPORT_SEQ */
 
 #if OSS_SUPPORT_LEVEL & OSS_SUPPORT_STATIC_INSTALL
 
@@ -2158,7 +2158,7 @@
     (void) uninstall_wavefront ();
 }
 
-#endif OSS_SUPPORT_STATIC_INSTALL
+#endif /* OSS_SUPPORT_STATIC_INSTALL */
 
 /***********************************************************************/
 /* WaveFront: Linux modular sound kernel installation interface        */
@@ -2674,7 +2674,7 @@
 		    &wavefront_oss_load_patch;
 	}
 
-#endif OSS_SUPPORT_SEQ
+#endif /* OSS_SUPPORT_SEQ */
 	
 	/* Turn on Virtual MIDI, but first *always* turn it off,
 	   since otherwise consectutive reloads of the driver will
@@ -2852,14 +2852,14 @@
 	} else {
 		synth_devs[dev.oss_dev] = &wavefront_operations;
 	}
-#endif OSS_SUPPORT_SEQ
+#endif /* OSS_SUPPORT_SEQ */
 
 	if (wavefront_init (1) < 0) {
 		printk (KERN_WARNING LOGNAME "initialization failed.\n");
 
 #if OSS_SUPPORT_LEVEL & OSS_SUPPORT_SEQ
 		sound_unload_synthdev (dev.oss_dev);
-#endif OSS_SUPPORT_SEQ
+#endif /* OSS_SUPPORT_SEQ */
 
 		return -1;
 	}
@@ -2890,7 +2890,7 @@
 
 #if OSS_SUPPORT_LEVEL & OSS_SUPPORT_SEQ
 	sound_unload_synthdev (dev.oss_dev);
-#endif OSS_SUPPORT_SEQ
+#endif /* OSS_SUPPORT_SEQ */
 	uninstall_wf_mpu ();
 }
 
diff -urN -X /linux/dontdiff linux/drivers/sound/wf_midi.c 
rb/drivers/sound/wf_midi.c
--- linux/drivers/sound/wf_midi.c	Sun Sep 17 11:45:07 2000
+++ rb/drivers/sound/wf_midi.c	Tue May 15 21:52:35 2001
@@ -230,7 +230,7 @@
 			case 0xfc:
 				break;
 		    
-			default:
+			default:;
 			}
 		} else {
 			mi->m_prev_status = midic;
diff -urN -X /linux/dontdiff linux/drivers/sound/yss225.h 
rb/drivers/sound/yss225.h
--- linux/drivers/sound/yss225.h	Sat Jul 18 16:11:41 1998
+++ rb/drivers/sound/yss225.h	Tue May 15 21:52:27 2001
@@ -20,5 +20,5 @@
 extern unsigned char coefficients3[404];
 
 
-#endif __ys225_h__
+#endif /* __ys225_h__ */
 
diff -urN -X /linux/dontdiff linux/drivers/usb/net1080.c 
rb/drivers/usb/net1080.c
--- linux/drivers/usb/net1080.c	Thu Jan  4 16:15:32 2001
+++ rb/drivers/usb/net1080.c	Tue May 15 21:53:41 2001
@@ -589,7 +589,7 @@
 	}
 #ifdef	VERBOSE
 	dbg ("no read resubmitted");
-#endif	VERBOSE
+#endif	/* VERBOSE */
 }
 
 /*-------------------------------------------------------------------------*/
diff -urN -X /linux/dontdiff linux/fs/nfs/flushd.c rb/fs/nfs/flushd.c
--- linux/fs/nfs/flushd.c	Sat Apr 28 18:13:59 2001
+++ rb/fs/nfs/flushd.c	Wed May 16 12:00:42 2001
@@ -174,7 +174,7 @@
 	 */
 	NFS_FLAGS(inode) |= NFS_INO_FLUSH;
 	atomic_inc(&inode->i_count);
- out:
+ out:;
 }
 
 /* Protect me using the BKL */
diff -urN -X /linux/dontdiff linux/fs/nfsd/nfssvc.c rb/fs/nfsd/nfssvc.c
--- linux/fs/nfsd/nfssvc.c	Thu Mar 15 12:56:07 2001
+++ rb/fs/nfsd/nfssvc.c	Wed May 16 12:01:46 2001
@@ -253,7 +253,7 @@
 		return 0;
 	case RC_REPLY:
 		return 1;
-	case RC_DOIT:
+	case RC_DOIT:;
 		/* do it */
 	}
 
diff -urN -X /linux/dontdiff linux/fs/sysv/inode.c rb/fs/sysv/inode.c
--- linux/fs/sysv/inode.c	Sat Apr 28 18:14:01 2001
+++ rb/fs/sysv/inode.c	Tue May 15 21:54:50 2001
@@ -442,7 +442,7 @@
 			brelse(bh);
 			printk("SysV FS: cannot read superblock in %d byte mode\n", 
sb->sv_block_size);
 			goto failed;
-		superblock_ok:
+		superblock_ok:;
 		}
 	} else {
 		/* Switch to 512 block size. Unfortunately, we have to
diff -urN -X /linux/dontdiff linux/include/asm-i386/mca_dma.h 
rb/include/asm-i386/mca_dma.h
--- linux/include/asm-i386/mca_dma.h	Tue May 15 14:37:21 2001
+++ rb/include/asm-i386/mca_dma.h	Wed May 16 09:57:23 2001
@@ -199,4 +199,4 @@
 	outb(mode, MCA_DMA_REG_EXE);
 }
 
-#endif MCA_DMA_H
+#endif /* MCA_DMA_H */
diff -urN -X /linux/dontdiff linux/include/asm-i386/rwsem.h 
rb/include/asm-i386/rwsem.h
--- linux/include/asm-i386/rwsem.h	Tue May 15 11:24:27 2001
+++ rb/include/asm-i386/rwsem.h	Wed May 16 09:04:46 2001
@@ -148,9 +148,9 @@
  */
 static inline void __up_read(struct rw_semaphore *sem)
 {
-	__s32 tmp = -RWSEM_ACTIVE_READ_BIAS;
 	__asm__ __volatile__(
 		"# beginning __up_read\n\t"
+		"  movl      %2,%%edx\n\t"
 LOCK_PREFIX	"  xadd      %%edx,(%%eax)\n\t" /* subtracts 1, returns the old 
value */
 		"  js        2f\n\t" /* jump if the lock is being waited upon */
 		"1:\n\t"
@@ -164,9 +164,9 @@
 		"  jmp       1b\n"
 		".previous\n"
 		"# ending __up_read\n"
-		: "+m"(sem->count), "+d"(tmp)
-		: "a"(sem)
-		: "memory", "cc");
+		: "+m"(sem->count)
+		: "a"(sem), "i"(-RWSEM_ACTIVE_READ_BIAS)
+		: "memory", "cc", "edx");
 }
 
 /*
diff -urN -X /linux/dontdiff linux/include/linux/coda_cache.h 
rb/include/linux/coda_cache.h
--- linux/include/linux/coda_cache.h	Tue Sep 19 17:08:59 2000
+++ rb/include/linux/coda_cache.h	Tue May 15 21:54:28 2001
@@ -19,4 +19,4 @@
 /* for downcalls and attributes and lookups */
 void coda_flag_inode_children(struct inode *inode, int flag);
 
-#endif _CFSNC_HEADER_
+#endif /* _CFSNC_HEADER_ */
diff -urN -X /linux/dontdiff linux/net/ipv4/netfilter/ipfwadm_core.c 
rb/net/ipv4/netfilter/ipfwadm_core.c
--- linux/net/ipv4/netfilter/ipfwadm_core.c	Fri Aug  4 20:18:49 2000
+++ rb/net/ipv4/netfilter/ipfwadm_core.c	Tue May 15 21:55:39 2001
@@ -515,7 +515,7 @@
 			}
 			continue;	/* Mismatch */
 
-		ifa_ok:
+		ifa_ok:;
 		}
 
 		/*
diff -urN -X /linux/dontdiff linux/net/ipv4/netfilter/ipt_REJECT.c 
rb/net/ipv4/netfilter/ipt_REJECT.c
--- linux/net/ipv4/netfilter/ipt_REJECT.c	Sat Apr 28 18:14:09 2001
+++ rb/net/ipv4/netfilter/ipt_REJECT.c	Tue May 15 21:55:13 2001
@@ -310,7 +310,7 @@
 	case IPT_TCP_RESET:
 		send_reset(*pskb, hooknum == NF_IP_LOCAL_IN);
 		break;
-	case IPT_ICMP_ECHOREPLY:
+	case IPT_ICMP_ECHOREPLY:;
 		/* Doesn't happen. */
 	}
 
diff -urN -X /linux/dontdiff linux/net/khttpd/security.h 
rb/net/khttpd/security.h
--- linux/net/khttpd/security.h	Wed Aug 18 11:45:10 1999
+++ rb/net/khttpd/security.h	Tue May 15 21:55:52 2001
@@ -9,4 +9,5 @@
 	char value[32-sizeof(void*)];  /* fill 1 cache-line */
 };
 
-#endif
\ No newline at end of file
+#endif
+
diff -urN -X /linux/dontdiff linux/net/sched/sch_cbq.c rb/net/sched/sch_cbq.c
--- linux/net/sched/sch_cbq.c	Sun Mar 25 21:14:25 2001
+++ rb/net/sched/sch_cbq.c	Thu May 17 12:42:41 2001
@@ -281,7 +281,7 @@
 			return cbq_reclassify(skb, cl);
 		case TC_POLICE_SHOT:
 			return NULL;
-		default:
+		default:;
 		}
 #endif
 		if (cl->level == 0)

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

end of thread, other threads:[~2001-05-18  4:45 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2001-05-17 19:49 [PATCH] 2.4.5pre3 warning fixes Bingner Sam J. Contractor RSIS
2001-05-17 21:21 ` Alan Cox
2001-05-18  4:44 ` Albert D. Cahalan
  -- strict thread matches above, loose matches on Subject: below --
2001-05-17 19:33 Rich Baum
2001-05-17 19:40 ` Alan Cox
2001-05-17 19:48 ` Jeff Garzik
2001-05-17 20:01 ` Mohammad A. Haque

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).