Skip to content

Commit 7c56921

Browse files
Dr. David Alan Gilbertmartinkpetersen
authored andcommitted
scsi: isci: Remove unused sci_remote_device_reset()
sci_remote_device_reset() last use was removed in 2012 by commit 14aaa9f ("isci: Redesign device suspension, abort, cleanup.") 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 8c62820 commit 7c56921

File tree

2 files changed

+0
-45
lines changed

2 files changed

+0
-45
lines changed

drivers/scsi/isci/remote_device.c

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -392,36 +392,6 @@ enum sci_status sci_remote_device_stop(struct isci_remote_device *idev,
392392
}
393393
}
394394

395-
enum sci_status sci_remote_device_reset(struct isci_remote_device *idev)
396-
{
397-
struct sci_base_state_machine *sm = &idev->sm;
398-
enum sci_remote_device_states state = sm->current_state_id;
399-
400-
switch (state) {
401-
case SCI_DEV_INITIAL:
402-
case SCI_DEV_STOPPED:
403-
case SCI_DEV_STARTING:
404-
case SCI_SMP_DEV_IDLE:
405-
case SCI_SMP_DEV_CMD:
406-
case SCI_DEV_STOPPING:
407-
case SCI_DEV_FAILED:
408-
case SCI_DEV_RESETTING:
409-
case SCI_DEV_FINAL:
410-
default:
411-
dev_warn(scirdev_to_dev(idev), "%s: in wrong state: %s\n",
412-
__func__, dev_state_name(state));
413-
return SCI_FAILURE_INVALID_STATE;
414-
case SCI_DEV_READY:
415-
case SCI_STP_DEV_IDLE:
416-
case SCI_STP_DEV_CMD:
417-
case SCI_STP_DEV_NCQ:
418-
case SCI_STP_DEV_NCQ_ERROR:
419-
case SCI_STP_DEV_AWAIT_RESET:
420-
sci_change_state(sm, SCI_DEV_RESETTING);
421-
return SCI_SUCCESS;
422-
}
423-
}
424-
425395
enum sci_status sci_remote_device_frame_handler(struct isci_remote_device *idev,
426396
u32 frame_index)
427397
{

drivers/scsi/isci/remote_device.h

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -159,21 +159,6 @@ enum sci_status sci_remote_device_stop(
159159
struct isci_remote_device *idev,
160160
u32 timeout);
161161

162-
/**
163-
* sci_remote_device_reset() - This method will reset the device making it
164-
* ready for operation. This method must be called anytime the device is
165-
* reset either through a SMP phy control or a port hard reset request.
166-
* @remote_device: This parameter specifies the device to be reset.
167-
*
168-
* This method does not actually cause the device hardware to be reset. This
169-
* method resets the software object so that it will be operational after a
170-
* device hardware reset completes. An indication of whether the device reset
171-
* was accepted. SCI_SUCCESS This value is returned if the device reset is
172-
* started.
173-
*/
174-
enum sci_status sci_remote_device_reset(
175-
struct isci_remote_device *idev);
176-
177162
/**
178163
* enum sci_remote_device_states - This enumeration depicts all the states
179164
* for the common remote device state machine.

0 commit comments

Comments
 (0)