remove some more check_region stuff
Subsystems (5)
PATCH 1/1 remove some more check_region stuff
Removed some more references to check_region().
I checked these changes into the 'checkreg' branch of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6.git
The only valid references remaining are in:drivers/scsi/advansys.cdrivers/scsi/BusLogic.cdrivers/cdrom/sbpcd.csound/oss/pss.c
Patch included since kernel.org mirroring is taking >24 hours currently.
Documentation/i2c/writing-clients | 1 arch/ppc/platforms/hdpu.c | 5 arch/sparc/kernel/pcic.c | 4 drivers/char/specialix.c | 342 ++++++++++++++++++-------------------- drivers/net/eepro.c | 50 ++--- include/asm-m68k/sun3xflop.h | 2 include/asm-m68knommu/ide.h | 7 include/asm-parisc/ide.h | 1 include/asm-sparc/floppy.h | 2 sound/oss/cs4232.c | 6 sound/oss/wavfront.c | 38 +++- 11 files changed, 230 insertions(+), 228 deletions(-)
Jeff Garzik:
Remove last vestiges of ide_check_region() drivers/char/specialix: trim trailing whitespace drivers/char/specialix: eliminate use of check_region() Remove outdated and unused references to check_region() [sound oss] remove check_region() usage from cs4232, wavfront [netdrvr eepro] trim trailing whitespace
[netdrvr eepro] remove check_region() usage
Documentation/i2c/writing-clients +1 -0
@@ -275,6 +275,7 @@ For now, you can ignore the `flags' para if (is_isa) { /* Discard immediately if this ISA range is already used */ + /* FIXME: never use check_region(), only request_region() */ if (check_region(address,FOO_EXTENT)) goto ERROR0;
arch/ppc/platforms/hdpu.c +0 -5
@@ -609,11 +609,6 @@ static void parse_bootinfo(unsigned long }#if defined(CONFIG_BLK_DEV_IDE ) || defined(CONFIG_BLK_DEV_IDE_MODULE ) -static int hdpu_ide_check_region (ide_ioreg_t from,unsigned int extent) -{ -return check_region (from, extent); -} -static void hdpu_ide_request_region (ide_ioreg_t from,unsigned int extent,const char *name) {
arch/sparc/kernel/pcic.c +2 -2
@@ -497,8 +497,8 @@ static void pcic_map_pci_device(struct l* CheerIO makes a similar conversion. * See ebus.c for details. * -* Note that check_region()/request_region() -* work for these devices. +* Note that request_region() +* works for these devices. * * XXX Neat trick, but it's a *bad* idea * to shit into regions like that.
drivers/char/specialix.c +170 -172
1,038 lines not on this page · raw message
drivers/net/eepro.c +26 -24
156 lines not on this page · raw message
include/asm-m68k/sun3xflop.h +0 -2
@@ -27,10 +27,8 @@/* We don't need no stinkin' I/O port allocation crap. */ #undef release_region -#undef check_region#undef request_region#define release_region (X ,Y ) do { } while(0) -#define check_region (X ,Y ) (0)#define request_region (X ,Y ,Z ) (1)struct sun3xflop_private {
include/asm-m68knommu/ide.h +0 -7
@@ -163,13 +163,6 @@ ide_free_irq(unsigned int irq, void *dev } -static IDE_INLINE int -ide_check_region (ide_ioreg_t from,unsigned int extent) -{ -return 0 ; -} - - static IDE_INLINE voidide_request_region (ide_ioreg_t from,unsigned int extent,const char *name) {
include/asm-parisc/ide.h +0 -1
@@ -22,7 +22,6 @@#define ide_request_irq (irq,hand,flg,dev,id) request_irq((irq),(hand),(flg),(dev),(id))#define ide_free_irq (irq,dev_id) free_irq((irq), (dev_id)) -#define ide_check_region (from,extent) check_region((from), (extent))#define ide_request_region (from,extent,name) request_region((from), (extent), (name))#define ide_release_region (from,extent) release_region((from), (extent))/* Generic I/O and MEMIO string operations. */
include/asm-sparc/floppy.h +0 -2
@@ -17,10 +17,8 @@/* We don't need no stinkin' I/O port allocation crap. */ #undef release_region -#undef check_region#undef request_region#define release_region (X ,Y ) do { } while(0) -#define check_region (X ,Y ) (0)#define request_region (X ,Y ,Z ) (1)/* References:
sound/oss/cs4232.c +4 -2
@@ -195,10 +195,12 @@ static int __init probe_cs4232(struct adCS_OUT2 (0x15 ,0x00 );/* Select logical device 0 (WSS/SB/FM) */ CS_OUT3 (0x47 , (base >>8 ) &0xff , base &0xff );/* WSS base */ -if (check_region (0x388 ,4 ))/* Not free */ +if (!request_region (0x388 ,4 ,"FM" ))/* Not free */ CS_OUT3(0x48, 0x00, 0x00) /* FM base off */ - else + else { +release_region (0x388 ,4 );CS_OUT3 (0x48 ,0x03 ,0x88 );/* FM base 0x388 */ + }CS_OUT3 (0x42 ,0x00 ,0x00 );/* SB base off */ CS_OUT2 (0x22 , irq);/* SB+WSS IRQ */
sound/oss/wavfront.c +27 -11
@@ -2434,7 +2434,7 @@ static int __init detect_wavefront (intconsumes 16. */ -if (check_region (io_base,16 )) { +if (!request_region (io_base,16 ,"wavfront" )) { printk (KERN_ERR LOGNAME "IO address range 0x%x - 0x%x ""already in use - ignored\n" , dev.base, dev.base+15);
@@ -2466,10 +2466,13 @@ static int __init detect_wavefront (int }else { printk (KERN_WARNING LOGNAME "not raw, but no " "hardware version!\n"); +release_region (io_base,16 );return 0 ; }if (!wf_raw) { +/* will re-acquire region in install_wavefront() */ +release_region (io_base,16 );return 1 ; }else { printk (KERN_INFO LOGNAME
@@ -2489,6 +2492,7 @@ static int __init detect_wavefront (intif (wavefront_hw_reset ()) { printk (KERN_WARNING LOGNAME "hardware reset failed\n"); +release_region (io_base,16 );return 0 ; }
@@ -2496,6 +2500,8 @@ static int __init detect_wavefront (int dev.has_fx = (detect_wffx () ==0 ); +/* will re-acquire region in install_wavefront() */ +release_region (io_base,16 );return 1 ; }
@@ -2804,17 +2810,27 @@ static int __init wavefront_init (int at }static int __init install_wavefront (void ) - { +if (!request_region (dev.base+2 ,6 ,"wavefront synth" )) +return -1 ; + +if (dev.has_fx) { +if (!request_region (dev.base+8 ,8 ,"wavefront fx" )) { +release_region (dev.base+2 ,6 ); +return -1 ; + } + } +if ((dev.synth_dev =register_sound_synth (&wavefront_fops,-1 )) <0 ) { printk (KERN_ERR LOGNAME "cannot register raw synth\n"); -return -1 ; + goto err_out; }#if OSS_SUPPORT_LEVEL &OSS_SUPPORT_SEQ if ((dev.oss_dev =sound_alloc_synthdev ()) ==-1 ) { printk (KERN_ERR LOGNAME "Too many sequencers\n"); -return -1 ; +/* FIXME: leak: should unregister sound synth */ + goto err_out; }else { synth_devs[dev.oss_dev] = &wavefront_operations; }
@@ -2827,20 +2843,20 @@ static int __init install_wavefront (voisound_unload_synthdev (dev.oss_dev);#endif /* OSS_SUPPORT_SEQ */ -return -1 ; + goto err_out; } -request_region (dev.base+2 ,6 ,"wavefront synth" ); - -if (dev.has_fx) { -request_region (dev.base+8 ,8 ,"wavefront fx" ); - } -if (wavefront_config_midi ()) { printk (KERN_WARNING LOGNAME "could not initialize MIDI.\n"); }return dev.oss_dev; + +err_out: +release_region (dev.base+2 ,6 ); +if (dev.has_fx) +release_region (dev.base+8 ,8 ); +return -1 ; } static void __exit uninstall_wavefront (void)