Skip to content

L
linux
Commit 81e56ded authored by Adrian Bunk's avatar Adrian Bunk Committed by James Bottomley
Browse files
Options

[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: default avatarAdrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent d70d4667
Hide whitespace changes
Inline Side-by-side
Showing with 87 additions and 113 deletions
drivers/scsi/aic94xx/aic94xx_dev.c
View file @ 81e56ded
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#define SET_DDB(_ddb, _ha) set_bit(_ddb, (_ha)->hw_prof.ddb_bitmap) #define SET_DDB(_ddb, _ha) set_bit(_ddb, (_ha)->hw_prof.ddb_bitmap)
#define CLEAR_DDB(_ddb, _ha) clear_bit(_ddb, (_ha)->hw_prof.ddb_bitmap) #define CLEAR_DDB(_ddb, _ha) clear_bit(_ddb, (_ha)->hw_prof.ddb_bitmap)
static inline int asd_get_ddb(struct asd_ha_struct *asd_ha) static int asd_get_ddb(struct asd_ha_struct *asd_ha)
{ {
int ddb, i; int ddb, i;
...@@ -71,7 +71,7 @@ static inline int asd_get_ddb(struct asd_ha_struct *asd_ha) ...@@ -71,7 +71,7 @@ static inline int asd_get_ddb(struct asd_ha_struct *asd_ha)
#define NCQ_DATA_SCB_PTR offsetof(struct asd_ddb_stp_sata_target_port, ncq_data_scb_ptr) #define NCQ_DATA_SCB_PTR offsetof(struct asd_ddb_stp_sata_target_port, ncq_data_scb_ptr)
#define ITNL_TIMEOUT offsetof(struct asd_ddb_ssp_smp_target_port, itnl_timeout) #define ITNL_TIMEOUT offsetof(struct asd_ddb_ssp_smp_target_port, itnl_timeout)
static inline void asd_free_ddb(struct asd_ha_struct *asd_ha, int ddb) static void asd_free_ddb(struct asd_ha_struct *asd_ha, int ddb)
{ {
if (!ddb || ddb >= 0xFFFF) if (!ddb || ddb >= 0xFFFF)
return; return;
...@@ -79,7 +79,7 @@ static inline void asd_free_ddb(struct asd_ha_struct *asd_ha, int ddb) ...@@ -79,7 +79,7 @@ static inline void asd_free_ddb(struct asd_ha_struct *asd_ha, int ddb)
CLEAR_DDB(ddb, asd_ha); CLEAR_DDB(ddb, asd_ha);
} }
static inline void asd_set_ddb_type(struct domain_device *dev) static void asd_set_ddb_type(struct domain_device *dev)
{ {
struct asd_ha_struct *asd_ha = dev->port->ha->lldd_ha; struct asd_ha_struct *asd_ha = dev->port->ha->lldd_ha;
int ddb = (int) (unsigned long) dev->lldd_dev; int ddb = (int) (unsigned long) dev->lldd_dev;
...@@ -109,7 +109,7 @@ static int asd_init_sata_tag_ddb(struct domain_device *dev) ...@@ -109,7 +109,7 @@ static int asd_init_sata_tag_ddb(struct domain_device *dev)
return 0; return 0;
} }
static inline int asd_init_sata(struct domain_device *dev) static int asd_init_sata(struct domain_device *dev)
{ {
struct asd_ha_struct *asd_ha = dev->port->ha->lldd_ha; struct asd_ha_struct *asd_ha = dev->port->ha->lldd_ha;
int ddb = (int) (unsigned long) dev->lldd_dev; int ddb = (int) (unsigned long) dev->lldd_dev;
......
drivers/scsi/aic94xx/aic94xx_dump.c
View file @ 81e56ded
...@@ -738,6 +738,8 @@ static void asd_dump_lseq_state(struct asd_ha_struct *asd_ha, int lseq) ...@@ -738,6 +738,8 @@ static void asd_dump_lseq_state(struct asd_ha_struct *asd_ha, int lseq)
PRINT_LMIP_dword(asd_ha, lseq, DEV_PRES_TIMER_TERM_TS); PRINT_LMIP_dword(asd_ha, lseq, DEV_PRES_TIMER_TERM_TS);
} }
#if 0
/** /**
* asd_dump_ddb_site -- dump a CSEQ DDB site * asd_dump_ddb_site -- dump a CSEQ DDB site
* @asd_ha: pointer to host adapter structure * @asd_ha: pointer to host adapter structure
...@@ -880,6 +882,8 @@ void asd_dump_scb_sites(struct asd_ha_struct *asd_ha) ...@@ -880,6 +882,8 @@ void asd_dump_scb_sites(struct asd_ha_struct *asd_ha)
} }
} }
#endif /* 0 */
/** /**
* ads_dump_seq_state -- dump CSEQ and LSEQ states * ads_dump_seq_state -- dump CSEQ and LSEQ states
* @asd_ha: pointer to host adapter structure * @asd_ha: pointer to host adapter structure
...@@ -922,7 +926,9 @@ void asd_dump_frame_rcvd(struct asd_phy *phy, ...@@ -922,7 +926,9 @@ void asd_dump_frame_rcvd(struct asd_phy *phy,
spin_unlock_irqrestore(&phy->sas_phy.frame_rcvd_lock, flags); spin_unlock_irqrestore(&phy->sas_phy.frame_rcvd_lock, flags);
} }
static inline void asd_dump_scb(struct asd_ascb *ascb, int ind) #if 0
static void asd_dump_scb(struct asd_ascb *ascb, int ind)
{ {
asd_printk("scb%d: vaddr: 0x%p, dma_handle: 0x%llx, next: 0x%llx, " asd_printk("scb%d: vaddr: 0x%p, dma_handle: 0x%llx, next: 0x%llx, "
"index:%d, opcode:0x%02x\n", "index:%d, opcode:0x%02x\n",
...@@ -956,4 +962,6 @@ void asd_dump_scb_list(struct asd_ascb *ascb, int num) ...@@ -956,4 +962,6 @@ void asd_dump_scb_list(struct asd_ascb *ascb, int num)
} }
} }
#endif /* 0 */
#endif /* ASD_DEBUG */ #endif /* ASD_DEBUG */
drivers/scsi/aic94xx/aic94xx_dump.h
View file @ 81e56ded
...@@ -29,24 +29,15 @@ ...@@ -29,24 +29,15 @@
#ifdef ASD_DEBUG #ifdef ASD_DEBUG
void asd_dump_ddb_0(struct asd_ha_struct *asd_ha);
void asd_dump_target_ddb(struct asd_ha_struct *asd_ha, u16 site_no);
void asd_dump_scb_sites(struct asd_ha_struct *asd_ha);
void asd_dump_seq_state(struct asd_ha_struct *asd_ha, u8 lseq_mask); void asd_dump_seq_state(struct asd_ha_struct *asd_ha, u8 lseq_mask);
void asd_dump_frame_rcvd(struct asd_phy *phy, void asd_dump_frame_rcvd(struct asd_phy *phy,
struct done_list_struct *dl); struct done_list_struct *dl);
void asd_dump_scb_list(struct asd_ascb *ascb, int num);
#else /* ASD_DEBUG */ #else /* ASD_DEBUG */
static inline void asd_dump_ddb_0(struct asd_ha_struct *asd_ha) { }
static inline void asd_dump_target_ddb(struct asd_ha_struct *asd_ha,
u16 site_no) { }
static inline void asd_dump_scb_sites(struct asd_ha_struct *asd_ha) { }
static inline void asd_dump_seq_state(struct asd_ha_struct *asd_ha, static inline void asd_dump_seq_state(struct asd_ha_struct *asd_ha,
u8 lseq_mask) { } u8 lseq_mask) { }
static inline void asd_dump_frame_rcvd(struct asd_phy *phy, static inline void asd_dump_frame_rcvd(struct asd_phy *phy,
struct done_list_struct *dl) { } struct done_list_struct *dl) { }
static inline void asd_dump_scb_list(struct asd_ascb *ascb, int num) { }
#endif /* ASD_DEBUG */ #endif /* ASD_DEBUG */
#endif /* _AIC94XX_DUMP_H_ */ #endif /* _AIC94XX_DUMP_H_ */
drivers/scsi/aic94xx/aic94xx_hwi.c
View file @ 81e56ded
...@@ -250,7 +250,7 @@ static int asd_init_scbs(struct asd_ha_struct *asd_ha) ...@@ -250,7 +250,7 @@ static int asd_init_scbs(struct asd_ha_struct *asd_ha)
return 0; return 0;
} }
static inline void asd_get_max_scb_ddb(struct asd_ha_struct *asd_ha) static void asd_get_max_scb_ddb(struct asd_ha_struct *asd_ha)
{ {
asd_ha->hw_prof.max_scbs = asd_get_cmdctx_size(asd_ha)/ASD_SCB_SIZE; asd_ha->hw_prof.max_scbs = asd_get_cmdctx_size(asd_ha)/ASD_SCB_SIZE;
asd_ha->hw_prof.max_ddbs = asd_get_devctx_size(asd_ha)/ASD_DDB_SIZE; asd_ha->hw_prof.max_ddbs = asd_get_devctx_size(asd_ha)/ASD_DDB_SIZE;
...@@ -771,7 +771,7 @@ static void asd_dl_tasklet_handler(unsigned long data) ...@@ -771,7 +771,7 @@ static void asd_dl_tasklet_handler(unsigned long data)
* asd_process_donelist_isr -- schedule processing of done list entries * asd_process_donelist_isr -- schedule processing of done list entries
* @asd_ha: pointer to host adapter structure * @asd_ha: pointer to host adapter structure
*/ */
static inline void asd_process_donelist_isr(struct asd_ha_struct *asd_ha) static void asd_process_donelist_isr(struct asd_ha_struct *asd_ha)
{ {
tasklet_schedule(&asd_ha->seq.dl_tasklet); tasklet_schedule(&asd_ha->seq.dl_tasklet);
} }
...@@ -780,7 +780,7 @@ static inline void asd_process_donelist_isr(struct asd_ha_struct *asd_ha) ...@@ -780,7 +780,7 @@ static inline void asd_process_donelist_isr(struct asd_ha_struct *asd_ha)
* asd_com_sas_isr -- process device communication interrupt (COMINT) * asd_com_sas_isr -- process device communication interrupt (COMINT)
* @asd_ha: pointer to host adapter structure * @asd_ha: pointer to host adapter structure
*/ */
static inline void asd_com_sas_isr(struct asd_ha_struct *asd_ha) static void asd_com_sas_isr(struct asd_ha_struct *asd_ha)
{ {
u32 comstat = asd_read_reg_dword(asd_ha, COMSTAT); u32 comstat = asd_read_reg_dword(asd_ha, COMSTAT);
...@@ -819,7 +819,7 @@ static inline void asd_com_sas_isr(struct asd_ha_struct *asd_ha) ...@@ -819,7 +819,7 @@ static inline void asd_com_sas_isr(struct asd_ha_struct *asd_ha)
asd_chip_reset(asd_ha); asd_chip_reset(asd_ha);
} }
static inline void asd_arp2_err(struct asd_ha_struct *asd_ha, u32 dchstatus) static void asd_arp2_err(struct asd_ha_struct *asd_ha, u32 dchstatus)
{ {
static const char *halt_code[256] = { static const char *halt_code[256] = {
"UNEXPECTED_INTERRUPT0", "UNEXPECTED_INTERRUPT0",
...@@ -906,7 +906,7 @@ static inline void asd_arp2_err(struct asd_ha_struct *asd_ha, u32 dchstatus) ...@@ -906,7 +906,7 @@ static inline void asd_arp2_err(struct asd_ha_struct *asd_ha, u32 dchstatus)
* asd_dch_sas_isr -- process device channel interrupt (DEVINT) * asd_dch_sas_isr -- process device channel interrupt (DEVINT)
* @asd_ha: pointer to host adapter structure * @asd_ha: pointer to host adapter structure
*/ */
static inline void asd_dch_sas_isr(struct asd_ha_struct *asd_ha) static void asd_dch_sas_isr(struct asd_ha_struct *asd_ha)
{ {
u32 dchstatus = asd_read_reg_dword(asd_ha, DCHSTATUS); u32 dchstatus = asd_read_reg_dword(asd_ha, DCHSTATUS);
...@@ -921,7 +921,7 @@ static inline void asd_dch_sas_isr(struct asd_ha_struct *asd_ha) ...@@ -921,7 +921,7 @@ static inline void asd_dch_sas_isr(struct asd_ha_struct *asd_ha)
* ads_rbi_exsi_isr -- process external system interface interrupt (INITERR) * ads_rbi_exsi_isr -- process external system interface interrupt (INITERR)
* @asd_ha: pointer to host adapter structure * @asd_ha: pointer to host adapter structure
*/ */
static inline void asd_rbi_exsi_isr(struct asd_ha_struct *asd_ha) static void asd_rbi_exsi_isr(struct asd_ha_struct *asd_ha)
{ {
u32 stat0r = asd_read_reg_dword(asd_ha, ASISTAT0R); u32 stat0r = asd_read_reg_dword(asd_ha, ASISTAT0R);
...@@ -969,7 +969,7 @@ static inline void asd_rbi_exsi_isr(struct asd_ha_struct *asd_ha) ...@@ -969,7 +969,7 @@ static inline void asd_rbi_exsi_isr(struct asd_ha_struct *asd_ha)
* *
* Asserted on PCIX errors: target abort, etc. * Asserted on PCIX errors: target abort, etc.
*/ */
static inline void asd_hst_pcix_isr(struct asd_ha_struct *asd_ha) static void asd_hst_pcix_isr(struct asd_ha_struct *asd_ha)
{ {
u16 status; u16 status;
u32 pcix_status; u32 pcix_status;
...@@ -1042,8 +1042,8 @@ irqreturn_t asd_hw_isr(int irq, void *dev_id) ...@@ -1042,8 +1042,8 @@ irqreturn_t asd_hw_isr(int irq, void *dev_id)
/* ---------- SCB handling ---------- */ /* ---------- SCB handling ---------- */
static inline struct asd_ascb *asd_ascb_alloc(struct asd_ha_struct *asd_ha, static struct asd_ascb *asd_ascb_alloc(struct asd_ha_struct *asd_ha,
gfp_t gfp_flags) gfp_t gfp_flags)
{ {
extern struct kmem_cache *asd_ascb_cache; extern struct kmem_cache *asd_ascb_cache;
struct asd_seq_data *seq = &asd_ha->seq; struct asd_seq_data *seq = &asd_ha->seq;
...@@ -1142,8 +1142,8 @@ struct asd_ascb *asd_ascb_alloc_list(struct asd_ha_struct ...@@ -1142,8 +1142,8 @@ struct asd_ascb *asd_ascb_alloc_list(struct asd_ha_struct
* *
* LOCKING: called with the pending list lock held. * LOCKING: called with the pending list lock held.
*/ */
static inline void asd_swap_head_scb(struct asd_ha_struct *asd_ha, static void asd_swap_head_scb(struct asd_ha_struct *asd_ha,
struct asd_ascb *ascb) struct asd_ascb *ascb)
{ {
struct asd_seq_data *seq = &asd_ha->seq; struct asd_seq_data *seq = &asd_ha->seq;
struct asd_ascb *last = list_entry(ascb->list.prev, struct asd_ascb *last = list_entry(ascb->list.prev,
...@@ -1169,7 +1169,7 @@ static inline void asd_swap_head_scb(struct asd_ha_struct *asd_ha, ...@@ -1169,7 +1169,7 @@ static inline void asd_swap_head_scb(struct asd_ha_struct *asd_ha,
* intended to be called from asd_post_ascb_list(), just prior to * intended to be called from asd_post_ascb_list(), just prior to
* posting the SCBs to the sequencer. * posting the SCBs to the sequencer.
*/ */
static inline void asd_start_scb_timers(struct list_head *list) static void asd_start_scb_timers(struct list_head *list)
{ {
struct asd_ascb *ascb; struct asd_ascb *ascb;
list_for_each_entry(ascb, list, list) { list_for_each_entry(ascb, list, list) {
......
drivers/scsi/aic94xx/aic94xx_hwi.h
View file @ 81e56ded
...@@ -391,8 +391,6 @@ void asd_build_control_phy(struct asd_ascb *ascb, int phy_id, u8 subfunc); ...@@ -391,8 +391,6 @@ void asd_build_control_phy(struct asd_ascb *ascb, int phy_id, u8 subfunc);
void asd_control_led(struct asd_ha_struct *asd_ha, int phy_id, int op); void asd_control_led(struct asd_ha_struct *asd_ha, int phy_id, int op);
void asd_turn_led(struct asd_ha_struct *asd_ha, int phy_id, int op); void asd_turn_led(struct asd_ha_struct *asd_ha, int phy_id, int op);
int asd_enable_phys(struct asd_ha_struct *asd_ha, const u8 phy_mask); int asd_enable_phys(struct asd_ha_struct *asd_ha, const u8 phy_mask);
void asd_build_initiate_link_adm_task(struct asd_ascb *ascb, int phy_id,
u8 subfunc);
void asd_ascb_timedout(unsigned long data); void asd_ascb_timedout(unsigned long data);
int asd_chip_hardrst(struct asd_ha_struct *asd_ha); int asd_chip_hardrst(struct asd_ha_struct *asd_ha);
......
drivers/scsi/aic94xx/aic94xx_init.c
View file @ 81e56ded
...@@ -545,7 +545,7 @@ static struct asd_pcidev_struct { ...@@ -545,7 +545,7 @@ static struct asd_pcidev_struct {
}, },
}; };
static inline int asd_create_ha_caches(struct asd_ha_struct *asd_ha) static int asd_create_ha_caches(struct asd_ha_struct *asd_ha)
{ {
asd_ha->scb_pool = dma_pool_create(ASD_DRIVER_NAME "_scb_pool", asd_ha->scb_pool = dma_pool_create(ASD_DRIVER_NAME "_scb_pool",
&asd_ha->pcidev->dev, &asd_ha->pcidev->dev,
...@@ -563,7 +563,7 @@ static inline int asd_create_ha_caches(struct asd_ha_struct *asd_ha) ...@@ -563,7 +563,7 @@ static inline int asd_create_ha_caches(struct asd_ha_struct *asd_ha)
* asd_free_edbs -- free empty data buffers * asd_free_edbs -- free empty data buffers
* asd_ha: pointer to host adapter structure * asd_ha: pointer to host adapter structure
*/ */
static inline void asd_free_edbs(struct asd_ha_struct *asd_ha) static void asd_free_edbs(struct asd_ha_struct *asd_ha)
{ {
struct asd_seq_data *seq = &asd_ha->seq; struct asd_seq_data *seq = &asd_ha->seq;
int i; int i;
...@@ -574,7 +574,7 @@ static inline void asd_free_edbs(struct asd_ha_struct *asd_ha) ...@@ -574,7 +574,7 @@ static inline void asd_free_edbs(struct asd_ha_struct *asd_ha)
seq->edb_arr = NULL; seq->edb_arr = NULL;
} }
static inline void asd_free_escbs(struct asd_ha_struct *asd_ha) static void asd_free_escbs(struct asd_ha_struct *asd_ha)
{ {
struct asd_seq_data *seq = &asd_ha->seq; struct asd_seq_data *seq = &asd_ha->seq;
int i; int i;
...@@ -589,7 +589,7 @@ static inline void asd_free_escbs(struct asd_ha_struct *asd_ha) ...@@ -589,7 +589,7 @@ static inline void asd_free_escbs(struct asd_ha_struct *asd_ha)
seq->escb_arr = NULL; seq->escb_arr = NULL;
} }
static inline void asd_destroy_ha_caches(struct asd_ha_struct *asd_ha) static void asd_destroy_ha_caches(struct asd_ha_struct *asd_ha)
{ {
int i; int i;
......
drivers/scsi/aic94xx/aic94xx_reg.c
View file @ 81e56ded
...@@ -32,8 +32,8 @@ ...@@ -32,8 +32,8 @@
* Offset comes before value to remind that the operation of * Offset comes before value to remind that the operation of
* this function is *offs = val. * this function is *offs = val.
*/ */
static inline void asd_write_byte(struct asd_ha_struct *asd_ha, static void asd_write_byte(struct asd_ha_struct *asd_ha,
unsigned long offs, u8 val) unsigned long offs, u8 val)
{ {
if (unlikely(asd_ha->iospace)) if (unlikely(asd_ha->iospace))
outb(val, outb(val,
...@@ -43,8 +43,8 @@ static inline void asd_write_byte(struct asd_ha_struct *asd_ha, ...@@ -43,8 +43,8 @@ static inline void asd_write_byte(struct asd_ha_struct *asd_ha,
wmb(); wmb();
} }
static inline void asd_write_word(struct asd_ha_struct *asd_ha, static void asd_write_word(struct asd_ha_struct *asd_ha,
unsigned long offs, u16 val) unsigned long offs, u16 val)
{ {
if (unlikely(asd_ha->iospace)) if (unlikely(asd_ha->iospace))
outw(val, outw(val,
...@@ -54,8 +54,8 @@ static inline void asd_write_word(struct asd_ha_struct *asd_ha, ...@@ -54,8 +54,8 @@ static inline void asd_write_word(struct asd_ha_struct *asd_ha,
wmb(); wmb();
} }
static inline void asd_write_dword(struct asd_ha_struct *asd_ha, static void asd_write_dword(struct asd_ha_struct *asd_ha,
unsigned long offs, u32 val) unsigned long offs, u32 val)
{ {
if (unlikely(asd_ha->iospace)) if (unlikely(asd_ha->iospace))
outl(val, outl(val,
...@@ -67,8 +67,7 @@ static inline void asd_write_dword(struct asd_ha_struct *asd_ha, ...@@ -67,8 +67,7 @@ static inline void asd_write_dword(struct asd_ha_struct *asd_ha,
/* Reading from device address space. /* Reading from device address space.
*/ */
static inline u8 asd_read_byte(struct asd_ha_struct *asd_ha, static u8 asd_read_byte(struct asd_ha_struct *asd_ha, unsigned long offs)
unsigned long offs)
{ {
u8 val; u8 val;
if (unlikely(asd_ha->iospace)) if (unlikely(asd_ha->iospace))
...@@ -80,8 +79,8 @@ static inline u8 asd_read_byte(struct asd_ha_struct *asd_ha, ...@@ -80,8 +79,8 @@ static inline u8 asd_read_byte(struct asd_ha_struct *asd_ha,
return val; return val;
} }
static inline u16 asd_read_word(struct asd_ha_struct *asd_ha, static u16 asd_read_word(struct asd_ha_struct *asd_ha,
unsigned long offs) unsigned long offs)
{ {
u16 val; u16 val;
if (unlikely(asd_ha->iospace)) if (unlikely(asd_ha->iospace))
...@@ -93,8 +92,8 @@ static inline u16 asd_read_word(struct asd_ha_struct *asd_ha, ...@@ -93,8 +92,8 @@ static inline u16 asd_read_word(struct asd_ha_struct *asd_ha,
return val; return val;
} }
static inline u32 asd_read_dword(struct asd_ha_struct *asd_ha, static u32 asd_read_dword(struct asd_ha_struct *asd_ha,
unsigned long offs) unsigned long offs)
{ {
u32 val; u32 val;
if (unlikely(asd_ha->iospace)) if (unlikely(asd_ha->iospace))
...@@ -124,22 +123,22 @@ static inline u32 asd_mem_offs_swb(void) ...@@ -124,22 +123,22 @@ static inline u32 asd_mem_offs_swb(void)
/* We know that the register wanted is in the range /* We know that the register wanted is in the range
* of the sliding window. * of the sliding window.
*/ */
#define ASD_READ_SW(ww, type, ord) \ #define ASD_READ_SW(ww, type, ord) \
static inline type asd_read_##ww##_##ord (struct asd_ha_struct *asd_ha,\ static type asd_read_##ww##_##ord(struct asd_ha_struct *asd_ha, \
u32 reg) \ u32 reg) \
{ \ { \
struct asd_ha_addrspace *io_handle = &asd_ha->io_handle[0]; \ struct asd_ha_addrspace *io_handle = &asd_ha->io_handle[0]; \
u32 map_offs=(reg - io_handle-> ww##_base )+asd_mem_offs_##ww ();\ u32 map_offs = (reg - io_handle->ww##_base) + asd_mem_offs_##ww();\
return asd_read_##ord (asd_ha, (unsigned long) map_offs); \ return asd_read_##ord(asd_ha, (unsigned long)map_offs); \
} }
#define ASD_WRITE_SW(ww, type, ord) \ #define ASD_WRITE_SW(ww, type, ord) \
static inline void asd_write_##ww##_##ord (struct asd_ha_struct *asd_ha,\ static void asd_write_##ww##_##ord(struct asd_ha_struct *asd_ha, \
u32 reg, type val) \ u32 reg, type val) \
{ \ { \
struct asd_ha_addrspace *io_handle = &asd_ha->io_handle[0]; \ struct asd_ha_addrspace *io_handle = &asd_ha->io_handle[0]; \
u32 map_offs=(reg - io_handle-> ww##_base )+asd_mem_offs_##ww ();\ u32 map_offs = (reg - io_handle->ww##_base) + asd_mem_offs_##ww();\
asd_write_##ord (asd_ha, (unsigned long) map_offs, val); \ asd_write_##ord(asd_ha, (unsigned long)map_offs, val); \
} }
ASD_READ_SW(swa, u8, byte); ASD_READ_SW(swa, u8, byte);
...@@ -186,7 +185,7 @@ ASD_WRITE_SW(swc, u32, dword); ...@@ -186,7 +185,7 @@ ASD_WRITE_SW(swc, u32, dword);
* @asd_ha: pointer to host adapter structure * @asd_ha: pointer to host adapter structure
* @reg: register desired to be within range of the new window * @reg: register desired to be within range of the new window
*/ */
static inline void asd_move_swb(struct asd_ha_struct *asd_ha, u32 reg) static void asd_move_swb(struct asd_ha_struct *asd_ha, u32 reg)
{ {
u32 base = reg & ~(MBAR0_SWB_SIZE-1); u32 base = reg & ~(MBAR0_SWB_SIZE-1);
pci_write_config_dword(asd_ha->pcidev, PCI_CONF_MBAR0_SWB, base); pci_write_config_dword(asd_ha->pcidev, PCI_CONF_MBAR0_SWB, base);
......
drivers/scsi/aic94xx/aic94xx_scb.c
View file @ 81e56ded
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
| CURRENT_SPINUP_HOLD | CURRENT_GTO_TIMEOUT \ | CURRENT_SPINUP_HOLD | CURRENT_GTO_TIMEOUT \
| CURRENT_OOB_ERROR) | CURRENT_OOB_ERROR)
static inline void get_lrate_mode(struct asd_phy *phy, u8 oob_mode) static void get_lrate_mode(struct asd_phy *phy, u8 oob_mode)
{ {
struct sas_phy *sas_phy = phy->sas_phy.phy; struct sas_phy *sas_phy = phy->sas_phy.phy;
...@@ -81,7 +81,7 @@ static inline void get_lrate_mode(struct asd_phy *phy, u8 oob_mode) ...@@ -81,7 +81,7 @@ static inline void get_lrate_mode(struct asd_phy *phy, u8 oob_mode)
phy->sas_phy.oob_mode = SATA_OOB_MODE; phy->sas_phy.oob_mode = SATA_OOB_MODE;
} }
static inline void asd_phy_event_tasklet(struct asd_ascb *ascb, static void asd_phy_event_tasklet(struct asd_ascb *ascb,
struct done_list_struct *dl) struct done_list_struct *dl)
{ {
struct asd_ha_struct *asd_ha = ascb->ha; struct asd_ha_struct *asd_ha = ascb->ha;
...@@ -125,8 +125,7 @@ static inline void asd_phy_event_tasklet(struct asd_ascb *ascb, ...@@ -125,8 +125,7 @@ static inline void asd_phy_event_tasklet(struct asd_ascb *ascb,
} }
/* If phys are enabled sparsely, this will do the right thing. */ /* If phys are enabled sparsely, this will do the right thing. */
static inline unsigned ord_phy(struct asd_ha_struct *asd_ha, static unsigned ord_phy(struct asd_ha_struct *asd_ha, struct asd_phy *phy)
struct asd_phy *phy)
{ {
u8 enabled_mask = asd_ha->hw_prof.enabled_phys; u8 enabled_mask = asd_ha->hw_prof.enabled_phys;
int i, k = 0; int i, k = 0;
...@@ -151,7 +150,7 @@ static inline unsigned ord_phy(struct asd_ha_struct *asd_ha, ...@@ -151,7 +150,7 @@ static inline unsigned ord_phy(struct asd_ha_struct *asd_ha,
* LOCKING: the frame_rcvd_lock needs to be held since this parses the frame * LOCKING: the frame_rcvd_lock needs to be held since this parses the frame
* buffer. * buffer.
*/ */
static inline void asd_get_attached_sas_addr(struct asd_phy *phy, u8 *sas_addr) static void asd_get_attached_sas_addr(struct asd_phy *phy, u8 *sas_addr)
{ {
if (phy->sas_phy.frame_rcvd[0] == 0x34 if (phy->sas_phy.frame_rcvd[0] == 0x34
&& phy->sas_phy.oob_mode == SATA_OOB_MODE) { && 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,9 +231,9 @@ static void asd_deform_port(struct asd_ha_struct *asd_ha, struct asd_phy *phy)
spin_unlock_irqrestore(&asd_ha->asd_ports_lock, flags); spin_unlock_irqrestore(&asd_ha->asd_ports_lock, flags);
} }
static inline void asd_bytes_dmaed_tasklet(struct asd_ascb *ascb, static void asd_bytes_dmaed_tasklet(struct asd_ascb *ascb,
struct done_list_struct *dl, struct done_list_struct *dl,
int edb_id, int phy_id) int edb_id, int phy_id)
{ {
unsigned long flags; unsigned long flags;
int edb_el = edb_id + ascb->edb_index; int edb_el = edb_id + ascb->edb_index;
...@@ -255,9 +254,9 @@ static inline void asd_bytes_dmaed_tasklet(struct asd_ascb *ascb, ...@@ -255,9 +254,9 @@ static inline void asd_bytes_dmaed_tasklet(struct asd_ascb *ascb,
sas_ha->notify_port_event(&phy->sas_phy, PORTE_BYTES_DMAED); sas_ha->notify_port_event(&phy->sas_phy, PORTE_BYTES_DMAED);
} }
static inline void asd_link_reset_err_tasklet(struct asd_ascb *ascb, static void asd_link_reset_err_tasklet(struct asd_ascb *ascb,
struct done_list_struct *dl, struct done_list_struct *dl,
int phy_id) int phy_id)
{ {
struct asd_ha_struct *asd_ha = ascb->ha; struct asd_ha_struct *asd_ha = ascb->ha;
struct sas_ha_struct *sas_ha = &asd_ha->sas_ha; struct sas_ha_struct *sas_ha = &asd_ha->sas_ha;
...@@ -308,9 +307,9 @@ static inline void asd_link_reset_err_tasklet(struct asd_ascb *ascb, ...@@ -308,9 +307,9 @@ static inline void asd_link_reset_err_tasklet(struct asd_ascb *ascb,
; ;
} }
static inline void asd_primitive_rcvd_tasklet(struct asd_ascb *ascb, static void asd_primitive_rcvd_tasklet(struct asd_ascb *ascb,
struct done_list_struct *dl, struct done_list_struct *dl,
int phy_id) int phy_id)
{ {
unsigned long flags; unsigned long flags;
struct sas_ha_struct *sas_ha = &ascb->ha->sas_ha; struct sas_ha_struct *sas_ha = &ascb->ha->sas_ha;
...@@ -715,7 +714,7 @@ static void control_phy_tasklet_complete(struct asd_ascb *ascb, ...@@ -715,7 +714,7 @@ static void control_phy_tasklet_complete(struct asd_ascb *ascb,
asd_ascb_free(ascb); asd_ascb_free(ascb);
} }
static inline void set_speed_mask(u8 *speed_mask, struct asd_phy_desc *pd) static void set_speed_mask(u8 *speed_mask, struct asd_phy_desc *pd)
{ {
/* disable all speeds, then enable defaults */ /* disable all speeds, then enable defaults */
*speed_mask = SAS_SPEED_60_DIS | SAS_SPEED_30_DIS | SAS_SPEED_15_DIS *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,6 +819,8 @@ void asd_build_control_phy(struct asd_ascb *ascb, int phy_id, u8 subfunc)
/* ---------- INITIATE LINK ADM TASK ---------- */ /* ---------- INITIATE LINK ADM TASK ---------- */
#if 0
static void link_adm_tasklet_complete(struct asd_ascb *ascb, static void link_adm_tasklet_complete(struct asd_ascb *ascb,
struct done_list_struct *dl) struct done_list_struct *dl)
{ {
...@@ -852,6 +853,8 @@ void asd_build_initiate_link_adm_task(struct asd_ascb *ascb, int phy_id, ...@@ -852,6 +853,8 @@ void asd_build_initiate_link_adm_task(struct asd_ascb *ascb, int phy_id,
ascb->tasklet_complete = link_adm_tasklet_complete; ascb->tasklet_complete = link_adm_tasklet_complete;
} }
#endif /* 0 */
/* ---------- SCB timer ---------- */ /* ---------- SCB timer ---------- */
/** /**
......
drivers/scsi/aic94xx/aic94xx_sds.c
View file @ 81e56ded
...@@ -590,8 +590,8 @@ static int asd_reset_flash(struct asd_ha_struct *asd_ha) ...@@ -590,8 +590,8 @@ static int asd_reset_flash(struct asd_ha_struct *asd_ha)
return err; return err;
} }
static inline int asd_read_flash_seg(struct asd_ha_struct *asd_ha, static int asd_read_flash_seg(struct asd_ha_struct *asd_ha,
void *buffer, u32 offs, int size) void *buffer, u32 offs, int size)
{ {
asd_read_reg_string(asd_ha, buffer, asd_ha->hw_prof.flash.bar+offs, asd_read_reg_string(asd_ha, buffer, asd_ha->hw_prof.flash.bar+offs,
size); size);
......
drivers/scsi/aic94xx/aic94xx_seq.c
View file @ 81e56ded
...@@ -60,7 +60,7 @@ static u16 last_scb_site_no; ...@@ -60,7 +60,7 @@ static u16 last_scb_site_no;
* *
* Return 0 on success, negative on failure. * Return 0 on success, negative on failure.
*/ */
int asd_pause_cseq(struct asd_ha_struct *asd_ha) static int asd_pause_cseq(struct asd_ha_struct *asd_ha)
{ {
int count = PAUSE_TRIES; int count = PAUSE_TRIES;
u32 arp2ctl; u32 arp2ctl;
...@@ -87,7 +87,7 @@ int asd_pause_cseq(struct asd_ha_struct *asd_ha) ...@@ -87,7 +87,7 @@ int asd_pause_cseq(struct asd_ha_struct *asd_ha)
* *
* Return 0 on success, negative on error. * Return 0 on success, negative on error.
*/ */
int asd_unpause_cseq(struct asd_ha_struct *asd_ha) static int asd_unpause_cseq(struct asd_ha_struct *asd_ha)
{ {
u32 arp2ctl; u32 arp2ctl;
int count = PAUSE_TRIES; int count = PAUSE_TRIES;
...@@ -115,7 +115,7 @@ int asd_unpause_cseq(struct asd_ha_struct *asd_ha) ...@@ -115,7 +115,7 @@ int asd_unpause_cseq(struct asd_ha_struct *asd_ha)
* *
* Return 0 on success, negative on error. * Return 0 on success, negative on error.
*/ */
static inline int asd_seq_pause_lseq(struct asd_ha_struct *asd_ha, int lseq) static int asd_seq_pause_lseq(struct asd_ha_struct *asd_ha, int lseq)
{ {
u32 arp2ctl; u32 arp2ctl;
int count = PAUSE_TRIES; int count = PAUSE_TRIES;
...@@ -143,7 +143,7 @@ static inline int asd_seq_pause_lseq(struct asd_ha_struct *asd_ha, int lseq) ...@@ -143,7 +143,7 @@ static inline int asd_seq_pause_lseq(struct asd_ha_struct *asd_ha, int lseq)
* *
* Return 0 on success, negative on failure. * Return 0 on success, negative on failure.
*/ */
int asd_pause_lseq(struct asd_ha_struct *asd_ha, u8 lseq_mask) static int asd_pause_lseq(struct asd_ha_struct *asd_ha, u8 lseq_mask)
{ {
int lseq; int lseq;
int err = 0; int err = 0;
...@@ -164,7 +164,7 @@ int asd_pause_lseq(struct asd_ha_struct *asd_ha, u8 lseq_mask) ...@@ -164,7 +164,7 @@ int asd_pause_lseq(struct asd_ha_struct *asd_ha, u8 lseq_mask)
* *
* Return 0 on success, negative on error. * Return 0 on success, negative on error.
*/ */
static inline int asd_seq_unpause_lseq(struct asd_ha_struct *asd_ha, int lseq) static int asd_seq_unpause_lseq(struct asd_ha_struct *asd_ha, int lseq)
{ {
u32 arp2ctl; u32 arp2ctl;
int count = PAUSE_TRIES; int count = PAUSE_TRIES;
...@@ -186,27 +186,6 @@ static inline int asd_seq_unpause_lseq(struct asd_ha_struct *asd_ha, int lseq) ...@@ -186,27 +186,6 @@ static inline int asd_seq_unpause_lseq(struct asd_ha_struct *asd_ha, int lseq)
} }
/**
* asd_unpause_lseq - unpause the link sequencer(s)
* @asd_ha: pointer to host adapter structure
* @lseq_mask: mask of link sequencers of interest
*
* Return 0 on success, negative on failure.
*/
int asd_unpause_lseq(struct asd_ha_struct *asd_ha, u8 lseq_mask)
{
int lseq;
int err = 0;
for_each_sequencer(lseq_mask, lseq_mask, lseq) {
err = asd_seq_unpause_lseq(asd_ha, lseq);
if (err)
return err;
}
return err;
}
/* ---------- Downloading CSEQ/LSEQ microcode ---------- */ /* ---------- Downloading CSEQ/LSEQ microcode ---------- */
static int asd_verify_cseq(struct asd_ha_struct *asd_ha, const u8 *_prog, static int asd_verify_cseq(struct asd_ha_struct *asd_ha, const u8 *_prog,
......
drivers/scsi/aic94xx/aic94xx_seq.h
View file @ 81e56ded
...@@ -58,10 +58,6 @@ struct sequencer_file_header { ...@@ -58,10 +58,6 @@ struct sequencer_file_header {
} __attribute__((packed)); } __attribute__((packed));
#ifdef __KERNEL__ #ifdef __KERNEL__
int asd_pause_cseq(struct asd_ha_struct *asd_ha);
int asd_unpause_cseq(struct asd_ha_struct *asd_ha);
int asd_pause_lseq(struct asd_ha_struct *asd_ha, u8 lseq_mask);
int asd_unpause_lseq(struct asd_ha_struct *asd_ha, u8 lseq_mask);
int asd_init_seqs(struct asd_ha_struct *asd_ha); int asd_init_seqs(struct asd_ha_struct *asd_ha);
int asd_start_seqs(struct asd_ha_struct *asd_ha); int asd_start_seqs(struct asd_ha_struct *asd_ha);
int asd_release_firmware(void); int asd_release_firmware(void);
......
drivers/scsi/aic94xx/aic94xx_task.c
View file @ 81e56ded
...@@ -33,7 +33,7 @@ static void asd_unbuild_ata_ascb(struct asd_ascb *a); ...@@ -33,7 +33,7 @@ static void asd_unbuild_ata_ascb(struct asd_ascb *a);
static void asd_unbuild_smp_ascb(struct asd_ascb *a); static void asd_unbuild_smp_ascb(struct asd_ascb *a);
static void asd_unbuild_ssp_ascb(struct asd_ascb *a); static void asd_unbuild_ssp_ascb(struct asd_ascb *a);
static inline void asd_can_dequeue(struct asd_ha_struct *asd_ha, int num) static void asd_can_dequeue(struct asd_ha_struct *asd_ha, int num)
{ {
unsigned long flags; unsigned long flags;
...@@ -51,9 +51,9 @@ static const u8 data_dir_flags[] = { ...@@ -51,9 +51,9 @@ static const u8 data_dir_flags[] = {
[PCI_DMA_NONE] = DATA_DIR_NONE, /* NO TRANSFER */ [PCI_DMA_NONE] = DATA_DIR_NONE, /* NO TRANSFER */
}; };
static inline int asd_map_scatterlist(struct sas_task *task, static int asd_map_scatterlist(struct sas_task *task,
struct sg_el *sg_arr, struct sg_el *sg_arr,
gfp_t gfp_flags) gfp_t gfp_flags)
{ {
struct asd_ascb *ascb = task->lldd_task; struct asd_ascb *ascb = task->lldd_task;
struct asd_ha_struct *asd_ha = ascb->ha; struct asd_ha_struct *asd_ha = ascb->ha;
...@@ -131,7 +131,7 @@ static inline int asd_map_scatterlist(struct sas_task *task, ...@@ -131,7 +131,7 @@ static inline int asd_map_scatterlist(struct sas_task *task,
return res; return res;
} }
static inline void asd_unmap_scatterlist(struct asd_ascb *ascb) static void asd_unmap_scatterlist(struct asd_ascb *ascb)
{ {
struct asd_ha_struct *asd_ha = ascb->ha; struct asd_ha_struct *asd_ha = ascb->ha;
struct sas_task *task = ascb->uldd_task; struct sas_task *task = ascb->uldd_task;
...@@ -527,7 +527,7 @@ static void asd_unbuild_ssp_ascb(struct asd_ascb *a) ...@@ -527,7 +527,7 @@ static void asd_unbuild_ssp_ascb(struct asd_ascb *a)
/* ---------- Execute Task ---------- */ /* ---------- Execute Task ---------- */
static inline int asd_can_queue(struct asd_ha_struct *asd_ha, int num) static int asd_can_queue(struct asd_ha_struct *asd_ha, int num)
{ {
int res = 0; int res = 0;
unsigned long flags; unsigned long flags;
......
drivers/scsi/aic94xx/aic94xx_tmf.c
View file @ 81e56ded
...@@ -336,7 +336,7 @@ static void asd_tmf_tasklet_complete(struct asd_ascb *ascb, ...@@ -336,7 +336,7 @@ static void asd_tmf_tasklet_complete(struct asd_ascb *ascb,
asd_ascb_free(ascb); asd_ascb_free(ascb);
} }
static inline int asd_clear_nexus(struct sas_task *task) static int asd_clear_nexus(struct sas_task *task)
{ {
int res = TMF_RESP_FUNC_FAILED; int res = TMF_RESP_FUNC_FAILED;
int leftover; int leftover;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7