diff options
| author | Adrian Bunk <bunk@stusta.de> | 2006-11-08 22:55:50 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-11-15 17:42:35 -0500 |
| commit | e5f82ab8342b527231cfcccde1fe265666e86b7b (patch) | |
| tree | 7a45b2899b3fa48c888be7dd034abeac96f09921 | |
| parent | db3a8815fb03f9985713b4ab29e208b7074f939c (diff) | |
[SCSI] qla2xxx: make some functions static
This patch makes some needlessly global functions static.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Acked-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_os.c | 12 | ||||
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_sup.c | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 3f20d765563e..5e70c49fdf84 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c | |||
| @@ -274,7 +274,7 @@ qla24xx_pci_info_str(struct scsi_qla_host *ha, char *str) | |||
| 274 | return str; | 274 | return str; |
| 275 | } | 275 | } |
| 276 | 276 | ||
| 277 | char * | 277 | static char * |
| 278 | qla2x00_fw_version_str(struct scsi_qla_host *ha, char *str) | 278 | qla2x00_fw_version_str(struct scsi_qla_host *ha, char *str) |
| 279 | { | 279 | { |
| 280 | char un_str[10]; | 280 | char un_str[10]; |
| @@ -312,7 +312,7 @@ qla2x00_fw_version_str(struct scsi_qla_host *ha, char *str) | |||
| 312 | return (str); | 312 | return (str); |
| 313 | } | 313 | } |
| 314 | 314 | ||
| 315 | char * | 315 | static char * |
| 316 | qla24xx_fw_version_str(struct scsi_qla_host *ha, char *str) | 316 | qla24xx_fw_version_str(struct scsi_qla_host *ha, char *str) |
| 317 | { | 317 | { |
| 318 | sprintf(str, "%d.%02d.%02d ", ha->fw_major_version, | 318 | sprintf(str, "%d.%02d.%02d ", ha->fw_major_version, |
| @@ -621,7 +621,7 @@ qla2x00_block_error_handler(struct scsi_cmnd *cmnd) | |||
| 621 | * Note: | 621 | * Note: |
| 622 | * Only return FAILED if command not returned by firmware. | 622 | * Only return FAILED if command not returned by firmware. |
| 623 | **************************************************************************/ | 623 | **************************************************************************/ |
| 624 | int | 624 | static int |
| 625 | qla2xxx_eh_abort(struct scsi_cmnd *cmd) | 625 | qla2xxx_eh_abort(struct scsi_cmnd *cmd) |
| 626 | { | 626 | { |
| 627 | scsi_qla_host_t *ha = to_qla_host(cmd->device->host); | 627 | scsi_qla_host_t *ha = to_qla_host(cmd->device->host); |
| @@ -758,7 +758,7 @@ qla2x00_eh_wait_for_pending_target_commands(scsi_qla_host_t *ha, unsigned int t) | |||
| 758 | * SUCCESS/FAILURE (defined as macro in scsi.h). | 758 | * SUCCESS/FAILURE (defined as macro in scsi.h). |
| 759 | * | 759 | * |
| 760 | **************************************************************************/ | 760 | **************************************************************************/ |
| 761 | int | 761 | static int |
| 762 | qla2xxx_eh_device_reset(struct scsi_cmnd *cmd) | 762 | qla2xxx_eh_device_reset(struct scsi_cmnd *cmd) |
| 763 | { | 763 | { |
| 764 | scsi_qla_host_t *ha = to_qla_host(cmd->device->host); | 764 | scsi_qla_host_t *ha = to_qla_host(cmd->device->host); |
| @@ -889,7 +889,7 @@ qla2x00_eh_wait_for_pending_commands(scsi_qla_host_t *ha) | |||
| 889 | * SUCCESS/FAILURE (defined as macro in scsi.h). | 889 | * SUCCESS/FAILURE (defined as macro in scsi.h). |
| 890 | * | 890 | * |
| 891 | **************************************************************************/ | 891 | **************************************************************************/ |
| 892 | int | 892 | static int |
| 893 | qla2xxx_eh_bus_reset(struct scsi_cmnd *cmd) | 893 | qla2xxx_eh_bus_reset(struct scsi_cmnd *cmd) |
| 894 | { | 894 | { |
| 895 | scsi_qla_host_t *ha = to_qla_host(cmd->device->host); | 895 | scsi_qla_host_t *ha = to_qla_host(cmd->device->host); |
| @@ -950,7 +950,7 @@ eh_bus_reset_done: | |||
| 950 | * | 950 | * |
| 951 | * Note: | 951 | * Note: |
| 952 | **************************************************************************/ | 952 | **************************************************************************/ |
| 953 | int | 953 | static int |
| 954 | qla2xxx_eh_host_reset(struct scsi_cmnd *cmd) | 954 | qla2xxx_eh_host_reset(struct scsi_cmnd *cmd) |
| 955 | { | 955 | { |
| 956 | scsi_qla_host_t *ha = to_qla_host(cmd->device->host); | 956 | scsi_qla_host_t *ha = to_qla_host(cmd->device->host); |
diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c index c71dbd5bd543..15390ad87456 100644 --- a/drivers/scsi/qla2xxx/qla_sup.c +++ b/drivers/scsi/qla2xxx/qla_sup.c | |||
| @@ -449,7 +449,7 @@ nvram_data_to_access_addr(uint32_t naddr) | |||
| 449 | return FARX_ACCESS_NVRAM_DATA | naddr; | 449 | return FARX_ACCESS_NVRAM_DATA | naddr; |
| 450 | } | 450 | } |
| 451 | 451 | ||
| 452 | uint32_t | 452 | static uint32_t |
| 453 | qla24xx_read_flash_dword(scsi_qla_host_t *ha, uint32_t addr) | 453 | qla24xx_read_flash_dword(scsi_qla_host_t *ha, uint32_t addr) |
| 454 | { | 454 | { |
| 455 | int rval; | 455 | int rval; |
| @@ -490,7 +490,7 @@ qla24xx_read_flash_data(scsi_qla_host_t *ha, uint32_t *dwptr, uint32_t faddr, | |||
| 490 | return dwptr; | 490 | return dwptr; |
| 491 | } | 491 | } |
| 492 | 492 | ||
| 493 | int | 493 | static int |
| 494 | qla24xx_write_flash_dword(scsi_qla_host_t *ha, uint32_t addr, uint32_t data) | 494 | qla24xx_write_flash_dword(scsi_qla_host_t *ha, uint32_t addr, uint32_t data) |
| 495 | { | 495 | { |
| 496 | int rval; | 496 | int rval; |
| @@ -512,7 +512,7 @@ qla24xx_write_flash_dword(scsi_qla_host_t *ha, uint32_t addr, uint32_t data) | |||
| 512 | return rval; | 512 | return rval; |
| 513 | } | 513 | } |
| 514 | 514 | ||
| 515 | void | 515 | static void |
| 516 | qla24xx_get_flash_manufacturer(scsi_qla_host_t *ha, uint8_t *man_id, | 516 | qla24xx_get_flash_manufacturer(scsi_qla_host_t *ha, uint8_t *man_id, |
| 517 | uint8_t *flash_id) | 517 | uint8_t *flash_id) |
| 518 | { | 518 | { |
| @@ -537,7 +537,7 @@ qla24xx_get_flash_manufacturer(scsi_qla_host_t *ha, uint8_t *man_id, | |||
| 537 | } | 537 | } |
| 538 | } | 538 | } |
| 539 | 539 | ||
| 540 | int | 540 | static int |
| 541 | qla24xx_write_flash_data(scsi_qla_host_t *ha, uint32_t *dwptr, uint32_t faddr, | 541 | qla24xx_write_flash_data(scsi_qla_host_t *ha, uint32_t *dwptr, uint32_t faddr, |
| 542 | uint32_t dwords) | 542 | uint32_t dwords) |
| 543 | { | 543 | { |
