* [PATCH] scsi: Introduce a help function local_time_seconds() to simplify the getting time stamp operation
@ 2013-05-29 9:33 Gu Zheng
2013-05-30 3:00 ` Libo Chen
2013-06-04 8:04 ` Gu Zheng
0 siblings, 2 replies; 4+ messages in thread
From: Gu Zheng @ 2013-05-29 9:33 UTC (permalink / raw)
To: James E.J. Bottomley; +Cc: Linux-Scsi, linux-kernel
>From 4d4caa16f3886ae910ad6dfe13353fc836f546cc Mon Sep 17 00:00:00 2001
From: Gu Zheng <guz.fnst@cn.fujitsu.com>
Date: Wed, 29 May 2013 17:34:22 +0900
Subject: [PATCH] driver/scsi: Introduce a help function local_time_seconds() to simplify the getting time stamp operation
Signed-off-by: Gu Zheng <guz.fnst@cn.fujitsu.com>
---
drivers/scsi/3w-9xxx.c | 14 ++------------
drivers/scsi/3w-sas.c | 14 ++------------
include/scsi/scsi.h | 9 +++++++++
3 files changed, 13 insertions(+), 24 deletions(-)
diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c
index 5e1e12c..44b3ea8 100644
--- a/drivers/scsi/3w-9xxx.c
+++ b/drivers/scsi/3w-9xxx.c
@@ -374,8 +374,6 @@ out:
/* This function will queue an event */
static void twa_aen_queue_event(TW_Device_Extension *tw_dev, TW_Command_Apache_Header *header)
{
- u32 local_time;
- struct timeval time;
TW_Event *event;
unsigned short aen;
char host[16];
@@ -398,9 +396,7 @@ static void twa_aen_queue_event(TW_Device_Extension *tw_dev, TW_Command_Apache_H
memset(event, 0, sizeof(TW_Event));
event->severity = TW_SEV_OUT(header->status_block.severity__reserved);
- do_gettimeofday(&time);
- local_time = (u32)(time.tv_sec - (sys_tz.tz_minuteswest * 60));
- event->time_stamp_sec = local_time;
+ event->time_stamp_sec = local_time_seconds();
event->aen_code = aen;
event->retrieved = TW_AEN_NOT_RETRIEVED;
event->sequence_id = tw_dev->error_sequence_id;
@@ -479,11 +475,9 @@ out:
static void twa_aen_sync_time(TW_Device_Extension *tw_dev, int request_id)
{
u32 schedulertime;
- struct timeval utc;
TW_Command_Full *full_command_packet;
TW_Command *command_packet;
TW_Param_Apache *param;
- u32 local_time;
/* Fill out the command packet */
full_command_packet = tw_dev->command_packet_virt[request_id];
@@ -503,11 +497,7 @@ static void twa_aen_sync_time(TW_Device_Extension *tw_dev, int request_id)
param->parameter_id = cpu_to_le16(0x3); /* SchedulerTime */
param->parameter_size_bytes = cpu_to_le16(4);
- /* Convert system time in UTC to local time seconds since last
- Sunday 12:00AM */
- do_gettimeofday(&utc);
- local_time = (u32)(utc.tv_sec - (sys_tz.tz_minuteswest * 60));
- schedulertime = local_time - (3 * 86400);
+ schedulertime = local_time_seconds() - (3 * 86400);
schedulertime = cpu_to_le32(schedulertime % 604800);
memcpy(param->data, &schedulertime, sizeof(u32));
diff --git a/drivers/scsi/3w-sas.c b/drivers/scsi/3w-sas.c
index c845bdb..69f1d8a 100644
--- a/drivers/scsi/3w-sas.c
+++ b/drivers/scsi/3w-sas.c
@@ -236,8 +236,6 @@ out:
/* This function will queue an event */
static void twl_aen_queue_event(TW_Device_Extension *tw_dev, TW_Command_Apache_Header *header)
{
- u32 local_time;
- struct timeval time;
TW_Event *event;
unsigned short aen;
char host[16];
@@ -256,9 +254,7 @@ static void twl_aen_queue_event(TW_Device_Extension *tw_dev, TW_Command_Apache_H
memset(event, 0, sizeof(TW_Event));
event->severity = TW_SEV_OUT(header->status_block.severity__reserved);
- do_gettimeofday(&time);
- local_time = (u32)(time.tv_sec - (sys_tz.tz_minuteswest * 60));
- event->time_stamp_sec = local_time;
+ event->time_stamp_sec = local_time_seconds();
event->aen_code = aen;
event->retrieved = TW_AEN_NOT_RETRIEVED;
event->sequence_id = tw_dev->error_sequence_id;
@@ -444,11 +440,9 @@ out:
static void twl_aen_sync_time(TW_Device_Extension *tw_dev, int request_id)
{
u32 schedulertime;
- struct timeval utc;
TW_Command_Full *full_command_packet;
TW_Command *command_packet;
TW_Param_Apache *param;
- u32 local_time;
/* Fill out the command packet */
full_command_packet = tw_dev->command_packet_virt[request_id];
@@ -468,11 +462,7 @@ static void twl_aen_sync_time(TW_Device_Extension *tw_dev, int request_id)
param->parameter_id = cpu_to_le16(0x3); /* SchedulerTime */
param->parameter_size_bytes = cpu_to_le16(4);
- /* Convert system time in UTC to local time seconds since last
- Sunday 12:00AM */
- do_gettimeofday(&utc);
- local_time = (u32)(utc.tv_sec - (sys_tz.tz_minuteswest * 60));
- schedulertime = local_time - (3 * 86400);
+ schedulertime = local_time_seconds() - (3 * 86400);
schedulertime = cpu_to_le32(schedulertime % 604800);
memcpy(param->data, &schedulertime, sizeof(u32));
diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
index 66216c1..f3377ca 100644
--- a/include/scsi/scsi.h
+++ b/include/scsi/scsi.h
@@ -574,4 +574,13 @@ static inline __u32 scsi_to_u32(__u8 *ptr)
return (ptr[0]<<24) + (ptr[1]<<16) + (ptr[2]<<8) + ptr[3];
}
+/*
+ * Convert system time in UTC to local time seconds.
+ */
+static inline u32 local_time_seconds(void)
+{
+ struct timeval utc;
+ do_gettimeofday(&utc);
+ return (u32)(utc.tv_sec - (sys_tz.tz_minuteswest * 60));
+}
#endif /* _SCSI_SCSI_H */
--
1.7.7
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] scsi: Introduce a help function local_time_seconds() to simplify the getting time stamp operation
2013-05-29 9:33 [PATCH] scsi: Introduce a help function local_time_seconds() to simplify the getting time stamp operation Gu Zheng
@ 2013-05-30 3:00 ` Libo Chen
2013-05-30 3:25 ` Gu Zheng
2013-06-04 8:04 ` Gu Zheng
1 sibling, 1 reply; 4+ messages in thread
From: Libo Chen @ 2013-05-30 3:00 UTC (permalink / raw)
To: Gu Zheng; +Cc: James E.J. Bottomley, Linux-Scsi, linux-kernel
On 2013/5/29 17:33, Gu Zheng wrote:
>>From 4d4caa16f3886ae910ad6dfe13353fc836f546cc Mon Sep 17 00:00:00 2001
> From: Gu Zheng <guz.fnst@cn.fujitsu.com>
> Date: Wed, 29 May 2013 17:34:22 +0900
> Subject: [PATCH] driver/scsi: Introduce a help function local_time_seconds() to simplify the getting time stamp operation
>
hi gu,
next time, you can remove above info.
thanks,
Libo
> Signed-off-by: Gu Zheng <guz.fnst@cn.fujitsu.com>
> ---
> drivers/scsi/3w-9xxx.c | 14 ++------------
> drivers/scsi/3w-sas.c | 14 ++------------
> include/scsi/scsi.h | 9 +++++++++
> 3 files changed, 13 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c
> index 5e1e12c..44b3ea8 100644
> --- a/drivers/scsi/3w-9xxx.c
> +++ b/drivers/scsi/3w-9xxx.c
> @@ -374,8 +374,6 @@ out:
> /* This function will queue an event */
> static void twa_aen_queue_event(TW_Device_Extension *tw_dev, TW_Command_Apache_Header *header)
> {
> - u32 local_time;
> - struct timeval time;
> TW_Event *event;
> unsigned short aen;
> char host[16];
> @@ -398,9 +396,7 @@ static void twa_aen_queue_event(TW_Device_Extension *tw_dev, TW_Command_Apache_H
> memset(event, 0, sizeof(TW_Event));
>
> event->severity = TW_SEV_OUT(header->status_block.severity__reserved);
> - do_gettimeofday(&time);
> - local_time = (u32)(time.tv_sec - (sys_tz.tz_minuteswest * 60));
> - event->time_stamp_sec = local_time;
> + event->time_stamp_sec = local_time_seconds();
> event->aen_code = aen;
> event->retrieved = TW_AEN_NOT_RETRIEVED;
> event->sequence_id = tw_dev->error_sequence_id;
> @@ -479,11 +475,9 @@ out:
> static void twa_aen_sync_time(TW_Device_Extension *tw_dev, int request_id)
> {
> u32 schedulertime;
> - struct timeval utc;
> TW_Command_Full *full_command_packet;
> TW_Command *command_packet;
> TW_Param_Apache *param;
> - u32 local_time;
>
> /* Fill out the command packet */
> full_command_packet = tw_dev->command_packet_virt[request_id];
> @@ -503,11 +497,7 @@ static void twa_aen_sync_time(TW_Device_Extension *tw_dev, int request_id)
> param->parameter_id = cpu_to_le16(0x3); /* SchedulerTime */
> param->parameter_size_bytes = cpu_to_le16(4);
>
> - /* Convert system time in UTC to local time seconds since last
> - Sunday 12:00AM */
> - do_gettimeofday(&utc);
> - local_time = (u32)(utc.tv_sec - (sys_tz.tz_minuteswest * 60));
> - schedulertime = local_time - (3 * 86400);
> + schedulertime = local_time_seconds() - (3 * 86400);
> schedulertime = cpu_to_le32(schedulertime % 604800);
>
> memcpy(param->data, &schedulertime, sizeof(u32));
> diff --git a/drivers/scsi/3w-sas.c b/drivers/scsi/3w-sas.c
> index c845bdb..69f1d8a 100644
> --- a/drivers/scsi/3w-sas.c
> +++ b/drivers/scsi/3w-sas.c
> @@ -236,8 +236,6 @@ out:
> /* This function will queue an event */
> static void twl_aen_queue_event(TW_Device_Extension *tw_dev, TW_Command_Apache_Header *header)
> {
> - u32 local_time;
> - struct timeval time;
> TW_Event *event;
> unsigned short aen;
> char host[16];
> @@ -256,9 +254,7 @@ static void twl_aen_queue_event(TW_Device_Extension *tw_dev, TW_Command_Apache_H
> memset(event, 0, sizeof(TW_Event));
>
> event->severity = TW_SEV_OUT(header->status_block.severity__reserved);
> - do_gettimeofday(&time);
> - local_time = (u32)(time.tv_sec - (sys_tz.tz_minuteswest * 60));
> - event->time_stamp_sec = local_time;
> + event->time_stamp_sec = local_time_seconds();
> event->aen_code = aen;
> event->retrieved = TW_AEN_NOT_RETRIEVED;
> event->sequence_id = tw_dev->error_sequence_id;
> @@ -444,11 +440,9 @@ out:
> static void twl_aen_sync_time(TW_Device_Extension *tw_dev, int request_id)
> {
> u32 schedulertime;
> - struct timeval utc;
> TW_Command_Full *full_command_packet;
> TW_Command *command_packet;
> TW_Param_Apache *param;
> - u32 local_time;
>
> /* Fill out the command packet */
> full_command_packet = tw_dev->command_packet_virt[request_id];
> @@ -468,11 +462,7 @@ static void twl_aen_sync_time(TW_Device_Extension *tw_dev, int request_id)
> param->parameter_id = cpu_to_le16(0x3); /* SchedulerTime */
> param->parameter_size_bytes = cpu_to_le16(4);
>
> - /* Convert system time in UTC to local time seconds since last
> - Sunday 12:00AM */
> - do_gettimeofday(&utc);
> - local_time = (u32)(utc.tv_sec - (sys_tz.tz_minuteswest * 60));
> - schedulertime = local_time - (3 * 86400);
> + schedulertime = local_time_seconds() - (3 * 86400);
> schedulertime = cpu_to_le32(schedulertime % 604800);
>
> memcpy(param->data, &schedulertime, sizeof(u32));
> diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
> index 66216c1..f3377ca 100644
> --- a/include/scsi/scsi.h
> +++ b/include/scsi/scsi.h
> @@ -574,4 +574,13 @@ static inline __u32 scsi_to_u32(__u8 *ptr)
> return (ptr[0]<<24) + (ptr[1]<<16) + (ptr[2]<<8) + ptr[3];
> }
>
> +/*
> + * Convert system time in UTC to local time seconds.
> + */
> +static inline u32 local_time_seconds(void)
> +{
> + struct timeval utc;
> + do_gettimeofday(&utc);
> + return (u32)(utc.tv_sec - (sys_tz.tz_minuteswest * 60));
> +}
> #endif /* _SCSI_SCSI_H */
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] scsi: Introduce a help function local_time_seconds() to simplify the getting time stamp operation
2013-05-30 3:00 ` Libo Chen
@ 2013-05-30 3:25 ` Gu Zheng
0 siblings, 0 replies; 4+ messages in thread
From: Gu Zheng @ 2013-05-30 3:25 UTC (permalink / raw)
To: Libo Chen; +Cc: James E.J. Bottomley, Linux-Scsi, linux-kernel
On 05/30/2013 11:00 AM, Libo Chen wrote:
> On 2013/5/29 17:33, Gu Zheng wrote:
>> >From 4d4caa16f3886ae910ad6dfe13353fc836f546cc Mon Sep 17 00:00:00 2001
>> From: Gu Zheng <guz.fnst@cn.fujitsu.com>
>> Date: Wed, 29 May 2013 17:34:22 +0900
>> Subject: [PATCH] driver/scsi: Introduce a help function local_time_seconds() to simplify the getting time stamp operation
>>
> hi gu,
>
> next time, you can remove above info.
Ah~, I forgot to clean up the unnecessary title infos, thanks for your reminder.
Regards,
Gu
>
>
> thanks,
>
> Libo
>
>
>> Signed-off-by: Gu Zheng <guz.fnst@cn.fujitsu.com>
>> ---
>> drivers/scsi/3w-9xxx.c | 14 ++------------
>> drivers/scsi/3w-sas.c | 14 ++------------
>> include/scsi/scsi.h | 9 +++++++++
>> 3 files changed, 13 insertions(+), 24 deletions(-)
>>
>> diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c
>> index 5e1e12c..44b3ea8 100644
>> --- a/drivers/scsi/3w-9xxx.c
>> +++ b/drivers/scsi/3w-9xxx.c
>> @@ -374,8 +374,6 @@ out:
>> /* This function will queue an event */
>> static void twa_aen_queue_event(TW_Device_Extension *tw_dev, TW_Command_Apache_Header *header)
>> {
>> - u32 local_time;
>> - struct timeval time;
>> TW_Event *event;
>> unsigned short aen;
>> char host[16];
>> @@ -398,9 +396,7 @@ static void twa_aen_queue_event(TW_Device_Extension *tw_dev, TW_Command_Apache_H
>> memset(event, 0, sizeof(TW_Event));
>>
>> event->severity = TW_SEV_OUT(header->status_block.severity__reserved);
>> - do_gettimeofday(&time);
>> - local_time = (u32)(time.tv_sec - (sys_tz.tz_minuteswest * 60));
>> - event->time_stamp_sec = local_time;
>> + event->time_stamp_sec = local_time_seconds();
>> event->aen_code = aen;
>> event->retrieved = TW_AEN_NOT_RETRIEVED;
>> event->sequence_id = tw_dev->error_sequence_id;
>> @@ -479,11 +475,9 @@ out:
>> static void twa_aen_sync_time(TW_Device_Extension *tw_dev, int request_id)
>> {
>> u32 schedulertime;
>> - struct timeval utc;
>> TW_Command_Full *full_command_packet;
>> TW_Command *command_packet;
>> TW_Param_Apache *param;
>> - u32 local_time;
>>
>> /* Fill out the command packet */
>> full_command_packet = tw_dev->command_packet_virt[request_id];
>> @@ -503,11 +497,7 @@ static void twa_aen_sync_time(TW_Device_Extension *tw_dev, int request_id)
>> param->parameter_id = cpu_to_le16(0x3); /* SchedulerTime */
>> param->parameter_size_bytes = cpu_to_le16(4);
>>
>> - /* Convert system time in UTC to local time seconds since last
>> - Sunday 12:00AM */
>> - do_gettimeofday(&utc);
>> - local_time = (u32)(utc.tv_sec - (sys_tz.tz_minuteswest * 60));
>> - schedulertime = local_time - (3 * 86400);
>> + schedulertime = local_time_seconds() - (3 * 86400);
>> schedulertime = cpu_to_le32(schedulertime % 604800);
>>
>> memcpy(param->data, &schedulertime, sizeof(u32));
>> diff --git a/drivers/scsi/3w-sas.c b/drivers/scsi/3w-sas.c
>> index c845bdb..69f1d8a 100644
>> --- a/drivers/scsi/3w-sas.c
>> +++ b/drivers/scsi/3w-sas.c
>> @@ -236,8 +236,6 @@ out:
>> /* This function will queue an event */
>> static void twl_aen_queue_event(TW_Device_Extension *tw_dev, TW_Command_Apache_Header *header)
>> {
>> - u32 local_time;
>> - struct timeval time;
>> TW_Event *event;
>> unsigned short aen;
>> char host[16];
>> @@ -256,9 +254,7 @@ static void twl_aen_queue_event(TW_Device_Extension *tw_dev, TW_Command_Apache_H
>> memset(event, 0, sizeof(TW_Event));
>>
>> event->severity = TW_SEV_OUT(header->status_block.severity__reserved);
>> - do_gettimeofday(&time);
>> - local_time = (u32)(time.tv_sec - (sys_tz.tz_minuteswest * 60));
>> - event->time_stamp_sec = local_time;
>> + event->time_stamp_sec = local_time_seconds();
>> event->aen_code = aen;
>> event->retrieved = TW_AEN_NOT_RETRIEVED;
>> event->sequence_id = tw_dev->error_sequence_id;
>> @@ -444,11 +440,9 @@ out:
>> static void twl_aen_sync_time(TW_Device_Extension *tw_dev, int request_id)
>> {
>> u32 schedulertime;
>> - struct timeval utc;
>> TW_Command_Full *full_command_packet;
>> TW_Command *command_packet;
>> TW_Param_Apache *param;
>> - u32 local_time;
>>
>> /* Fill out the command packet */
>> full_command_packet = tw_dev->command_packet_virt[request_id];
>> @@ -468,11 +462,7 @@ static void twl_aen_sync_time(TW_Device_Extension *tw_dev, int request_id)
>> param->parameter_id = cpu_to_le16(0x3); /* SchedulerTime */
>> param->parameter_size_bytes = cpu_to_le16(4);
>>
>> - /* Convert system time in UTC to local time seconds since last
>> - Sunday 12:00AM */
>> - do_gettimeofday(&utc);
>> - local_time = (u32)(utc.tv_sec - (sys_tz.tz_minuteswest * 60));
>> - schedulertime = local_time - (3 * 86400);
>> + schedulertime = local_time_seconds() - (3 * 86400);
>> schedulertime = cpu_to_le32(schedulertime % 604800);
>>
>> memcpy(param->data, &schedulertime, sizeof(u32));
>> diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
>> index 66216c1..f3377ca 100644
>> --- a/include/scsi/scsi.h
>> +++ b/include/scsi/scsi.h
>> @@ -574,4 +574,13 @@ static inline __u32 scsi_to_u32(__u8 *ptr)
>> return (ptr[0]<<24) + (ptr[1]<<16) + (ptr[2]<<8) + ptr[3];
>> }
>>
>> +/*
>> + * Convert system time in UTC to local time seconds.
>> + */
>> +static inline u32 local_time_seconds(void)
>> +{
>> + struct timeval utc;
>> + do_gettimeofday(&utc);
>> + return (u32)(utc.tv_sec - (sys_tz.tz_minuteswest * 60));
>> +}
>> #endif /* _SCSI_SCSI_H */
>>
>
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] scsi: Introduce a help function local_time_seconds() to simplify the getting time stamp operation
2013-05-29 9:33 [PATCH] scsi: Introduce a help function local_time_seconds() to simplify the getting time stamp operation Gu Zheng
2013-05-30 3:00 ` Libo Chen
@ 2013-06-04 8:04 ` Gu Zheng
1 sibling, 0 replies; 4+ messages in thread
From: Gu Zheng @ 2013-06-04 8:04 UTC (permalink / raw)
To: James E.J. Bottomley; +Cc: Linux-Scsi, linux-kernel
ping...
On 05/29/2013 05:33 PM, Gu Zheng wrote:
>>From 4d4caa16f3886ae910ad6dfe13353fc836f546cc Mon Sep 17 00:00:00 2001
> From: Gu Zheng <guz.fnst@cn.fujitsu.com>
> Date: Wed, 29 May 2013 17:34:22 +0900
> Subject: [PATCH] driver/scsi: Introduce a help function local_time_seconds() to simplify the getting time stamp operation
>
> Signed-off-by: Gu Zheng <guz.fnst@cn.fujitsu.com>
> ---
> drivers/scsi/3w-9xxx.c | 14 ++------------
> drivers/scsi/3w-sas.c | 14 ++------------
> include/scsi/scsi.h | 9 +++++++++
> 3 files changed, 13 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c
> index 5e1e12c..44b3ea8 100644
> --- a/drivers/scsi/3w-9xxx.c
> +++ b/drivers/scsi/3w-9xxx.c
> @@ -374,8 +374,6 @@ out:
> /* This function will queue an event */
> static void twa_aen_queue_event(TW_Device_Extension *tw_dev, TW_Command_Apache_Header *header)
> {
> - u32 local_time;
> - struct timeval time;
> TW_Event *event;
> unsigned short aen;
> char host[16];
> @@ -398,9 +396,7 @@ static void twa_aen_queue_event(TW_Device_Extension *tw_dev, TW_Command_Apache_H
> memset(event, 0, sizeof(TW_Event));
>
> event->severity = TW_SEV_OUT(header->status_block.severity__reserved);
> - do_gettimeofday(&time);
> - local_time = (u32)(time.tv_sec - (sys_tz.tz_minuteswest * 60));
> - event->time_stamp_sec = local_time;
> + event->time_stamp_sec = local_time_seconds();
> event->aen_code = aen;
> event->retrieved = TW_AEN_NOT_RETRIEVED;
> event->sequence_id = tw_dev->error_sequence_id;
> @@ -479,11 +475,9 @@ out:
> static void twa_aen_sync_time(TW_Device_Extension *tw_dev, int request_id)
> {
> u32 schedulertime;
> - struct timeval utc;
> TW_Command_Full *full_command_packet;
> TW_Command *command_packet;
> TW_Param_Apache *param;
> - u32 local_time;
>
> /* Fill out the command packet */
> full_command_packet = tw_dev->command_packet_virt[request_id];
> @@ -503,11 +497,7 @@ static void twa_aen_sync_time(TW_Device_Extension *tw_dev, int request_id)
> param->parameter_id = cpu_to_le16(0x3); /* SchedulerTime */
> param->parameter_size_bytes = cpu_to_le16(4);
>
> - /* Convert system time in UTC to local time seconds since last
> - Sunday 12:00AM */
> - do_gettimeofday(&utc);
> - local_time = (u32)(utc.tv_sec - (sys_tz.tz_minuteswest * 60));
> - schedulertime = local_time - (3 * 86400);
> + schedulertime = local_time_seconds() - (3 * 86400);
> schedulertime = cpu_to_le32(schedulertime % 604800);
>
> memcpy(param->data, &schedulertime, sizeof(u32));
> diff --git a/drivers/scsi/3w-sas.c b/drivers/scsi/3w-sas.c
> index c845bdb..69f1d8a 100644
> --- a/drivers/scsi/3w-sas.c
> +++ b/drivers/scsi/3w-sas.c
> @@ -236,8 +236,6 @@ out:
> /* This function will queue an event */
> static void twl_aen_queue_event(TW_Device_Extension *tw_dev, TW_Command_Apache_Header *header)
> {
> - u32 local_time;
> - struct timeval time;
> TW_Event *event;
> unsigned short aen;
> char host[16];
> @@ -256,9 +254,7 @@ static void twl_aen_queue_event(TW_Device_Extension *tw_dev, TW_Command_Apache_H
> memset(event, 0, sizeof(TW_Event));
>
> event->severity = TW_SEV_OUT(header->status_block.severity__reserved);
> - do_gettimeofday(&time);
> - local_time = (u32)(time.tv_sec - (sys_tz.tz_minuteswest * 60));
> - event->time_stamp_sec = local_time;
> + event->time_stamp_sec = local_time_seconds();
> event->aen_code = aen;
> event->retrieved = TW_AEN_NOT_RETRIEVED;
> event->sequence_id = tw_dev->error_sequence_id;
> @@ -444,11 +440,9 @@ out:
> static void twl_aen_sync_time(TW_Device_Extension *tw_dev, int request_id)
> {
> u32 schedulertime;
> - struct timeval utc;
> TW_Command_Full *full_command_packet;
> TW_Command *command_packet;
> TW_Param_Apache *param;
> - u32 local_time;
>
> /* Fill out the command packet */
> full_command_packet = tw_dev->command_packet_virt[request_id];
> @@ -468,11 +462,7 @@ static void twl_aen_sync_time(TW_Device_Extension *tw_dev, int request_id)
> param->parameter_id = cpu_to_le16(0x3); /* SchedulerTime */
> param->parameter_size_bytes = cpu_to_le16(4);
>
> - /* Convert system time in UTC to local time seconds since last
> - Sunday 12:00AM */
> - do_gettimeofday(&utc);
> - local_time = (u32)(utc.tv_sec - (sys_tz.tz_minuteswest * 60));
> - schedulertime = local_time - (3 * 86400);
> + schedulertime = local_time_seconds() - (3 * 86400);
> schedulertime = cpu_to_le32(schedulertime % 604800);
>
> memcpy(param->data, &schedulertime, sizeof(u32));
> diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
> index 66216c1..f3377ca 100644
> --- a/include/scsi/scsi.h
> +++ b/include/scsi/scsi.h
> @@ -574,4 +574,13 @@ static inline __u32 scsi_to_u32(__u8 *ptr)
> return (ptr[0]<<24) + (ptr[1]<<16) + (ptr[2]<<8) + ptr[3];
> }
>
> +/*
> + * Convert system time in UTC to local time seconds.
> + */
> +static inline u32 local_time_seconds(void)
> +{
> + struct timeval utc;
> + do_gettimeofday(&utc);
> + return (u32)(utc.tv_sec - (sys_tz.tz_minuteswest * 60));
> +}
> #endif /* _SCSI_SCSI_H */
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-06-04 8:04 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-29 9:33 [PATCH] scsi: Introduce a help function local_time_seconds() to simplify the getting time stamp operation Gu Zheng
2013-05-30 3:00 ` Libo Chen
2013-05-30 3:25 ` Gu Zheng
2013-06-04 8:04 ` Gu Zheng
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).