diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2011-07-01 05:25:15 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2011-07-03 07:04:52 -0400 |
| commit | 34a991587a5cc9f78960c2c9beea217866458c41 (patch) | |
| tree | 824bfb5d50705223339e2bd3369ae3194f2eece3 /drivers/scsi/isci/request.h | |
| parent | 89a7301f21fb00e753089671eb9e4132aab8ea08 (diff) | |
isci: kill 'get/set' macros
Most of these simple dereference macros are longer than their open coded
equivalent. Deleting enum sci_controller_mode is thrown in for good
measure.
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.h | 73 |
1 files changed, 0 insertions, 73 deletions
diff --git a/drivers/scsi/isci/request.h b/drivers/scsi/isci/request.h index 08fcf98e70f4..597084027819 100644 --- a/drivers/scsi/isci/request.h +++ b/drivers/scsi/isci/request.h | |||
| @@ -300,58 +300,6 @@ enum sci_base_request_states { | |||
| 300 | SCI_REQ_FINAL, | 300 | SCI_REQ_FINAL, |
| 301 | }; | 301 | }; |
| 302 | 302 | ||
| 303 | /** | ||
| 304 | * sci_request_get_controller() - | ||
| 305 | * | ||
| 306 | * This macro will return the controller for this io request object | ||
| 307 | */ | ||
| 308 | #define sci_request_get_controller(ireq) \ | ||
| 309 | ((ireq)->owning_controller) | ||
| 310 | |||
| 311 | /** | ||
| 312 | * sci_request_get_device() - | ||
| 313 | * | ||
| 314 | * This macro will return the device for this io request object | ||
| 315 | */ | ||
| 316 | #define sci_request_get_device(ireq) \ | ||
| 317 | ((ireq)->target_device) | ||
| 318 | |||
| 319 | /** | ||
| 320 | * sci_request_get_port() - | ||
| 321 | * | ||
| 322 | * This macro will return the port for this io request object | ||
| 323 | */ | ||
| 324 | #define sci_request_get_port(ireq) \ | ||
| 325 | sci_remote_device_get_port(sci_request_get_device(ireq)) | ||
| 326 | |||
| 327 | /** | ||
| 328 | * sci_request_get_post_context() - | ||
| 329 | * | ||
| 330 | * This macro returns the constructed post context result for the io request. | ||
| 331 | */ | ||
| 332 | #define sci_request_get_post_context(ireq) \ | ||
| 333 | ((ireq)->post_context) | ||
| 334 | |||
| 335 | /** | ||
| 336 | * sci_request_get_task_context() - | ||
| 337 | * | ||
| 338 | * This is a helper macro to return the os handle for this request object. | ||
| 339 | */ | ||
| 340 | #define sci_request_get_task_context(request) \ | ||
| 341 | ((request)->task_context_buffer) | ||
| 342 | |||
| 343 | /** | ||
| 344 | * sci_request_set_status() - | ||
| 345 | * | ||
| 346 | * This macro will set the scu hardware status and sci request completion | ||
| 347 | * status for an io request. | ||
| 348 | */ | ||
| 349 | #define sci_request_set_status(request, scu_status_code, sci_status_code) \ | ||
| 350 | { \ | ||
| 351 | (request)->scu_status = (scu_status_code); \ | ||
| 352 | (request)->sci_status = (sci_status_code); \ | ||
| 353 | } | ||
| 354 | |||
| 355 | enum sci_status sci_request_start(struct isci_request *ireq); | 303 | enum sci_status sci_request_start(struct isci_request *ireq); |
| 356 | enum sci_status sci_io_request_terminate(struct isci_request *ireq); | 304 | enum sci_status sci_io_request_terminate(struct isci_request *ireq); |
| 357 | enum sci_status | 305 | enum sci_status |
| @@ -382,27 +330,6 @@ sci_io_request_get_dma_addr(struct isci_request *ireq, void *virt_addr) | |||
| 382 | } | 330 | } |
| 383 | 331 | ||
| 384 | /** | 332 | /** |
| 385 | * This function gets the status of the request object. | ||
| 386 | * @request: This parameter points to the isci_request object | ||
| 387 | * | ||
| 388 | * status of the object as a isci_request_status enum. | ||
| 389 | */ | ||
| 390 | static inline enum isci_request_status | ||
| 391 | isci_request_get_state(struct isci_request *isci_request) | ||
| 392 | { | ||
| 393 | BUG_ON(isci_request == NULL); | ||
| 394 | |||
| 395 | /*probably a bad sign... */ | ||
| 396 | if (isci_request->status == unallocated) | ||
| 397 | dev_warn(&isci_request->isci_host->pdev->dev, | ||
| 398 | "%s: isci_request->status == unallocated\n", | ||
| 399 | __func__); | ||
| 400 | |||
| 401 | return isci_request->status; | ||
| 402 | } | ||
| 403 | |||
| 404 | |||
| 405 | /** | ||
| 406 | * isci_request_change_state() - This function sets the status of the request | 333 | * isci_request_change_state() - This function sets the status of the request |
| 407 | * object. | 334 | * object. |
| 408 | * @request: This parameter points to the isci_request object | 335 | * @request: This parameter points to the isci_request object |