public inbox for linux-ia64@vger.kernel.org
 help / color / mirror / Atom feed
From: Greg Edwards <edwardsg@sgi.com>
To: linux-ia64@vger.kernel.org
Subject: Re: [PATCH] add platform check to a couple sn2-only drivers
Date: Fri, 28 Jul 2006 15:03:55 +0000	[thread overview]
Message-ID: <20060728150355.GE27686@sgi.com> (raw)
In-Reply-To: <20060728143626.GD27686@sgi.com>

On Fri, Jul 28, 2006 at 03:50:22PM +0100, Christoph Hellwig wrote:
| On Fri, Jul 28, 2006 at 09:36:26AM -0500, Greg Edwards wrote:
| > -	nasid_t event_nasid = ia64_sn_get_console_nasid();
| > +	nasid_t event_nasid;
| > +
| > +	if (!ia64_platform_is("sn2"))
| > +		return -ENODEV;
| > +
| > +	event_nasid = ia64_sn_get_console_nasid();
| 
| this one is okay and required.
| 
| >  static int __devinit
| >  ioc4_init(void)
| >  {
| > +	if (!ia64_platform_is("sn2"))
| > +		return -ENODEV;
| > +
| 
| this one not.  The pci id matching will take care of things. 

Ok, thanks Christoph.  Brent brought that up, too, but we had been
burned by thinking we had it covered before on other drivers.
Tony, revised patch below.

Add a platform check to the snsc driver init function, to prevent
loading on non-sn2 systems.

Signed-off-by: Greg Edwards <edwardsg@sgi.com>

---
 drivers/char/snsc.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Index: git-linus/drivers/char/snsc.c
=================================--- git-linus.orig/drivers/char/snsc.c	2006-07-28 09:58:08.167283230 -0500
+++ git-linus/drivers/char/snsc.c	2006-07-28 09:58:45.095703646 -0500
@@ -374,7 +374,12 @@ scdrv_init(void)
 	struct sysctl_data_s *scd;
 	void *salbuf;
 	dev_t first_dev, dev;
-	nasid_t event_nasid = ia64_sn_get_console_nasid();
+	nasid_t event_nasid;
+
+	if (!ia64_platform_is("sn2"))
+		return -ENODEV;
+
+	event_nasid = ia64_sn_get_console_nasid();
 
 	if (alloc_chrdev_region(&first_dev, 0, num_cnodes,
 				SYSCTL_BASENAME) < 0) {

      parent reply	other threads:[~2006-07-28 15:03 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-07-28 14:36 [PATCH] add platform check to a couple sn2-only drivers Greg Edwards
2006-07-28 14:50 ` Christoph Hellwig
2006-07-28 15:03 ` Greg Edwards [this message]

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=20060728150355.GE27686@sgi.com \
    --to=edwardsg@sgi.com \
    --cc=linux-ia64@vger.kernel.org \
    /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