Commit 8db02da5 authored by Edmund Nadolski's avatar Edmund Nadolski Committed by Dan Williams
Browse files

isci: remove isci_timer interface 



Delete code which is no longer used.

Signed-off-by: default avatarEdmund Nadolski <edmund.nadolski@intel.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent fd18388b

drivers/scsi/isci/Makefile

+1 −1
Original line number Original line Diff line number Diff line 
obj-$(CONFIG_SCSI_ISCI) += isci.o

obj-$(CONFIG_SCSI_ISCI) += isci.o

isci-objs := init.o phy.o request.o sata.o \

isci-objs := init.o phy.o request.o sata.o \

	     remote_device.o port.o timers.o \

	     remote_device.o port.o \

	     host.o task.o probe_roms.o \

	     host.o task.o probe_roms.o \

	     state_machine.o \

	     state_machine.o \

	     remote_node_context.o \

	     remote_node_context.o \

drivers/scsi/isci/host.c

+0 −13
Original line number Original line Diff line number Diff line
@@ -67,7 +67,6 @@ 
#include "scu_remote_node_context.h"

#include "scu_remote_node_context.h"

#include "scu_task_context.h"

#include "scu_task_context.h"

#include "scu_unsolicited_frame.h"

#include "scu_unsolicited_frame.h"

#include "timers.h"





#define SCU_CONTEXT_RAM_INIT_STALL_TIME      200

#define SCU_CONTEXT_RAM_INIT_STALL_TIME      200
@@ -111,14 +110,6 @@ 
	)

	)









#define SCIC_SDS_CONTROLLER_MIN_TIMER_COUNT  3

#define SCIC_SDS_CONTROLLER_MAX_TIMER_COUNT  3



/**

 *

 *

 * The number of milliseconds to wait for a phy to start.

 */

#define SCIC_SDS_CONTROLLER_PHY_START_TIMEOUT      100

#define SCIC_SDS_CONTROLLER_PHY_START_TIMEOUT      100





/**

/**
@@ -1379,8 +1370,6 @@ void isci_host_deinit(struct isci_host *ihost) 
	del_timer_sync(&ihost->sci.timer.timer);

	del_timer_sync(&ihost->sci.timer.timer);





	del_timer_sync(&ihost->sci.phy_timer.timer);

	del_timer_sync(&ihost->sci.phy_timer.timer);



	isci_timer_list_destroy(ihost);

}

}





static void __iomem *scu_base(struct isci_host *isci_host)

static void __iomem *scu_base(struct isci_host *isci_host)
@@ -2517,8 +2506,6 @@ int isci_host_init(struct isci_host *isci_host) 
	union scic_user_parameters scic_user_params;

	union scic_user_parameters scic_user_params;

	struct isci_pci_info *pci_info = to_pci_info(isci_host->pdev);

	struct isci_pci_info *pci_info = to_pci_info(isci_host->pdev);





	isci_timer_list_construct(isci_host);



	spin_lock_init(&isci_host->state_lock);

	spin_lock_init(&isci_host->state_lock);

	spin_lock_init(&isci_host->scic_lock);

	spin_lock_init(&isci_host->scic_lock);

	spin_lock_init(&isci_host->queue_lock);

	spin_lock_init(&isci_host->queue_lock);

drivers/scsi/isci/host.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -325,7 +325,6 @@ struct isci_host { 
	union scic_oem_parameters oem_parameters;

	union scic_oem_parameters oem_parameters;





	int id; /* unique within a given pci device */

	int id; /* unique within a given pci device */

	struct list_head timers;

	void *core_ctrl_memory;

	void *core_ctrl_memory;

	struct dma_pool *dma_pool;

	struct dma_pool *dma_pool;

	struct isci_phy phys[SCI_MAX_PHYS];

	struct isci_phy phys[SCI_MAX_PHYS];

drivers/scsi/isci/phy.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -57,7 +57,6 @@ 
#include "host.h"

#include "host.h"

#include "phy.h"

#include "phy.h"

#include "scu_event_codes.h"

#include "scu_event_codes.h"

#include "timers.h"

#include "probe_roms.h"

#include "probe_roms.h"





/* Maximum arbitration wait time in micro-seconds */

/* Maximum arbitration wait time in micro-seconds */

drivers/scsi/isci/port.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -56,7 +56,6 @@ 
#include "isci.h"

#include "isci.h"

#include "port.h"

#include "port.h"

#include "request.h"

#include "request.h"

#include "timers.h"





#define SCIC_SDS_PORT_HARD_RESET_TIMEOUT  (1000)

#define SCIC_SDS_PORT_HARD_RESET_TIMEOUT  (1000)

#define SCU_DUMMY_INDEX    (0xFFFF)

#define SCU_DUMMY_INDEX    (0xFFFF)