warning fixes for 2.4.5pre5
Subsystems (10)
PATCH 1/1 warning fixes for 2.4.5pre5
Here is a patch that fixes warnings when using gcc 3.0 snapshots to compile the kernel. Most of these warnings are for labels at the end of compound statements and extra tokens at the end of #endifs. The patch for linux/drivers/usb/pwc-uncompress.c adds includes to fix warnings where kmalloc(), kfree(), and EXPORT_SYMBOL_NONVERS() implicity declared.
This patch has been tested and the code does compile.
Rich
diff -urN -X /linux/dontdiff linux/arch/i386/math-emu/fpu_trig.c rb/arch/i386/math-emu/fpu_trig.c
arch/i386/math-emu/fpu_trig.c +1 -0
@@ -1543,6 +1543,7 @@EXCEPTION (EX_INTERNAL |0x116 );return ;#endif /* PARANOID */ +return ; } }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
drivers/atm/fore200e.c +1 -0
@@ -439,6 +439,7 @@case FORE200E_STATE_BLANK :/* nothing to do for that state */ +break ; } }
diff -urN -X /linux/dontdiff linux/drivers/cdrom/sbpcd.c rb/drivers/cdrom/sbpcd.c
drivers/cdrom/sbpcd.c +0 -0
@@ -1118,7 +1118,7 @@return (0 ); }/*==========================================================================*
/
-#endif 00000
+#endif /* 00000 */
/*==========================================================================*
/
static int ResponseInfo(void)
{
diff -urN -X /linux/dontdiff linux/drivers/media/video/tuner.c rb/drivers/media/video/tuner.c
drivers/media/video/tuner.c +1 -0
@@ -558,6 +558,7 @@#endif default :/* nothing */ +break ; }return 0 ;
diff -urN -X /linux/dontdiff linux/drivers/net/tokenring/ibmtr.c rb/drivers/net/tokenring/ibmtr.c
drivers/net/tokenring/ibmtr.c +1 -1
@@ -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
drivers/net/wan/hdlc.c +3 -1
@@ -1082,7 +1082,9 @@ }break ; -default :/* to be defined */ +default : +/* to be defined */ +break ; }dev_kfree_skb (skb);
diff -urN -X /linux/dontdiff linux/drivers/net/wan/sdla_fr.c rb/drivers/net/wan/sdla_fr.c
drivers/net/wan/sdla_fr.c +2 -1
@@ -4435,7 +4435,8 @@trigger_fr_poll (dev);break ; -default :// ARP's and RARP's -- Shouldn't happen. +default : +break ;// 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
drivers/net/wan/sdla_x25.c +1 -1
@@ -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
drivers/scsi/NCR53c406a.c +1 -1
@@ -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 */
@@ -512,7 +512,7 @@
}
}
}-#endif PORT_BASE
+#endif /* PORT_BASE */
if(!port_base){ /* no ports found */
printk("NCR53c406a: no available ports found\n");
@@ -550,7 +550,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"));
@@ -565,7 +565,7 @@
}
DEB(printk("Allocated DMA channel %d\n", dma_chan));-#endif USE_DMA
+#endif /* USE_DMA */
tpnt->present = 1;
tpnt->proc_name = "NCR53c406a";
@@ -820,8 +820,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);
@@ -840,7 +840,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");
@@ -885,7 +885,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 */
@@ -900,7 +900,7 @@
}
}
REG0;
-#endif USE_PIO
+#endif /* USE_PIO */
}
break;@@ -914,7 +914,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 */
@@ -929,7 +929,7 @@
}
}
REG0;
-#endif USE_PIO
+#endif /* USE_PIO */
}
break;@@ -1011,7 +1011,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
drivers/scsi/aic7xxx_old.c +1 -1
@@ -10100,7 +10100,7 @@ } /* while(pdev=....) */ }/* for PCI_DEVICES */ }/* PCI BIOS present */ -#endif CONFIG_PCI +#endif /* CONFIG_PCI */ #if defined(__i386__) || defined(__alpha__)/*
drivers/scsi/osst.c +2 -2
@@ -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 */
drivers/scsi/scsi.c +1 -0
@@ -2358,6 +2358,7 @@case MODULE_SCSI_IOCTL :break ;default : +break ; }return ; }
diff -urN -X /linux/dontdiff linux/drivers/scsi/sym53c8xx.c rb/drivers/scsi/sym53c8xx.c
drivers/scsi/sym53c8xx.c +1 -0
@@ -11564,6 +11564,7 @@OUTL_DSP (NCB_SCRIPT_PHYS (np, clrack));return ; out_stuck: +return ; }
diff -urN -X /linux/dontdiff linux/drivers/sound/gus_wave.c rb/drivers/sound/gus_wave.c
drivers/sound/gus_wave.c +3 -0
@@ -2102,6 +2102,7 @@break ;default : +break ; } }
@@ -3282,6 +3283,7 @@break ;default : +break ; }restore_flags (flags); }
@@ -3423,6 +3425,7 @@break ;default : +break ; } status =gus_look8 (0x49 );/* * Get Sampling IRQ Status
drivers/sound/pss.c +1 -0
@@ -766,6 +766,7 @@break ;default : +break ; }return 0 ; }
diff -urN -X /linux/dontdiff linux/drivers/sound/wavfront.c rb/drivers/sound/wavfront.c
drivers/sound/wavfront.c +8 -8
@@ -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
drivers/sound/wf_midi.c +1 -0
@@ -231,6 +231,7 @@break ;default : +break ; } }else { mi->m_prev_status = midic;
diff -urN -X /linux/dontdiff linux/drivers/sound/ymfpci.c rb/drivers/sound/ymfpci.c
drivers/sound/ymfpci.c +1 -0
@@ -1829,6 +1829,7 @@* for instance we get SNDCTL_TMR_CONTINUE here. * XXX Is there sound_generic_ioctl() around? */ +break ; }return -ENOTTY ; }
diff -urN -X /linux/dontdiff linux/drivers/sound/yss225.h rb/drivers/sound/yss225.h
drivers/sound/yss225.h +1 -1
@@ -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
drivers/usb/net1080.c +1 -1
@@ -599,7 +599,7 @@ }#ifdef VERBOSE dbg ("no read resubmitted" ); -#endif VERBOSE +#endif /* VERBOSE */ }/*-------------------------------------------------------------------------*/
diff -urN -X /linux/dontdiff linux/drivers/usb/pwc-uncompress.c rb/drivers/usb/pwc-uncompress.c
drivers/usb/pwc-uncompress.c +2 -0
@@ -25,6 +25,8 @@#include "vcvt.h" #include "pwc.h" #include "pwc-uncompress.h" +#include <linux/module.h> +#include <linux/slab.h> /* This contains a list of all registered decompressors */
fs/sysv/inode.c +0 -0
@@ -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
include/asm-i386/mca_dma.h +1 -1
@@ -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/linux/coda_cache.h rb/include/linux/coda_cache.h
include/linux/coda_cache.h +1 -1
@@ -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
net/ipv4/netfilter/ipfwadm_core.c +1 -1
@@ -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
net/ipv4/netfilter/ipt_REJECT.c +1 -0
@@ -312,6 +312,7 @@break ;case IPT_ICMP_ECHOREPLY :/* Doesn't happen. */ +break ; }return NF_DROP ;
diff -urN -X /linux/dontdiff linux/net/khttpd/security.h rb/net/khttpd/security.h
net/khttpd/security.h +2 -1
@@ -9,4 +9,5 @@ char value[32-sizeof(void*)]; /* fill 1 cache-line */ }; -#endif +#endif +
net/sched/sch_cbq.c +1 -0
@@ -282,6 +282,7 @@case TC_POLICE_SHOT :return NULL ;default : + break; }#endif if (cl->level ==0 )
Hi
arch/i386/math-emu/fpu_trig.c line 1549
Quoted 10 lines
arch/i386/math-emu/fpu_trig.c +1
-0@@ -1543,6 +1543,7 @@EXCEPTION (EX_INTERNAL |0x116 );return ;#endif /* PARANOID */ +return ; } }else if ( (st0_tag == TAG_Valid) || (st0_tag == TW_Denormal) )
Will not be better to move the return out of the #endif PARANOID? Otherwise you get 2 returns when you have defined paranoid ...
Quoted 8 lines
drivers/scsi/sym53c8xx.c +0
-0@@ -11564,6 +11564,7 @@OUTL_DSP (NCB_SCRIPT_PHYS (np, clrack));return ;
out_stuck:drivers/scsi/sym53c8xx.c +1
-0+return ;}
same
Later,Juan.
Signature · 2 lines
In theory, practice and theory are the same, but in practice they are different -- Larry McVoy
Quoted 3 lines
statements and extra tokens at the end of #endifs. The patch for
linux/drivers/usb/pwc-uncompress.cadds includes to fix warnings wherekmalloc(),kfree(), andEXPORT_SYMBOL_NONVERS()implicity declared.
The pwc-uncompress stuff wants ignoring and the -ac fixes picking up that also clean up the other bits. I'll send that to Linus shortly
arch/i386/math-emu/fpu_trig.c line 1546
Quoted 13 lines
This patch has been tested and the code does compile.
Rich
diff -urN -X /linux/dontdiff
linux/arch/i386/math-emu/fpu_trig.crb/arch/i386/math-emu/fpu_trig.carch/i386/math-emu/fpu_trig.c +1
-0@@ -1543,6 +1543,7 @@EXCEPTION (EX_INTERNAL |0x116 );return ;#endif /* PARANOID */ +return ;
This seems to be a change in behaviour. Have you done a glibc fpu test on the changes ?
Quoted 4 lines · Alan Cox
Quoted 4 lines
This patch has been tested and the code does compile.
Rich
Quoted 12 lines
arch/i386/math-emu/fpu_trig.c line 1546
Quoted 9 lines
diff -urN -X /linux/dontdiff
linux/arch/i386/math-emu/fpu_trig.crb/arch/i386/math-emu/fpu_trig.carch/i386/math-emu/fpu_trig.c +1
-0@@ -1543,6 +1543,7 @@EXCEPTION (EX_INTERNAL |0x116 );return ;#endif /* PARANOID */ +return ;This seems to be a change in behaviour. Have you done a glibc fpu test on the changes ?
I used objdump on the fpu_trig.o files in both trees and they do differ. When I use break instead of return in my tree the two files are the same. Here is a revised patch that fixes the warning and produces the same assembly code code as the version in Linus' tree.
diff -urN -X /linux/dontdiff linux/arch/i386/math-emu/fpu_trig.c rb/arch/i386/math-emu/fpu_trig.c
arch/i386/math-emu/fpu_trig.c +1 -0
@@ -1543,6 +1543,7 @@EXCEPTION (EX_INTERNAL |0x116 );return ;#endif /* PARANOID */ +break ;