aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/isci/request.h
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2011-06-30 22:14:33 -0400
committerDan Williams <dan.j.williams@intel.com>2011-07-03 07:04:52 -0400
commit89a7301f21fb00e753089671eb9e4132aab8ea08 (patch)
treeafa8bac0a36d0d5626997d8995f6c9194aef3a0f /drivers/scsi/isci/request.h
parentd9dcb4ba791de2a06b19ac47cd61601cf3d4e208 (diff)
isci: retire scic_sds_ and scic_ prefixes
The distinction between scic_sds_ scic_ and sci_ are no longer relevant so just unify the prefixes on sci_. The distinction between isci_ and sci_ is historically significant, and useful for comparing the old 'core' to the current Linux driver. 'sci_' represents the former core as well as the routines that are closer to the hardware and protocol than their 'isci_' brethren. sci == sas controller interface. Also unwind the 'sds1' out of the parameter structs. Reported-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/scsi/isci/request.h')
-rw-r--r--drivers/scsi/isci/request.h52
1 files changed, 26 insertions, 26 deletions
diff --git a/drivers/scsi/isci/request.h b/drivers/scsi/isci/request.h
index 0cafcead7a01..08fcf98e70f4 100644
--- a/drivers/scsi/isci/request.h
+++ b/drivers/scsi/isci/request.h
@@ -301,75 +301,75 @@ enum sci_base_request_states {
301}; 301};
302 302
303/** 303/**
304 * scic_sds_request_get_controller() - 304 * sci_request_get_controller() -
305 * 305 *
306 * This macro will return the controller for this io request object 306 * This macro will return the controller for this io request object
307 */ 307 */
308#define scic_sds_request_get_controller(ireq) \ 308#define sci_request_get_controller(ireq) \
309 ((ireq)->owning_controller) 309 ((ireq)->owning_controller)
310 310
311/** 311/**
312 * scic_sds_request_get_device() - 312 * sci_request_get_device() -
313 * 313 *
314 * This macro will return the device for this io request object 314 * This macro will return the device for this io request object
315 */ 315 */
316#define scic_sds_request_get_device(ireq) \ 316#define sci_request_get_device(ireq) \
317 ((ireq)->target_device) 317 ((ireq)->target_device)
318 318
319/** 319/**
320 * scic_sds_request_get_port() - 320 * sci_request_get_port() -
321 * 321 *
322 * This macro will return the port for this io request object 322 * This macro will return the port for this io request object
323 */ 323 */
324#define scic_sds_request_get_port(ireq) \ 324#define sci_request_get_port(ireq) \
325 scic_sds_remote_device_get_port(scic_sds_request_get_device(ireq)) 325 sci_remote_device_get_port(sci_request_get_device(ireq))
326 326
327/** 327/**
328 * scic_sds_request_get_post_context() - 328 * sci_request_get_post_context() -
329 * 329 *
330 * This macro returns the constructed post context result for the io request. 330 * This macro returns the constructed post context result for the io request.
331 */ 331 */
332#define scic_sds_request_get_post_context(ireq) \ 332#define sci_request_get_post_context(ireq) \
333 ((ireq)->post_context) 333 ((ireq)->post_context)
334 334
335/** 335/**
336 * scic_sds_request_get_task_context() - 336 * sci_request_get_task_context() -
337 * 337 *
338 * This is a helper macro to return the os handle for this request object. 338 * This is a helper macro to return the os handle for this request object.
339 */ 339 */
340#define scic_sds_request_get_task_context(request) \ 340#define sci_request_get_task_context(request) \
341 ((request)->task_context_buffer) 341 ((request)->task_context_buffer)
342 342
343/** 343/**
344 * scic_sds_request_set_status() - 344 * sci_request_set_status() -
345 * 345 *
346 * This macro will set the scu hardware status and sci request completion 346 * This macro will set the scu hardware status and sci request completion
347 * status for an io request. 347 * status for an io request.
348 */ 348 */
349#define scic_sds_request_set_status(request, scu_status_code, sci_status_code) \ 349#define sci_request_set_status(request, scu_status_code, sci_status_code) \
350 { \ 350 { \
351 (request)->scu_status = (scu_status_code); \ 351 (request)->scu_status = (scu_status_code); \
352 (request)->sci_status = (sci_status_code); \ 352 (request)->sci_status = (sci_status_code); \
353 } 353 }
354 354
355enum sci_status scic_sds_request_start(struct isci_request *ireq); 355enum sci_status sci_request_start(struct isci_request *ireq);
356enum sci_status scic_sds_io_request_terminate(struct isci_request *ireq); 356enum sci_status sci_io_request_terminate(struct isci_request *ireq);
357enum sci_status 357enum sci_status
358scic_sds_io_request_event_handler(struct isci_request *ireq, 358sci_io_request_event_handler(struct isci_request *ireq,
359 u32 event_code); 359 u32 event_code);
360enum sci_status 360enum sci_status
361scic_sds_io_request_frame_handler(struct isci_request *ireq, 361sci_io_request_frame_handler(struct isci_request *ireq,
362 u32 frame_index); 362 u32 frame_index);
363enum sci_status 363enum sci_status
364scic_sds_task_request_terminate(struct isci_request *ireq); 364sci_task_request_terminate(struct isci_request *ireq);
365extern enum sci_status 365extern enum sci_status
366scic_sds_request_complete(struct isci_request *ireq); 366sci_request_complete(struct isci_request *ireq);
367extern enum sci_status 367extern enum sci_status
368scic_sds_io_request_tc_completion(struct isci_request *ireq, u32 code); 368sci_io_request_tc_completion(struct isci_request *ireq, u32 code);
369 369
370/* XXX open code in caller */ 370/* XXX open code in caller */
371static inline dma_addr_t 371static inline dma_addr_t
372scic_io_request_get_dma_addr(struct isci_request *ireq, void *virt_addr) 372sci_io_request_get_dma_addr(struct isci_request *ireq, void *virt_addr)
373{ 373{
374 374
375 char *requested_addr = (char *)virt_addr; 375 char *requested_addr = (char *)virt_addr;
@@ -500,17 +500,17 @@ int isci_request_execute(struct isci_host *ihost, struct isci_remote_device *ide
500void isci_terminate_pending_requests(struct isci_host *ihost, 500void isci_terminate_pending_requests(struct isci_host *ihost,
501 struct isci_remote_device *idev); 501 struct isci_remote_device *idev);
502enum sci_status 502enum sci_status
503scic_task_request_construct(struct isci_host *ihost, 503sci_task_request_construct(struct isci_host *ihost,
504 struct isci_remote_device *idev, 504 struct isci_remote_device *idev,
505 u16 io_tag, 505 u16 io_tag,
506 struct isci_request *ireq); 506 struct isci_request *ireq);
507enum sci_status 507enum sci_status
508scic_task_request_construct_ssp(struct isci_request *ireq); 508sci_task_request_construct_ssp(struct isci_request *ireq);
509enum sci_status 509enum sci_status
510scic_task_request_construct_sata(struct isci_request *ireq); 510sci_task_request_construct_sata(struct isci_request *ireq);
511void 511void
512scic_stp_io_request_set_ncq_tag(struct isci_request *ireq, u16 ncq_tag); 512sci_stp_io_request_set_ncq_tag(struct isci_request *ireq, u16 ncq_tag);
513void scic_sds_smp_request_copy_response(struct isci_request *ireq); 513void sci_smp_request_copy_response(struct isci_request *ireq);
514 514
515static inline int isci_task_is_ncq_recovery(struct sas_task *task) 515static inline int isci_task_is_ncq_recovery(struct sas_task *task)
516{ 516{