Merge branch 'parisc-4.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...

[cascardo/linux.git] / drivers / scsi / pmcraid.c

diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
index ed31d8c..68a5c34 100644 (file)
--- a/drivers/scsi/pmcraid.c
+++ b/drivers/scsi/pmcraid.c
@@ -45,6 +45,7 @@
 #include <asm/processor.h>
 #include <linux/libata.h>
 #include <linux/mutex.h>
+#include <linux/ktime.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_device.h>
@@ -305,7 +306,7 @@ static int pmcraid_change_queue_depth(struct scsi_device *scsi_dev, int depth)
  * Return Value
  *      None
  */
-void pmcraid_init_cmdblk(struct pmcraid_cmd *cmd, int index)
+static void pmcraid_init_cmdblk(struct pmcraid_cmd *cmd, int index)
 {
        struct pmcraid_ioarcb *ioarcb = &(cmd->ioa_cb->ioarcb);
        dma_addr_t dma_addr = cmd->ioa_cb_bus_addr;
@@ -400,7 +401,7 @@ static struct pmcraid_cmd *pmcraid_get_free_cmd(
  * Return Value:
  *     nothing
  */
-void pmcraid_return_cmd(struct pmcraid_cmd *cmd)
+static void pmcraid_return_cmd(struct pmcraid_cmd *cmd)
 {
        struct pmcraid_instance *pinstance = cmd->drv_inst;
        unsigned long lock_flags;
@@ -1709,7 +1710,7 @@ static struct pmcraid_ioasc_error *pmcraid_get_error_info(u32 ioasc)
  * @ioasc: ioasc code
  * @cmd: pointer to command that resulted in 'ioasc'
  */
-void pmcraid_ioasc_logger(u32 ioasc, struct pmcraid_cmd *cmd)
+static void pmcraid_ioasc_logger(u32 ioasc, struct pmcraid_cmd *cmd)
 {
        struct pmcraid_ioasc_error *error_info = pmcraid_get_error_info(ioasc);
 
@@ -3136,7 +3137,7 @@ static int pmcraid_eh_host_reset_handler(struct scsi_cmnd *scmd)
  *   returns pointer pmcraid_ioadl_desc, initialized to point to internal
  *   or external IOADLs
  */
-struct pmcraid_ioadl_desc *
+static struct pmcraid_ioadl_desc *
 pmcraid_init_ioadls(struct pmcraid_cmd *cmd, int sgcount)
 {
        struct pmcraid_ioadl_desc *ioadl;
@@ -4254,7 +4255,6 @@ static struct scsi_host_template pmcraid_host_template = {
        .use_clustering = ENABLE_CLUSTERING,
        .shost_attrs = pmcraid_host_attrs,
        .proc_name = PMCRAID_DRIVER_NAME,
-       .use_blk_tags = 1,
 };
 
 /*
@@ -5563,11 +5563,9 @@ static void pmcraid_set_timestamp(struct pmcraid_cmd *cmd)
        __be32 time_stamp_len = cpu_to_be32(PMCRAID_TIMESTAMP_LEN);
        struct pmcraid_ioadl_desc *ioadl = ioarcb->add_data.u.ioadl;
 
-       struct timeval tv;
        __le64 timestamp;
 
-       do_gettimeofday(&tv);
-       timestamp = tv.tv_sec * 1000;
+       timestamp = ktime_get_real_seconds() * 1000;
 
        pinstance->timestamp_data->timestamp[0] = (__u8)(timestamp);
        pinstance->timestamp_data->timestamp[1] = (__u8)((timestamp) >> 8);