Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d61780c0 authored by Jeff Garzik's avatar Jeff Garzik Committed by Linus Torvalds
Browse files

[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: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 34ad92c2

Documentation/i2c/writing-clients

+1 −0
Original line number Original line Diff line number Diff line
@@ -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;

arch/ppc/platforms/hdpu.c

+0 −5
Original line number Original line Diff line number Diff line
@@ -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)

{

{

arch/sparc/kernel/pcic.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -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.

drivers/char/specialix.c

+170 −172
Original line number Original line Diff line number Diff line
@@ -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);

drivers/net/eepro.c

+26 −24
Original line number Original line Diff line number Diff line
@@ -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