From: Manohar Vanga <manohar.vanga@cern.ch>
To: <gregkh@suse.de>
Cc: <martyn.welch@ge.com>, <cota@braap.org>,
<devel@driverdev.osuosl.org>, <linux-kernel@vger.kernel.org>,
Manohar Vanga <manohar.vanga@cern.ch>
Subject: [PATCH 4/4] staging: vme_user: rename USER_BUS_MAX to VME_USER_BUS_MAX
Date: Mon, 26 Sep 2011 11:27:18 +0200 [thread overview]
Message-ID: <1317029238-13357-5-git-send-email-manohar.vanga@cern.ch> (raw)
In-Reply-To: <1317029238-13357-1-git-send-email-manohar.vanga@cern.ch>
Signed-off-by: Manohar Vanga <manohar.vanga@cern.ch>
---
drivers/staging/vme/devices/vme_user.c | 10 +++++-----
drivers/staging/vme/devices/vme_user.h | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/vme/devices/vme_user.c b/drivers/staging/vme/devices/vme_user.c
index 9518dda..7dcd162 100644
--- 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 24bf4e5..d85a1e9 100644
--- 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
--
1.7.4.1
next prev parent reply other threads:[~2011-09-26 9:31 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-26 9:27 [PATCH 0/4] [RESEND v6] VME Framework Fixes Manohar Vanga
2011-09-26 9:27 ` [PATCH 1/4] staging: vme: add struct vme_dev for VME devices Manohar Vanga
2011-09-26 22:51 ` Emilio G. Cota
2011-09-26 9:27 ` [PATCH 2/4] staging: vme: make match() driver specific to improve non-VME64x support Manohar Vanga
2011-09-26 23:29 ` Emilio G. Cota
2011-09-27 8:08 ` Manohar Vanga
2011-09-27 16:10 ` Emilio G. Cota
2011-09-26 9:27 ` [PATCH 3/4] staging: vme: get rid of struct vme_device_id and slots Manohar Vanga
2011-09-26 9:27 ` Manohar Vanga [this message]
2011-09-27 0:51 ` [PATCH 0/4] [RESEND v6] VME Framework Fixes Greg KH
2011-10-03 14:59 ` Manohar Vanga
2011-10-11 0:03 ` Greg KH
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=1317029238-13357-5-git-send-email-manohar.vanga@cern.ch \
--to=manohar.vanga@cern.ch \
--cc=cota@braap.org \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=martyn.welch@ge.com \
/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
all inboxes | Powered by JetHome®