From: Stanislav Kinsbursky <skinsbursky@parallels.com>
To: akpm@linux-foundation.org
Cc: manfred@colorfullife.com, a.p.zijlstra@chello.nl,
netdev@vger.kernel.org, will.deacon@arm.com,
linux-kernel@vger.kernel.org, cmetcalf@tilera.com,
jmorris@namei.org, linux-driver@qlogic.com,
linux-security-module@vger.kernel.org, hughd@google.com,
ron.mercer@qlogic.com, viro@zeniv.linux.org.uk,
james.l.morris@oracle.com, catalin.marinas@arm.com,
casey@schaufler-ca.com, eparis@parisplace.org, sds@tycho.nsa.gov,
jitendra.kalsaria@qlogic.com, devel@openvz.org
Subject: [PATCH v5 06/10] glge driver: rename internal SEM_SET macro to SEM_INIT
Date: Wed, 19 Sep 2012 20:05:59 +0400 [thread overview]
Message-ID: <20120919160559.11254.48746.stgit@localhost6.localdomain6> (raw)
In-Reply-To: <20120919160430.11254.86848.stgit@localhost6.localdomain6>
The reason for shit patch is that SET_SET is desired to be a part of new part
of API of IPC sys_semctl() system call.
The name itself for IPC is quite natural, because all linux-specific commands
names for IPC system calls are originally created by replacing "IPC_" part by
"SEM_"("MSG_", "SHM_") part.
So, I'm hoping, that this change doesn't really matters for "QLogic qlge NIC
HBA Driver" developers, since it's just an internal define.
---
drivers/net/ethernet/qlogic/qlge/qlge.h | 4 ++--
drivers/net/ethernet/qlogic/qlge/qlge_main.c | 16 ++++++++--------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge.h b/drivers/net/ethernet/qlogic/qlge/qlge.h
index a131d7b..6f46ea5 100644
--- a/drivers/net/ethernet/qlogic/qlge/qlge.h
+++ b/drivers/net/ethernet/qlogic/qlge/qlge.h
@@ -347,10 +347,10 @@ enum {
enum {
/*
* Example:
- * reg = SEM_XGMAC0_MASK | (SEM_SET << SEM_XGMAC0_SHIFT)
+ * reg = SEM_XGMAC0_MASK | (SEM_INIT << SEM_XGMAC0_SHIFT)
*/
SEM_CLEAR = 0,
- SEM_SET = 1,
+ SEM_INIT = 1,
SEM_FORCE = 3,
SEM_XGMAC0_SHIFT = 0,
SEM_XGMAC1_SHIFT = 2,
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_main.c b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
index b53a3b6..18e0a0c 100644
--- a/drivers/net/ethernet/qlogic/qlge/qlge_main.c
+++ b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
@@ -109,28 +109,28 @@ static int ql_sem_trylock(struct ql_adapter *qdev, u32 sem_mask)
switch (sem_mask) {
case SEM_XGMAC0_MASK:
- sem_bits = SEM_SET << SEM_XGMAC0_SHIFT;
+ sem_bits = SEM_INIT << SEM_XGMAC0_SHIFT;
break;
case SEM_XGMAC1_MASK:
- sem_bits = SEM_SET << SEM_XGMAC1_SHIFT;
+ sem_bits = SEM_INIT << SEM_XGMAC1_SHIFT;
break;
case SEM_ICB_MASK:
- sem_bits = SEM_SET << SEM_ICB_SHIFT;
+ sem_bits = SEM_INIT << SEM_ICB_SHIFT;
break;
case SEM_MAC_ADDR_MASK:
- sem_bits = SEM_SET << SEM_MAC_ADDR_SHIFT;
+ sem_bits = SEM_INIT << SEM_MAC_ADDR_SHIFT;
break;
case SEM_FLASH_MASK:
- sem_bits = SEM_SET << SEM_FLASH_SHIFT;
+ sem_bits = SEM_INIT << SEM_FLASH_SHIFT;
break;
case SEM_PROBE_MASK:
- sem_bits = SEM_SET << SEM_PROBE_SHIFT;
+ sem_bits = SEM_INIT << SEM_PROBE_SHIFT;
break;
case SEM_RT_IDX_MASK:
- sem_bits = SEM_SET << SEM_RT_IDX_SHIFT;
+ sem_bits = SEM_INIT << SEM_RT_IDX_SHIFT;
break;
case SEM_PROC_REG_MASK:
- sem_bits = SEM_SET << SEM_PROC_REG_SHIFT;
+ sem_bits = SEM_INIT << SEM_PROC_REG_SHIFT;
break;
default:
netif_alert(qdev, probe, qdev->ndev, "bad Semaphore mask!.\n");
next prev parent reply other threads:[~2012-09-19 16:05 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-19 16:05 [PATCH v5 00/10] IPC: checkpoint/restore in userspace enhancements Stanislav Kinsbursky
2012-09-19 16:05 ` [PATCH v5 01/10] ipc: remove forced assignment of selected message Stanislav Kinsbursky
2012-09-26 17:37 ` Serge Hallyn
2012-09-19 16:05 ` [PATCH v5 02/10] ipc: "use key as id" functionality for resource get system call introduced Stanislav Kinsbursky
2012-09-19 16:05 ` [PATCH v5 03/10] ipc: segment key change helper introduced Stanislav Kinsbursky
2012-09-19 16:05 ` [PATCH v5 04/10] ipc: add new SHM_SET command for sys_shmctl() call Stanislav Kinsbursky
2012-09-19 16:05 ` [PATCH v5 05/10] ipc: add new MSG_SET command for sys_msgctl() call Stanislav Kinsbursky
2012-09-19 16:05 ` Stanislav Kinsbursky [this message]
2012-09-19 16:06 ` [PATCH v5 07/10] ipc: add new SEM_SET command for sys_semctl() call Stanislav Kinsbursky
2012-09-19 16:06 ` [PATCH v5 08/10] IPC: message queue receive cleanup Stanislav Kinsbursky
2012-09-19 16:06 ` [PATCH v5 09/10] IPC: message queue copy feature introduced Stanislav Kinsbursky
2012-09-19 16:06 ` [PATCH v5 10/10] test: IPC message queue copy feture test Stanislav Kinsbursky
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=20120919160559.11254.48746.stgit@localhost6.localdomain6 \
--to=skinsbursky@parallels.com \
--cc=a.p.zijlstra@chello.nl \
--cc=akpm@linux-foundation.org \
--cc=casey@schaufler-ca.com \
--cc=catalin.marinas@arm.com \
--cc=cmetcalf@tilera.com \
--cc=devel@openvz.org \
--cc=eparis@parisplace.org \
--cc=hughd@google.com \
--cc=james.l.morris@oracle.com \
--cc=jitendra.kalsaria@qlogic.com \
--cc=jmorris@namei.org \
--cc=linux-driver@qlogic.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=manfred@colorfullife.com \
--cc=netdev@vger.kernel.org \
--cc=ron.mercer@qlogic.com \
--cc=sds@tycho.nsa.gov \
--cc=viro@zeniv.linux.org.uk \
--cc=will.deacon@arm.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;
as well as URLs for NNTP newsgroup(s).