Skip to content

Commit 5d10344

Browse files
Dr. David Alan Gilbertmartinkpetersen
Dr. David Alan Gilbert
authored andcommitted
scsi: isci: Remove unused isci_remote_device_reset_complete()
isci_remote_device_reset_complete() last use was removed in 2012 by commit 14aaa9f ("isci: Redesign device suspension, abort, cleanup.") Remove it. It was the last user of sci_remote_device_reset_complete(). Remove it. Signed-off-by: Dr. David Alan Gilbert <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Martin K. Petersen <[email protected]>
1 parent 6e67b32 commit 5d10344

File tree

2 files changed

+0
-46
lines changed

2 files changed

+0
-46
lines changed

drivers/scsi/isci/remote_device.c

-29
Original file line numberDiff line numberDiff line change
@@ -422,21 +422,6 @@ enum sci_status sci_remote_device_reset(struct isci_remote_device *idev)
422422
}
423423
}
424424

425-
enum sci_status sci_remote_device_reset_complete(struct isci_remote_device *idev)
426-
{
427-
struct sci_base_state_machine *sm = &idev->sm;
428-
enum sci_remote_device_states state = sm->current_state_id;
429-
430-
if (state != SCI_DEV_RESETTING) {
431-
dev_warn(scirdev_to_dev(idev), "%s: in wrong state: %s\n",
432-
__func__, dev_state_name(state));
433-
return SCI_FAILURE_INVALID_STATE;
434-
}
435-
436-
sci_change_state(sm, SCI_DEV_READY);
437-
return SCI_SUCCESS;
438-
}
439-
440425
enum sci_status sci_remote_device_frame_handler(struct isci_remote_device *idev,
441426
u32 frame_index)
442427
{
@@ -1694,20 +1679,6 @@ enum sci_status sci_remote_device_abort_requests_pending_abort(
16941679
return sci_remote_device_terminate_reqs_checkabort(idev, 1);
16951680
}
16961681

1697-
enum sci_status isci_remote_device_reset_complete(
1698-
struct isci_host *ihost,
1699-
struct isci_remote_device *idev)
1700-
{
1701-
unsigned long flags;
1702-
enum sci_status status;
1703-
1704-
spin_lock_irqsave(&ihost->scic_lock, flags);
1705-
status = sci_remote_device_reset_complete(idev);
1706-
spin_unlock_irqrestore(&ihost->scic_lock, flags);
1707-
1708-
return status;
1709-
}
1710-
17111682
void isci_dev_set_hang_detection_timeout(
17121683
struct isci_remote_device *idev,
17131684
u32 timeout)

drivers/scsi/isci/remote_device.h

-17
Original file line numberDiff line numberDiff line change
@@ -174,19 +174,6 @@ enum sci_status sci_remote_device_stop(
174174
enum sci_status sci_remote_device_reset(
175175
struct isci_remote_device *idev);
176176

177-
/**
178-
* sci_remote_device_reset_complete() - This method informs the device object
179-
* that the reset operation is complete and the device can resume operation
180-
* again.
181-
* @remote_device: This parameter specifies the device which is to be informed
182-
* of the reset complete operation.
183-
*
184-
* An indication that the device is resuming operation. SCI_SUCCESS the device
185-
* is resuming operation.
186-
*/
187-
enum sci_status sci_remote_device_reset_complete(
188-
struct isci_remote_device *idev);
189-
190177
/**
191178
* enum sci_remote_device_states - This enumeration depicts all the states
192179
* for the common remote device state machine.
@@ -364,10 +351,6 @@ enum sci_status isci_remote_device_reset(
364351
struct isci_host *ihost,
365352
struct isci_remote_device *idev);
366353

367-
enum sci_status isci_remote_device_reset_complete(
368-
struct isci_host *ihost,
369-
struct isci_remote_device *idev);
370-
371354
enum sci_status isci_remote_device_suspend_terminate(
372355
struct isci_host *ihost,
373356
struct isci_remote_device *idev,

0 commit comments

Comments
 (0)