diff options
author | Adrian Bunk <bunk@kernel.org> | 2008-03-28 17:48:34 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-04-07 13:19:08 -0400 |
commit | 81e56ded878aeb8730f18c1d0a70d5face788be3 (patch) | |
tree | 18485d237927fb1d95179bc1e03d4ebe6ef7d389 /drivers/scsi/aic94xx/aic94xx_scb.c | |
parent | d70d4667e9eead06aa38be947274fda22dcf923b (diff) |
[SCSI] aic94xx: cleanups
- static functions in .c files shouldn't be marked inline
- make needlessly global code static
- remove the unused aic94xx_seq.c:asd_unpause_lseq()
- #if 0 other unused code
[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi/aic94xx/aic94xx_scb.c')
-rw-r--r-- | drivers/scsi/aic94xx/aic94xx_scb.c | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/drivers/scsi/aic94xx/aic94xx_scb.c b/drivers/scsi/aic94xx/aic94xx_scb.c index ab350504ca5a..46643319c520 100644 --- a/drivers/scsi/aic94xx/aic94xx_scb.c +++ b/drivers/scsi/aic94xx/aic94xx_scb.c | |||
@@ -50,7 +50,7 @@ | |||
50 | | CURRENT_SPINUP_HOLD | CURRENT_GTO_TIMEOUT \ | 50 | | CURRENT_SPINUP_HOLD | CURRENT_GTO_TIMEOUT \ |
51 | | CURRENT_OOB_ERROR) | 51 | | CURRENT_OOB_ERROR) |
52 | 52 | ||
53 | static inline void get_lrate_mode(struct asd_phy *phy, u8 oob_mode) | 53 | static void get_lrate_mode(struct asd_phy *phy, u8 oob_mode) |
54 | { | 54 | { |
55 | struct sas_phy *sas_phy = phy->sas_phy.phy; | 55 | struct sas_phy *sas_phy = phy->sas_phy.phy; |
56 | 56 | ||
@@ -81,7 +81,7 @@ static inline void get_lrate_mode(struct asd_phy *phy, u8 oob_mode) | |||
81 | phy->sas_phy.oob_mode = SATA_OOB_MODE; | 81 | phy->sas_phy.oob_mode = SATA_OOB_MODE; |
82 | } | 82 | } |
83 | 83 | ||
84 | static inline void asd_phy_event_tasklet(struct asd_ascb *ascb, | 84 | static void asd_phy_event_tasklet(struct asd_ascb *ascb, |
85 | struct done_list_struct *dl) | 85 | struct done_list_struct *dl) |
86 | { | 86 | { |
87 | struct asd_ha_struct *asd_ha = ascb->ha; | 87 | struct asd_ha_struct *asd_ha = ascb->ha; |
@@ -125,8 +125,7 @@ static inline void asd_phy_event_tasklet(struct asd_ascb *ascb, | |||
125 | } | 125 | } |
126 | 126 | ||
127 | /* If phys are enabled sparsely, this will do the right thing. */ | 127 | /* If phys are enabled sparsely, this will do the right thing. */ |
128 | static inline unsigned ord_phy(struct asd_ha_struct *asd_ha, | 128 | static unsigned ord_phy(struct asd_ha_struct *asd_ha, struct asd_phy *phy) |
129 | struct asd_phy *phy) | ||
130 | { | 129 | { |
131 | u8 enabled_mask = asd_ha->hw_prof.enabled_phys; | 130 | u8 enabled_mask = asd_ha->hw_prof.enabled_phys; |
132 | int i, k = 0; | 131 | int i, k = 0; |
@@ -151,7 +150,7 @@ static inline unsigned ord_phy(struct asd_ha_struct *asd_ha, | |||
151 | * LOCKING: the frame_rcvd_lock needs to be held since this parses the frame | 150 | * LOCKING: the frame_rcvd_lock needs to be held since this parses the frame |
152 | * buffer. | 151 | * buffer. |
153 | */ | 152 | */ |
154 | static inline void asd_get_attached_sas_addr(struct asd_phy *phy, u8 *sas_addr) | 153 | static void asd_get_attached_sas_addr(struct asd_phy *phy, u8 *sas_addr) |
155 | { | 154 | { |
156 | if (phy->sas_phy.frame_rcvd[0] == 0x34 | 155 | if (phy->sas_phy.frame_rcvd[0] == 0x34 |
157 | && phy->sas_phy.oob_mode == SATA_OOB_MODE) { | 156 | && phy->sas_phy.oob_mode == SATA_OOB_MODE) { |
@@ -232,9 +231,9 @@ static void asd_deform_port(struct asd_ha_struct *asd_ha, struct asd_phy *phy) | |||
232 | spin_unlock_irqrestore(&asd_ha->asd_ports_lock, flags); | 231 | spin_unlock_irqrestore(&asd_ha->asd_ports_lock, flags); |
233 | } | 232 | } |
234 | 233 | ||
235 | static inline void asd_bytes_dmaed_tasklet(struct asd_ascb *ascb, | 234 | static void asd_bytes_dmaed_tasklet(struct asd_ascb *ascb, |
236 | struct done_list_struct *dl, | 235 | struct done_list_struct *dl, |
237 | int edb_id, int phy_id) | 236 | int edb_id, int phy_id) |
238 | { | 237 | { |
239 | unsigned long flags; | 238 | unsigned long flags; |
240 | int edb_el = edb_id + ascb->edb_index; | 239 | int edb_el = edb_id + ascb->edb_index; |
@@ -255,9 +254,9 @@ static inline void asd_bytes_dmaed_tasklet(struct asd_ascb *ascb, | |||
255 | sas_ha->notify_port_event(&phy->sas_phy, PORTE_BYTES_DMAED); | 254 | sas_ha->notify_port_event(&phy->sas_phy, PORTE_BYTES_DMAED); |
256 | } | 255 | } |
257 | 256 | ||
258 | static inline void asd_link_reset_err_tasklet(struct asd_ascb *ascb, | 257 | static void asd_link_reset_err_tasklet(struct asd_ascb *ascb, |
259 | struct done_list_struct *dl, | 258 | struct done_list_struct *dl, |
260 | int phy_id) | 259 | int phy_id) |
261 | { | 260 | { |
262 | struct asd_ha_struct *asd_ha = ascb->ha; | 261 | struct asd_ha_struct *asd_ha = ascb->ha; |
263 | struct sas_ha_struct *sas_ha = &asd_ha->sas_ha; | 262 | struct sas_ha_struct *sas_ha = &asd_ha->sas_ha; |
@@ -308,9 +307,9 @@ out: | |||
308 | ; | 307 | ; |
309 | } | 308 | } |
310 | 309 | ||
311 | static inline void asd_primitive_rcvd_tasklet(struct asd_ascb *ascb, | 310 | static void asd_primitive_rcvd_tasklet(struct asd_ascb *ascb, |
312 | struct done_list_struct *dl, | 311 | struct done_list_struct *dl, |
313 | int phy_id) | 312 | int phy_id) |
314 | { | 313 | { |
315 | unsigned long flags; | 314 | unsigned long flags; |
316 | struct sas_ha_struct *sas_ha = &ascb->ha->sas_ha; | 315 | struct sas_ha_struct *sas_ha = &ascb->ha->sas_ha; |
@@ -715,7 +714,7 @@ out: | |||
715 | asd_ascb_free(ascb); | 714 | asd_ascb_free(ascb); |
716 | } | 715 | } |
717 | 716 | ||
718 | static inline void set_speed_mask(u8 *speed_mask, struct asd_phy_desc *pd) | 717 | static void set_speed_mask(u8 *speed_mask, struct asd_phy_desc *pd) |
719 | { | 718 | { |
720 | /* disable all speeds, then enable defaults */ | 719 | /* disable all speeds, then enable defaults */ |
721 | *speed_mask = SAS_SPEED_60_DIS | SAS_SPEED_30_DIS | SAS_SPEED_15_DIS | 720 | *speed_mask = SAS_SPEED_60_DIS | SAS_SPEED_30_DIS | SAS_SPEED_15_DIS |
@@ -820,6 +819,8 @@ void asd_build_control_phy(struct asd_ascb *ascb, int phy_id, u8 subfunc) | |||
820 | 819 | ||
821 | /* ---------- INITIATE LINK ADM TASK ---------- */ | 820 | /* ---------- INITIATE LINK ADM TASK ---------- */ |
822 | 821 | ||
822 | #if 0 | ||
823 | |||
823 | static void link_adm_tasklet_complete(struct asd_ascb *ascb, | 824 | static void link_adm_tasklet_complete(struct asd_ascb *ascb, |
824 | struct done_list_struct *dl) | 825 | struct done_list_struct *dl) |
825 | { | 826 | { |
@@ -852,6 +853,8 @@ void asd_build_initiate_link_adm_task(struct asd_ascb *ascb, int phy_id, | |||
852 | ascb->tasklet_complete = link_adm_tasklet_complete; | 853 | ascb->tasklet_complete = link_adm_tasklet_complete; |
853 | } | 854 | } |
854 | 855 | ||
856 | #endif /* 0 */ | ||
857 | |||
855 | /* ---------- SCB timer ---------- */ | 858 | /* ---------- SCB timer ---------- */ |
856 | 859 | ||
857 | /** | 860 | /** |