From b7fc053312ed077706b4d11a314dca65b670a55d Mon Sep 17 00:00:00 2001 From: Edmund Nadolski Date: Thu, 5 May 2011 01:11:49 +0000 Subject: [PATCH] --- yaml --- r: 254479 b: refs/heads/master c: b9988b8e7fcd80404c60462dc223df8c1f31550d h: refs/heads/master i: 254477: 89104d091184f61bc3c023aa34b4ad24c42994ee 254475: 7c7d025370d1c0bac267ce9cebad9e743da5d5e5 254471: 81a3764274d2b7a4b393fbae91d7e0a85d897c62 254463: 5f432e885470469f59f4b16225ca1ab307cb1be7 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/isci/core/scic_sds_port.c | 3 +-- trunk/drivers/scsi/isci/core/scic_sds_port.h | 5 ----- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 8342b182705f..93ad2544096a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ed30c275dd9fc5c603081144db5df3110f258534 +refs/heads/master: b9988b8e7fcd80404c60462dc223df8c1f31550d diff --git a/trunk/drivers/scsi/isci/core/scic_sds_port.c b/trunk/drivers/scsi/isci/core/scic_sds_port.c index 04a56c5a68d9..e1c873406e50 100644 --- a/trunk/drivers/scsi/isci/core/scic_sds_port.c +++ b/trunk/drivers/scsi/isci/core/scic_sds_port.c @@ -1232,8 +1232,7 @@ static enum sci_status scic_sds_port_ready_operational_substate_start_io_handler struct scic_sds_remote_device *device, struct scic_sds_request *io_request) { - scic_sds_port_increment_request_count(port); - + port->started_request_count++; return SCI_SUCCESS; } diff --git a/trunk/drivers/scsi/isci/core/scic_sds_port.h b/trunk/drivers/scsi/isci/core/scic_sds_port.h index 115cbe3129a8..213d42330b4b 100644 --- a/trunk/drivers/scsi/isci/core/scic_sds_port.h +++ b/trunk/drivers/scsi/isci/core/scic_sds_port.h @@ -359,11 +359,6 @@ struct scic_sds_port_state_handler { ((this_port)->physical_port_index) -static inline void scic_sds_port_increment_request_count(struct scic_sds_port *sci_port) -{ - sci_port->started_request_count++; -} - static inline void scic_sds_port_decrement_request_count(struct scic_sds_port *sci_port) { if (WARN_ONCE(sci_port->started_request_count == 0,