Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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

drivers/scsi/aic94xx/aic94xx_dev.c

+4 −4
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
#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)



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;
@@ -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 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)

		return;
@@ -79,7 +79,7 @@ static inline void asd_free_ddb(struct asd_ha_struct *asd_ha, int ddb) 
	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;

	int ddb = (int) (unsigned long) dev->lldd_dev;
@@ -109,7 +109,7 @@ static int asd_init_sata_tag_ddb(struct domain_device *dev) 
	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;

	int ddb = (int) (unsigned long) dev->lldd_dev;

drivers/scsi/aic94xx/aic94xx_dump.c

+9 −1
Original line number Diff line number Diff line
@@ -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);

}



#if 0



/**

 * asd_dump_ddb_site -- dump a CSEQ DDB site

 * @asd_ha: pointer to host adapter structure
@@ -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

 * @asd_ha: pointer to host adapter structure
@@ -922,7 +926,9 @@ void asd_dump_frame_rcvd(struct asd_phy *phy, 
	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, "

		   "index:%d, opcode:0x%02x\n",
@@ -956,4 +962,6 @@ void asd_dump_scb_list(struct asd_ascb *ascb, int num) 
	}

}



#endif  /*  0  */



#endif /* ASD_DEBUG */

drivers/scsi/aic94xx/aic94xx_dump.h

+0 −9
Original line number Diff line number Diff line
@@ -29,24 +29,15 @@ 


#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_frame_rcvd(struct asd_phy *phy,

			 struct done_list_struct *dl);

void asd_dump_scb_list(struct asd_ascb *ascb, int num);

#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,

				      u8 lseq_mask) { }

static inline void asd_dump_frame_rcvd(struct asd_phy *phy,

				       struct done_list_struct *dl) { }

static inline void asd_dump_scb_list(struct asd_ascb *ascb, int num) { }

#endif /* ASD_DEBUG */



#endif /* _AIC94XX_DUMP_H_ */

drivers/scsi/aic94xx/aic94xx_hwi.c

+12 −12
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ static int asd_init_scbs(struct asd_ha_struct *asd_ha) 
	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_ddbs = asd_get_devctx_size(asd_ha)/ASD_DDB_SIZE;
@@ -771,7 +771,7 @@ static void asd_dl_tasklet_handler(unsigned long data) 
 * asd_process_donelist_isr -- schedule processing of done list entries

 * @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);

}
@@ -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_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);
@@ -819,7 +819,7 @@ static inline void asd_com_sas_isr(struct asd_ha_struct *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] = {

		"UNEXPECTED_INTERRUPT0",
@@ -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_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);
@@ -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)

 * @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);
@@ -969,7 +969,7 @@ static inline void asd_rbi_exsi_isr(struct asd_ha_struct *asd_ha) 
 *

 * 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;

	u32 pcix_status;
@@ -1042,7 +1042,7 @@ irqreturn_t asd_hw_isr(int irq, void *dev_id) 


/* ---------- 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)

{

	extern struct kmem_cache *asd_ascb_cache;
@@ -1142,7 +1142,7 @@ struct asd_ascb *asd_ascb_alloc_list(struct asd_ha_struct 
 *

 * 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_seq_data *seq = &asd_ha->seq;
@@ -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

 * 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;

	list_for_each_entry(ascb, list, list) {

drivers/scsi/aic94xx/aic94xx_hwi.h

+0 −2
Original line number Diff line number Diff line
@@ -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_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);

void asd_build_initiate_link_adm_task(struct asd_ascb *ascb, int phy_id,

				      u8 subfunc);



void asd_ascb_timedout(unsigned long data);

int  asd_chip_hardrst(struct asd_ha_struct *asd_ha);