Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 14:42:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

staging: vme_user: rename USER_BUS_MAX to VME_USER_BUS_MAX

Browse Source 
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>
This commit is contained in:
Manohar Vanga 2011-09-26 11:27:18 +02:00 committed by Greg Kroah-Hartman
parent a916a391d3
commit 0a4b6b0279
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/vme/devices/vme_user.c
View File

@ -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;
}

2
drivers/staging/vme/devices/vme_user.h
View File

@ -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