[PATCH] 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.c drivers/scsi/BusLogic.c drivers/cdrom/sbpcd.c sound/oss/pss.c 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 Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
34ad92c238
commit
d61780c0d3
|
@ -273,6 +273,7 @@ For now, you can ignore the `flags' parameter. It is there for future use.
|
||||||
if (is_isa) {
|
if (is_isa) {
|
||||||
|
|
||||||
/* Discard immediately if this ISA range is already used */
|
/* Discard immediately if this ISA range is already used */
|
||||||
|
/* FIXME: never use check_region(), only request_region() */
|
||||||
if (check_region(address,FOO_EXTENT))
|
if (check_region(address,FOO_EXTENT))
|
||||||
goto ERROR0;
|
goto ERROR0;
|
||||||
|
|
||||||
|
|
|
@ -609,11 +609,6 @@ static void parse_bootinfo(unsigned long r3,
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE)
|
#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
|
static void
|
||||||
hdpu_ide_request_region(ide_ioreg_t from, unsigned int extent, const char *name)
|
hdpu_ide_request_region(ide_ioreg_t from, unsigned int extent, const char *name)
|
||||||
{
|
{
|
||||||
|
|
|
@ -497,8 +497,8 @@ static void pcic_map_pci_device(struct linux_pcic *pcic,
|
||||||
* CheerIO makes a similar conversion.
|
* CheerIO makes a similar conversion.
|
||||||
* See ebus.c for details.
|
* See ebus.c for details.
|
||||||
*
|
*
|
||||||
* Note that check_region()/request_region()
|
* Note that request_region()
|
||||||
* work for these devices.
|
* works for these devices.
|
||||||
*
|
*
|
||||||
* XXX Neat trick, but it's a *bad* idea
|
* XXX Neat trick, but it's a *bad* idea
|
||||||
* to shit into regions like that.
|
* to shit into regions like that.
|
||||||
|
|
|
@ -338,17 +338,11 @@ static inline void sx_wait_CCR_off(struct specialix_board * bp)
|
||||||
* specialix IO8+ IO range functions.
|
* specialix IO8+ IO range functions.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static inline int sx_check_io_range(struct specialix_board * bp)
|
static inline int sx_request_io_range(struct specialix_board * bp)
|
||||||
{
|
{
|
||||||
return check_region (bp->base, SX_IO_SPACE);
|
return request_region(bp->base,
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
static inline void sx_request_io_range(struct specialix_board * bp)
|
|
||||||
{
|
|
||||||
request_region(bp->base,
|
|
||||||
bp->flags & SX_BOARD_IS_PCI ? SX_PCI_IO_SPACE : SX_IO_SPACE,
|
bp->flags & SX_BOARD_IS_PCI ? SX_PCI_IO_SPACE : SX_IO_SPACE,
|
||||||
"specialix IO8+" );
|
"specialix IO8+") == NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -495,7 +489,7 @@ static int sx_probe(struct specialix_board *bp)
|
||||||
|
|
||||||
func_enter();
|
func_enter();
|
||||||
|
|
||||||
if (sx_check_io_range(bp)) {
|
if (sx_request_io_range(bp)) {
|
||||||
func_exit();
|
func_exit();
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
@ -513,6 +507,7 @@ static int sx_probe(struct specialix_board *bp)
|
||||||
if ((val1 != 0x5a) || (val2 != 0xa5)) {
|
if ((val1 != 0x5a) || (val2 != 0xa5)) {
|
||||||
printk(KERN_INFO "sx%d: specialix IO8+ Board at 0x%03x not found.\n",
|
printk(KERN_INFO "sx%d: specialix IO8+ Board at 0x%03x not found.\n",
|
||||||
board_No(bp), bp->base);
|
board_No(bp), bp->base);
|
||||||
|
sx_release_io_range(bp);
|
||||||
func_exit();
|
func_exit();
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
@ -532,6 +527,7 @@ static int sx_probe(struct specialix_board *bp)
|
||||||
if (val1 != val2) {
|
if (val1 != val2) {
|
||||||
printk(KERN_INFO "sx%d: specialix IO8+ ID %02x at 0x%03x not found (%02x).\n",
|
printk(KERN_INFO "sx%d: specialix IO8+ ID %02x at 0x%03x not found (%02x).\n",
|
||||||
board_No(bp), val2, bp->base, val1);
|
board_No(bp), val2, bp->base, val1);
|
||||||
|
sx_release_io_range(bp);
|
||||||
func_exit();
|
func_exit();
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
@ -569,6 +565,7 @@ static int sx_probe(struct specialix_board *bp)
|
||||||
if (irqs <= 0) {
|
if (irqs <= 0) {
|
||||||
printk(KERN_ERR "sx%d: Can't find IRQ for specialix IO8+ board at 0x%03x.\n",
|
printk(KERN_ERR "sx%d: Can't find IRQ for specialix IO8+ board at 0x%03x.\n",
|
||||||
board_No(bp), bp->base);
|
board_No(bp), bp->base);
|
||||||
|
sx_release_io_range(bp);
|
||||||
func_exit();
|
func_exit();
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
@ -579,8 +576,9 @@ static int sx_probe(struct specialix_board *bp)
|
||||||
#endif
|
#endif
|
||||||
/* Reset CD186x again */
|
/* Reset CD186x again */
|
||||||
if (!sx_init_CD186x(bp)) {
|
if (!sx_init_CD186x(bp)) {
|
||||||
|
sx_release_io_range(bp);
|
||||||
func_exit();
|
func_exit();
|
||||||
return -EIO;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
sx_request_io_range(bp);
|
sx_request_io_range(bp);
|
||||||
|
|
|
@ -552,8 +552,7 @@ static int __init do_eepro_probe(struct net_device *dev)
|
||||||
{
|
{
|
||||||
unsigned short int WS[32]=WakeupSeq;
|
unsigned short int WS[32]=WakeupSeq;
|
||||||
|
|
||||||
if (check_region(WakeupPort, 2)==0) {
|
if (request_region(WakeupPort, 2, "eepro wakeup")) {
|
||||||
|
|
||||||
if (net_debug>5)
|
if (net_debug>5)
|
||||||
printk(KERN_DEBUG "Waking UP\n");
|
printk(KERN_DEBUG "Waking UP\n");
|
||||||
|
|
||||||
|
@ -563,7 +562,10 @@ static int __init do_eepro_probe(struct net_device *dev)
|
||||||
outb_p(WS[i],WakeupPort);
|
outb_p(WS[i],WakeupPort);
|
||||||
if (net_debug>5) printk(KERN_DEBUG ": %#x ",WS[i]);
|
if (net_debug>5) printk(KERN_DEBUG ": %#x ",WS[i]);
|
||||||
}
|
}
|
||||||
} else printk(KERN_WARNING "Checkregion Failed!\n");
|
|
||||||
|
release_region(WakeupPort, 2);
|
||||||
|
} else
|
||||||
|
printk(KERN_WARNING "PnP wakeup region busy!\n");
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -27,10 +27,8 @@
|
||||||
|
|
||||||
/* We don't need no stinkin' I/O port allocation crap. */
|
/* We don't need no stinkin' I/O port allocation crap. */
|
||||||
#undef release_region
|
#undef release_region
|
||||||
#undef check_region
|
|
||||||
#undef request_region
|
#undef request_region
|
||||||
#define release_region(X, Y) do { } while(0)
|
#define release_region(X, Y) do { } while(0)
|
||||||
#define check_region(X, Y) (0)
|
|
||||||
#define request_region(X, Y, Z) (1)
|
#define request_region(X, Y, Z) (1)
|
||||||
|
|
||||||
struct sun3xflop_private {
|
struct sun3xflop_private {
|
||||||
|
|
|
@ -163,13 +163,6 @@ ide_free_irq(unsigned int irq, void *dev_id)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static IDE_INLINE int
|
|
||||||
ide_check_region(ide_ioreg_t from, unsigned int extent)
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
static IDE_INLINE void
|
static IDE_INLINE void
|
||||||
ide_request_region(ide_ioreg_t from, unsigned int extent, const char *name)
|
ide_request_region(ide_ioreg_t from, unsigned int extent, const char *name)
|
||||||
{
|
{
|
||||||
|
|
|
@ -22,7 +22,6 @@
|
||||||
|
|
||||||
#define ide_request_irq(irq,hand,flg,dev,id) request_irq((irq),(hand),(flg),(dev),(id))
|
#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_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_request_region(from,extent,name) request_region((from), (extent), (name))
|
||||||
#define ide_release_region(from,extent) release_region((from), (extent))
|
#define ide_release_region(from,extent) release_region((from), (extent))
|
||||||
/* Generic I/O and MEMIO string operations. */
|
/* Generic I/O and MEMIO string operations. */
|
||||||
|
|
|
@ -17,10 +17,8 @@
|
||||||
|
|
||||||
/* We don't need no stinkin' I/O port allocation crap. */
|
/* We don't need no stinkin' I/O port allocation crap. */
|
||||||
#undef release_region
|
#undef release_region
|
||||||
#undef check_region
|
|
||||||
#undef request_region
|
#undef request_region
|
||||||
#define release_region(X, Y) do { } while(0)
|
#define release_region(X, Y) do { } while(0)
|
||||||
#define check_region(X, Y) (0)
|
|
||||||
#define request_region(X, Y, Z) (1)
|
#define request_region(X, Y, Z) (1)
|
||||||
|
|
||||||
/* References:
|
/* References:
|
||||||
|
|
|
@ -195,10 +195,12 @@ static int __init probe_cs4232(struct address_info *hw_config, int isapnp_config
|
||||||
CS_OUT2(0x15, 0x00); /* Select logical device 0 (WSS/SB/FM) */
|
CS_OUT2(0x15, 0x00); /* Select logical device 0 (WSS/SB/FM) */
|
||||||
CS_OUT3(0x47, (base >> 8) & 0xff, base & 0xff); /* WSS base */
|
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 */
|
CS_OUT3(0x48, 0x00, 0x00) /* FM base off */
|
||||||
else
|
else {
|
||||||
|
release_region(0x388, 4);
|
||||||
CS_OUT3(0x48, 0x03, 0x88); /* FM base 0x388 */
|
CS_OUT3(0x48, 0x03, 0x88); /* FM base 0x388 */
|
||||||
|
}
|
||||||
|
|
||||||
CS_OUT3(0x42, 0x00, 0x00); /* SB base off */
|
CS_OUT3(0x42, 0x00, 0x00); /* SB base off */
|
||||||
CS_OUT2(0x22, irq); /* SB+WSS IRQ */
|
CS_OUT2(0x22, irq); /* SB+WSS IRQ */
|
||||||
|
|
|
@ -2434,7 +2434,7 @@ static int __init detect_wavefront (int irq, int io_base)
|
||||||
consumes 16.
|
consumes 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 "
|
printk (KERN_ERR LOGNAME "IO address range 0x%x - 0x%x "
|
||||||
"already in use - ignored\n", dev.base,
|
"already in use - ignored\n", dev.base,
|
||||||
dev.base+15);
|
dev.base+15);
|
||||||
|
@ -2466,10 +2466,13 @@ static int __init detect_wavefront (int irq, int io_base)
|
||||||
} else {
|
} else {
|
||||||
printk (KERN_WARNING LOGNAME "not raw, but no "
|
printk (KERN_WARNING LOGNAME "not raw, but no "
|
||||||
"hardware version!\n");
|
"hardware version!\n");
|
||||||
|
release_region (io_base, 16);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!wf_raw) {
|
if (!wf_raw) {
|
||||||
|
/* will re-acquire region in install_wavefront() */
|
||||||
|
release_region (io_base, 16);
|
||||||
return 1;
|
return 1;
|
||||||
} else {
|
} else {
|
||||||
printk (KERN_INFO LOGNAME
|
printk (KERN_INFO LOGNAME
|
||||||
|
@ -2489,6 +2492,7 @@ static int __init detect_wavefront (int irq, int io_base)
|
||||||
|
|
||||||
if (wavefront_hw_reset ()) {
|
if (wavefront_hw_reset ()) {
|
||||||
printk (KERN_WARNING LOGNAME "hardware reset failed\n");
|
printk (KERN_WARNING LOGNAME "hardware reset failed\n");
|
||||||
|
release_region (io_base, 16);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2496,6 +2500,8 @@ static int __init detect_wavefront (int irq, int io_base)
|
||||||
|
|
||||||
dev.has_fx = (detect_wffx () == 0);
|
dev.has_fx = (detect_wffx () == 0);
|
||||||
|
|
||||||
|
/* will re-acquire region in install_wavefront() */
|
||||||
|
release_region (io_base, 16);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2804,17 +2810,27 @@ static int __init wavefront_init (int atboot)
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __init install_wavefront (void)
|
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) {
|
if ((dev.synth_dev = register_sound_synth (&wavefront_fops, -1)) < 0) {
|
||||||
printk (KERN_ERR LOGNAME "cannot register raw synth\n");
|
printk (KERN_ERR LOGNAME "cannot register raw synth\n");
|
||||||
return -1;
|
goto err_out;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if OSS_SUPPORT_LEVEL & OSS_SUPPORT_SEQ
|
#if OSS_SUPPORT_LEVEL & OSS_SUPPORT_SEQ
|
||||||
if ((dev.oss_dev = sound_alloc_synthdev()) == -1) {
|
if ((dev.oss_dev = sound_alloc_synthdev()) == -1) {
|
||||||
printk (KERN_ERR LOGNAME "Too many sequencers\n");
|
printk (KERN_ERR LOGNAME "Too many sequencers\n");
|
||||||
return -1;
|
/* FIXME: leak: should unregister sound synth */
|
||||||
|
goto err_out;
|
||||||
} else {
|
} else {
|
||||||
synth_devs[dev.oss_dev] = &wavefront_operations;
|
synth_devs[dev.oss_dev] = &wavefront_operations;
|
||||||
}
|
}
|
||||||
|
@ -2827,13 +2843,7 @@ static int __init install_wavefront (void)
|
||||||
sound_unload_synthdev (dev.oss_dev);
|
sound_unload_synthdev (dev.oss_dev);
|
||||||
#endif /* OSS_SUPPORT_SEQ */
|
#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 ()) {
|
if (wavefront_config_midi ()) {
|
||||||
|
@ -2841,6 +2851,12 @@ static int __init install_wavefront (void)
|
||||||
}
|
}
|
||||||
|
|
||||||
return dev.oss_dev;
|
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)
|
static void __exit uninstall_wavefront (void)
|
||||||
|
|
Reference in New Issue