diff options
Diffstat (limited to 'drivers/scsi/isci/smp_remote_device.c')
-rw-r--r-- | drivers/scsi/isci/smp_remote_device.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/scsi/isci/smp_remote_device.c b/drivers/scsi/isci/smp_remote_device.c index 718ddaf49343..a38dc90da943 100644 --- a/drivers/scsi/isci/smp_remote_device.c +++ b/drivers/scsi/isci/smp_remote_device.c | |||
@@ -237,14 +237,14 @@ static const struct scic_sds_remote_device_state_handler scic_sds_smp_remote_dev | |||
237 | 237 | ||
238 | /** | 238 | /** |
239 | * | 239 | * |
240 | * @object: This is the struct sci_base_object which is cast into a | 240 | * @object: This is the object which is cast into a |
241 | * struct scic_sds_remote_device. | 241 | * struct scic_sds_remote_device. |
242 | * | 242 | * |
243 | * This is the SCIC_SDS_SMP_REMOTE_DEVICE_READY_SUBSTATE_IDLE enter method. | 243 | * This is the SCIC_SDS_SMP_REMOTE_DEVICE_READY_SUBSTATE_IDLE enter method. |
244 | * This function sets the ready cmd substate handlers and reports the device as | 244 | * This function sets the ready cmd substate handlers and reports the device as |
245 | * ready. none | 245 | * ready. none |
246 | */ | 246 | */ |
247 | static void scic_sds_smp_remote_device_ready_idle_substate_enter(struct sci_base_object *object) | 247 | static void scic_sds_smp_remote_device_ready_idle_substate_enter(void *object) |
248 | { | 248 | { |
249 | struct scic_sds_remote_device *sci_dev = container_of(object, typeof(*sci_dev), | 249 | struct scic_sds_remote_device *sci_dev = container_of(object, typeof(*sci_dev), |
250 | parent); | 250 | parent); |
@@ -261,15 +261,14 @@ static void scic_sds_smp_remote_device_ready_idle_substate_enter(struct sci_base | |||
261 | 261 | ||
262 | /** | 262 | /** |
263 | * | 263 | * |
264 | * @object: This is the struct sci_base_object which is cast into a | 264 | * @object: This is the object which is cast into a |
265 | * struct scic_sds_remote_device. | 265 | * struct scic_sds_remote_device. |
266 | * | 266 | * |
267 | * This is the SCIC_SDS_SMP_REMOTE_DEVICE_READY_SUBSTATE_CMD enter method. This | 267 | * This is the SCIC_SDS_SMP_REMOTE_DEVICE_READY_SUBSTATE_CMD enter method. This |
268 | * function sets the remote device objects ready cmd substate handlers, and | 268 | * function sets the remote device objects ready cmd substate handlers, and |
269 | * notify core user that the device is not ready. none | 269 | * notify core user that the device is not ready. none |
270 | */ | 270 | */ |
271 | static void scic_sds_smp_remote_device_ready_cmd_substate_enter( | 271 | static void scic_sds_smp_remote_device_ready_cmd_substate_enter(void *object) |
272 | struct sci_base_object *object) | ||
273 | { | 272 | { |
274 | struct scic_sds_remote_device *sci_dev = container_of(object, typeof(*sci_dev), | 273 | struct scic_sds_remote_device *sci_dev = container_of(object, typeof(*sci_dev), |
275 | parent); | 274 | parent); |
@@ -289,12 +288,12 @@ static void scic_sds_smp_remote_device_ready_cmd_substate_enter( | |||
289 | 288 | ||
290 | /** | 289 | /** |
291 | * | 290 | * |
292 | * @object: This is the struct sci_base_object which is cast into a | 291 | * @object: This is the object which is cast into a |
293 | * struct scic_sds_remote_device. | 292 | * struct scic_sds_remote_device. |
294 | * | 293 | * |
295 | * This is the SCIC_SDS_SSP_REMOTE_DEVICE_READY_SUBSTATE_CMD exit method. none | 294 | * This is the SCIC_SDS_SSP_REMOTE_DEVICE_READY_SUBSTATE_CMD exit method. none |
296 | */ | 295 | */ |
297 | static void scic_sds_smp_remote_device_ready_cmd_substate_exit(struct sci_base_object *object) | 296 | static void scic_sds_smp_remote_device_ready_cmd_substate_exit(void *object) |
298 | { | 297 | { |
299 | struct scic_sds_remote_device *sci_dev = container_of(object, typeof(*sci_dev), | 298 | struct scic_sds_remote_device *sci_dev = container_of(object, typeof(*sci_dev), |
300 | parent); | 299 | parent); |