From 8ec477fea47f6eb7534fe131c023d1d126374e75 Mon Sep 17 00:00:00 2001
From: Stanislaw Gruszka <stf_xl@wp.pl>
Date: Fri, 28 Mar 2008 12:35:40 +0000
Subject: [PATCH] Synchronize with Feral CVS repository: - Use a slightly
 cleaner macro.

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@309 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 qla_isp/linux/isp_linux.h | 10 +++++-----
 qla_isp/linux/isp_pci.c   |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/qla_isp/linux/isp_linux.h b/qla_isp/linux/isp_linux.h
index 7ce671c83..910073024 100644
--- a/qla_isp/linux/isp_linux.h
+++ b/qla_isp/linux/isp_linux.h
@@ -1,4 +1,4 @@
-/* $Id: isp_linux.h,v 1.154 2008/02/11 23:59:06 mjacob Exp $ */
+/* $Id: isp_linux.h,v 1.159 2008/03/03 01:42:01 mjacob Exp $ */
 /*
  *  Copyright (c) 1997-2008 by Matthew Jacob
  *  All rights reserved.
@@ -117,8 +117,8 @@
 #define ISP_CLASS           struct class_simple
 #define CREATE_ISP_CLASS    class_simple_create
 #define DESTROY_ISP_CLASS   class_simple_destroy
-#define CREATE_ISP_DEV(isp)     \
-    class_simple_device_add(isp_class, MKDEV(MAJOR(isp_dev), isp->isp_unit), NULL, "%s%d", ISP_NAME, isp->isp_unit),     \
+#define CREATE_ISP_DEV(isp, class)     \
+    class_simple_device_add(class, MKDEV(MAJOR(isp_dev), isp->isp_unit), NULL, "%s%d", ISP_NAME, isp->isp_unit),     \
     devfs_mk_cdev(MKDEV(MAJOR(isp_dev), isp->isp_unit), S_IFCHR | S_IRUGO | S_IWUGO, "%s%d", ISP_NAME, isp->isp_unit)
 #define DESTROY_ISP_DEV(isp)    \
     devfs_remove("%s%d", ISP_NAME, isp->isp_unit), class_simple_device_remove(MKDEV(MAJOR(isp_dev), isp->isp_unit))
@@ -126,8 +126,8 @@
 #define ISP_CLASS struct class
 #define CREATE_ISP_CLASS    class_create
 #define DESTROY_ISP_CLASS   class_destroy
-#define CREATE_ISP_DEV(isp)     \
-    class_device_create(isp_class, NULL, MKDEV(MAJOR(isp_dev), isp->isp_unit), NULL, "%s%d", ISP_NAME, isp->isp_unit)
+#define CREATE_ISP_DEV(isp, class)     \
+    class_device_create(class, NULL, MKDEV(MAJOR(isp_dev), isp->isp_unit), NULL, "%s%d", ISP_NAME, isp->isp_unit)
 #define DESTROY_ISP_DEV(isp)    \
     class_device_destroy(isp_class, MKDEV(MAJOR(isp_dev), (isp)->isp_unit));
 #endif
diff --git a/qla_isp/linux/isp_pci.c b/qla_isp/linux/isp_pci.c
index f70395d91..7d743f615 100644
--- a/qla_isp/linux/isp_pci.c
+++ b/qla_isp/linux/isp_pci.c
@@ -1,4 +1,4 @@
-/* $Id: isp_pci.c,v 1.163 2008/02/28 17:53:18 mjacob Exp $ */
+/* $Id: isp_pci.c,v 1.164 2008/03/03 01:42:01 mjacob Exp $ */
 /*
  *  Copyright (c) 1997-2008 by Matthew Jacob
  *  All rights reserved.
@@ -931,7 +931,7 @@ isplinux_pci_init_one(struct Scsi_Host *host)
         isp_prt(isp, ISP_LOGERR, "isplinux_common_init failed");
         goto bad;
     }
-    CREATE_ISP_DEV(isp);
+    CREATE_ISP_DEV(isp, isp_class);
     return (0);
 bad:
     if (isp->isp_param) {