staging: vme_user: rename USER_BUS_MAX to VME_USER_BUS_MAX

Signed-off-by: Manohar Vanga <manohar.vanga@cern.ch>
Cc: Martyn Welch <martyn.welch@ge.com>
Reviewed-by: Emilio G. Cota <cota@braap.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/vme/devices/vme_user.c b/drivers/staging/vme/devices/vme_user.c
index 9518dda13ea6734ab40b1ccfdccb79d3e0138c9a..7dcd1622b5f5dd91f3e4d5e47b1e42f904ce7813 100644 (file)
--- a/drivers/staging/vme/devices/vme_user.c
+++ b/drivers/staging/vme/devices/vme_user.c
@@ -43,7 +43,7 @@
 static DEFINE_MUTEX(vme_user_mutex);
 static const char driver_name[] = "vme_user";
 
-static int bus[USER_BUS_MAX];
+static int bus[VME_USER_BUS_MAX];
 static unsigned int bus_num;
 
 /* Currently Documentation/devices.txt defines the following for VME:
@@ -643,10 +643,10 @@ static int __init vme_user_init(void)
        /* Let's start by supporting one bus, we can support more than one
         * in future revisions if that ever becomes necessary.
         */
-       if (bus_num > USER_BUS_MAX) {
+       if (bus_num > VME_USER_BUS_MAX) {
                printk(KERN_ERR "%s: Driver only able to handle %d buses\n",
-                       driver_name, USER_BUS_MAX);
-               bus_num = USER_BUS_MAX;
+                       driver_name, VME_USER_BUS_MAX);
+               bus_num = VME_USER_BUS_MAX;
        }
 
        /*
@@ -668,7 +668,7 @@ err_nocard:
 
 static int vme_user_match(struct vme_dev *vdev)
 {
-       if (vdev->num >= USER_BUS_MAX)
+       if (vdev->num >= VME_USER_BUS_MAX)
                return 0;
        return 1;
 }

diff --git a/drivers/staging/vme/devices/vme_user.h b/drivers/staging/vme/devices/vme_user.h
index 24bf4e54013de0bbbe9d3c36076caa6f3e8ff595..d85a1e9dbe3ad731dc9d113017e8e816a25a2ba2 100644 (file)
--- a/drivers/staging/vme/devices/vme_user.h
+++ b/drivers/staging/vme/devices/vme_user.h
@@ -1,7 +1,7 @@
 #ifndef _VME_USER_H_
 #define _VME_USER_H_
 
-#define USER_BUS_MAX                  1
+#define VME_USER_BUS_MAX       1
 
 /*
  * VMEbus Master Window Configuration Structure