OpenVZ Forum


Home » Mailing lists » Devel » [PATCH v6 06/10] glge driver: rename internal SEM_SET macro to SEM_INIT
[PATCH v6 06/10] glge driver: rename internal SEM_SET macro to SEM_INIT [message #48354] Mon, 15 October 2012 16:00 Go to next message
Stanislav Kinsbursky is currently offline  Stanislav Kinsbursky
Messages: 683
Registered: October 2011
Senior Member
From: *parallels.com
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 b262d61..cfb0f62 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");
Re: [PATCH v6 06/10] glge driver: rename internal SEM_SET macro to SEM_INIT [message #48570 is a reply to message #48354] Tue, 23 October 2012 16:32 Go to previous message
Serge E. Hallyn is currently offline  Serge E. Hallyn
Messages: 26
Registered: February 2011
Junior Member
From: *parallels.com
Quoting Stanislav Kinsbursky (skinsbursky@parallels.com):
> 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

Can't speak for the driver maintainer, but it does look sane.

Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>

> 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 b262d61..cfb0f62 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");
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-security-module" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
Previous Topic: [PATCH v6 05/10] ipc: add new MSG_SET command for sys_msgctl() call
Next Topic: [PATCH v6 07/10] ipc: add new SEM_SET command for sys_semctl() call
Goto Forum:
  


Current Time: Tue Nov 21 00:53:43 GMT 2017