diff options
Diffstat (limited to 'drivers/scsi/aic94xx/aic94xx_init.c')
-rw-r--r-- | drivers/scsi/aic94xx/aic94xx_init.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c index 88d1e731b65e..90f5e0a6f2e3 100644 --- a/drivers/scsi/aic94xx/aic94xx_init.c +++ b/drivers/scsi/aic94xx/aic94xx_init.c | |||
@@ -56,8 +56,6 @@ MODULE_PARM_DESC(collector, "\n" | |||
56 | "\tThe aic94xx SAS LLDD supports both modes.\n" | 56 | "\tThe aic94xx SAS LLDD supports both modes.\n" |
57 | "\tDefault: 0 (Direct Mode).\n"); | 57 | "\tDefault: 0 (Direct Mode).\n"); |
58 | 58 | ||
59 | char sas_addr_str[2*SAS_ADDR_SIZE + 1] = ""; | ||
60 | |||
61 | static struct scsi_transport_template *aic94xx_transport_template; | 59 | static struct scsi_transport_template *aic94xx_transport_template; |
62 | static int asd_scan_finished(struct Scsi_Host *, unsigned long); | 60 | static int asd_scan_finished(struct Scsi_Host *, unsigned long); |
63 | static void asd_scan_start(struct Scsi_Host *); | 61 | static void asd_scan_start(struct Scsi_Host *); |
@@ -547,7 +545,7 @@ static struct asd_pcidev_struct { | |||
547 | }, | 545 | }, |
548 | }; | 546 | }; |
549 | 547 | ||
550 | static inline int asd_create_ha_caches(struct asd_ha_struct *asd_ha) | 548 | static int asd_create_ha_caches(struct asd_ha_struct *asd_ha) |
551 | { | 549 | { |
552 | asd_ha->scb_pool = dma_pool_create(ASD_DRIVER_NAME "_scb_pool", | 550 | asd_ha->scb_pool = dma_pool_create(ASD_DRIVER_NAME "_scb_pool", |
553 | &asd_ha->pcidev->dev, | 551 | &asd_ha->pcidev->dev, |
@@ -565,7 +563,7 @@ static inline int asd_create_ha_caches(struct asd_ha_struct *asd_ha) | |||
565 | * asd_free_edbs -- free empty data buffers | 563 | * asd_free_edbs -- free empty data buffers |
566 | * asd_ha: pointer to host adapter structure | 564 | * asd_ha: pointer to host adapter structure |
567 | */ | 565 | */ |
568 | static inline void asd_free_edbs(struct asd_ha_struct *asd_ha) | 566 | static void asd_free_edbs(struct asd_ha_struct *asd_ha) |
569 | { | 567 | { |
570 | struct asd_seq_data *seq = &asd_ha->seq; | 568 | struct asd_seq_data *seq = &asd_ha->seq; |
571 | int i; | 569 | int i; |
@@ -576,7 +574,7 @@ static inline void asd_free_edbs(struct asd_ha_struct *asd_ha) | |||
576 | seq->edb_arr = NULL; | 574 | seq->edb_arr = NULL; |
577 | } | 575 | } |
578 | 576 | ||
579 | static inline void asd_free_escbs(struct asd_ha_struct *asd_ha) | 577 | static void asd_free_escbs(struct asd_ha_struct *asd_ha) |
580 | { | 578 | { |
581 | struct asd_seq_data *seq = &asd_ha->seq; | 579 | struct asd_seq_data *seq = &asd_ha->seq; |
582 | int i; | 580 | int i; |
@@ -591,7 +589,7 @@ static inline void asd_free_escbs(struct asd_ha_struct *asd_ha) | |||
591 | seq->escb_arr = NULL; | 589 | seq->escb_arr = NULL; |
592 | } | 590 | } |
593 | 591 | ||
594 | static inline void asd_destroy_ha_caches(struct asd_ha_struct *asd_ha) | 592 | static void asd_destroy_ha_caches(struct asd_ha_struct *asd_ha) |
595 | { | 593 | { |
596 | int i; | 594 | int i; |
597 | 595 | ||