Skip to content

Commit

Permalink
staging: vme_user: rename USER_BUS_MAX to VME_USER_BUS_MAX
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Manohar Vanga authored and Greg Kroah-Hartman committed Oct 17, 2011
1 parent a916a39 commit 0a4b6b0
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions drivers/staging/vme/devices/vme_user.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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;
}

/*
Expand All @@ -668,7 +668,7 @@ static int __init vme_user_init(void)

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;
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/vme/devices/vme_user.h
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 0a4b6b0

Please sign in to comment.