linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Bob Miller <rem@osdl.org>
To: linux-kernel@vger.kernel.org
Cc: trivial@rustcorp.com.au
Subject: [PATCH 2.5.68] Convert elan-104nc to remove check_region().
Date: Fri, 2 May 2003 13:42:07 -0700	[thread overview]
Message-ID: <20030502204207.GB25713@doc.pdx.osdl.net> (raw)

Moved the request_region() call to replace check_region() and adds
release_region()'s in the error paths that occure before the old
call to request_region().  NOTE: This patch just updates comments.

-- 
Bob Miller					Email: rem@osdl.org
Open Source Development Lab			Phone: 503.626.2455 Ext. 17


diff -Nru a/drivers/mtd/maps/elan-104nc.c b/drivers/mtd/maps/elan-104nc.c
--- a/drivers/mtd/maps/elan-104nc.c	Fri May  2 09:52:22 2003
+++ b/drivers/mtd/maps/elan-104nc.c	Fri May  2 09:52:22 2003
@@ -30,8 +30,8 @@
 The single flash device is divided into 3 partition which appear as separate
 MTD devices.
 
-Linux thinks that the I/O port is used by the PIC and hence check_region() will
-always fail.  So we don't do it.  I just hope it doesn't break anything.
+Linux thinks that the I/O port is used by the PIC and hence request_region()
+will always fail.  So we don't do it.  I just hope it doesn't break anything.
 */
 #include <linux/module.h>
 #include <linux/slab.h>
@@ -227,14 +227,14 @@
 	}
 
 	iounmap((void *)iomapadr);
-	release_region(PAGE_IO,PAGE_IO_SIZE);
+	/* release_region(PAGE_IO,PAGE_IO_SIZE); */
 }
 
 int __init init_elan_104nc(void)
 {
 	/* Urg! We use I/O port 0x22 without request_region()ing it */
 	/*
-	if (check_region(PAGE_IO,PAGE_IO_SIZE) != 0) {
+	if (!request_region(PAGE_IO,PAGE_IO_SIZE, "ELAN-104NC flash")) {
 		printk( KERN_ERR"%s: IO ports 0x%x-0x%x in use\n",
 			elan_104nc_map.name,
 			PAGE_IO, PAGE_IO+PAGE_IO_SIZE-1 );
@@ -245,12 +245,11 @@
 	if (!iomapadr) {
 		printk( KERN_ERR"%s: failed to ioremap memory region\n",
 			elan_104nc_map.name );
+		/*
+		release_region(PAGE_IO,PAGE_IO_SIZE);
+		*/
 		return -EIO;
 	}
-
-	/*
-	request_region( PAGE_IO, PAGE_IO_SIZE, "ELAN-104NC flash" );
-	*/
 
 	printk( KERN_INFO"%s: IO:0x%x-0x%x MEM:0x%x-0x%x\n",
 		elan_104nc_map.name,


             reply	other threads:[~2003-05-02 20:29 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2003-05-02 20:42 Bob Miller [this message]
2003-05-05  4:38 ` [PATCH 2.5.68] Convert elan-104nc to remove check_region() Rusty Russell
2003-05-05 17:01   ` Bob Miller
2003-05-06  1:04     ` Rusty Russell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20030502204207.GB25713@doc.pdx.osdl.net \
    --to=rem@osdl.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=trivial@rustcorp.com.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).