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

Commit d1c61f8e authored by Krishna Gudipati's avatar Krishna Gudipati Committed by James Bottomley
Browse files

[SCSI] bfa: Remove unused header files and did some cleanup. 



Signed-off-by: default avatarKrishna Gudipati <kgudipat@brocade.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 95aa060d

drivers/scsi/bfa/bfa_fcport.c

+2 −2
Original line number Diff line number Diff line
@@ -853,9 +853,9 @@ bfa_fcport_meminfo(struct bfa_iocfc_cfg_s *cfg, u32 *ndm_len, 
static void

bfa_fcport_qresume(void *cbarg)

{

	struct bfa_fcport_s *port = cbarg;

	struct bfa_fcport_s *fcport = cbarg;



	bfa_sm_send_event(port, BFA_FCPORT_SM_QRESUME);

	bfa_sm_send_event(fcport, BFA_FCPORT_SM_QRESUME);

}



static void

drivers/scsi/bfa/bfa_ioc_cb.c

+6 −6
Original line number Diff line number Diff line
@@ -63,13 +63,13 @@ bfa_ioc_set_cb_hwif(struct bfa_ioc_s *ioc) 
	ioc->ioc_hwif = &hwif_cb;

}



static uint32_t *

bfa_ioc_cb_fwimg_get_chunk(struct bfa_ioc_s *ioc, uint32_t off)

static u32 *

bfa_ioc_cb_fwimg_get_chunk(struct bfa_ioc_s *ioc, u32 off)

{

	return bfi_image_cb_get_chunk(off);

}



static uint32_t

static u32

bfa_ioc_cb_fwimg_get_size(struct bfa_ioc_s *ioc)

{

	return bfi_image_cb_size;
@@ -102,7 +102,7 @@ bfa_ioc_cb_notify_hbfail(struct bfa_ioc_s *ioc) 
/**

 * Host to LPU mailbox message addresses

 */

static struct { uint32_t hfn_mbox, lpu_mbox, hfn_pgn; } iocreg_fnreg[] = {

static struct { u32 hfn_mbox, lpu_mbox, hfn_pgn; } iocreg_fnreg[] = {

	{ HOSTFN0_LPU_MBOX0_0, LPU_HOSTFN0_MBOX0_0, HOST_PAGE_NUM_FN0 },

	{ HOSTFN1_LPU_MBOX0_8, LPU_HOSTFN1_MBOX0_8, HOST_PAGE_NUM_FN1 }

};
@@ -110,7 +110,7 @@ static struct { uint32_t hfn_mbox, lpu_mbox, hfn_pgn; } iocreg_fnreg[] = { 
/**

 * Host <-> LPU mailbox command/status registers

 */

static struct { uint32_t hfn, lpu; } iocreg_mbcmd[] = {

static struct { u32 hfn, lpu; } iocreg_mbcmd[] = {

	{ HOSTFN0_LPU0_CMD_STAT, LPU0_HOSTFN0_CMD_STAT },

	{ HOSTFN1_LPU1_CMD_STAT, LPU1_HOSTFN1_CMD_STAT }

};
@@ -192,7 +192,7 @@ static bfa_status_t 
bfa_ioc_cb_pll_init(struct bfa_ioc_s *ioc)

{

	bfa_os_addr_t	rb = ioc->pcidev.pci_bar_kva;

	uint32_t	pll_sclk, pll_fclk;

	u32	pll_sclk, pll_fclk;



	/*

	 *  Hold semaphore so that nobody can access the chip during init.

drivers/scsi/bfa/bfa_ioc_ct.c

+14 −14
Original line number Diff line number Diff line
@@ -33,9 +33,9 @@ BFA_TRC_FILE(CNA, IOC_CT); 
static bfa_status_t bfa_ioc_ct_pll_init(struct bfa_ioc_s *ioc);

static bfa_boolean_t bfa_ioc_ct_firmware_lock(struct bfa_ioc_s *ioc);

static void bfa_ioc_ct_firmware_unlock(struct bfa_ioc_s *ioc);

static uint32_t* bfa_ioc_ct_fwimg_get_chunk(struct bfa_ioc_s *ioc,

					uint32_t off);

static uint32_t bfa_ioc_ct_fwimg_get_size(struct bfa_ioc_s *ioc);

static u32* bfa_ioc_ct_fwimg_get_chunk(struct bfa_ioc_s *ioc,

					u32 off);

static u32 bfa_ioc_ct_fwimg_get_size(struct bfa_ioc_s *ioc);

static void bfa_ioc_ct_reg_init(struct bfa_ioc_s *ioc);

static void bfa_ioc_ct_map_port(struct bfa_ioc_s *ioc);

static void bfa_ioc_ct_isr_mode_set(struct bfa_ioc_s *ioc, bfa_boolean_t msix);
@@ -64,13 +64,13 @@ bfa_ioc_set_ct_hwif(struct bfa_ioc_s *ioc) 
	ioc->ioc_hwif = &hwif_ct;

}



static uint32_t*

bfa_ioc_ct_fwimg_get_chunk(struct bfa_ioc_s *ioc, uint32_t off)

static u32*

bfa_ioc_ct_fwimg_get_chunk(struct bfa_ioc_s *ioc, u32 off)

{

	return bfi_image_ct_get_chunk(off);

}



static uint32_t

static u32

bfa_ioc_ct_fwimg_get_size(struct bfa_ioc_s *ioc)

{

	return bfi_image_ct_size;
@@ -83,7 +83,7 @@ static bfa_boolean_t 
bfa_ioc_ct_firmware_lock(struct bfa_ioc_s *ioc)

{

	enum bfi_ioc_state ioc_fwstate;

	uint32_t usecnt;

	u32 usecnt;

	struct bfi_ioc_image_hdr_s fwhdr;



	/**
@@ -142,7 +142,7 @@ bfa_ioc_ct_firmware_lock(struct bfa_ioc_s *ioc) 
static void

bfa_ioc_ct_firmware_unlock(struct bfa_ioc_s *ioc)

{

	uint32_t usecnt;

	u32 usecnt;



	/**

	 * Firmware lock is relevant only for CNA.
@@ -184,7 +184,7 @@ bfa_ioc_ct_notify_hbfail(struct bfa_ioc_s *ioc) 
/**

 * Host to LPU mailbox message addresses

 */

static struct { uint32_t hfn_mbox, lpu_mbox, hfn_pgn; } iocreg_fnreg[] = {

static struct { u32 hfn_mbox, lpu_mbox, hfn_pgn; } iocreg_fnreg[] = {

	{ HOSTFN0_LPU_MBOX0_0, LPU_HOSTFN0_MBOX0_0, HOST_PAGE_NUM_FN0 },

	{ HOSTFN1_LPU_MBOX0_8, LPU_HOSTFN1_MBOX0_8, HOST_PAGE_NUM_FN1 },

	{ HOSTFN2_LPU_MBOX0_0, LPU_HOSTFN2_MBOX0_0, HOST_PAGE_NUM_FN2 },
@@ -194,7 +194,7 @@ static struct { uint32_t hfn_mbox, lpu_mbox, hfn_pgn; } iocreg_fnreg[] = { 
/**

 * Host <-> LPU mailbox command/status registers - port 0

 */

static struct { uint32_t hfn, lpu; } iocreg_mbcmd_p0[] = {

static struct { u32 hfn, lpu; } iocreg_mbcmd_p0[] = {

	{ HOSTFN0_LPU0_MBOX0_CMD_STAT, LPU0_HOSTFN0_MBOX0_CMD_STAT },

	{ HOSTFN1_LPU0_MBOX0_CMD_STAT, LPU0_HOSTFN1_MBOX0_CMD_STAT },

	{ HOSTFN2_LPU0_MBOX0_CMD_STAT, LPU0_HOSTFN2_MBOX0_CMD_STAT },
@@ -204,7 +204,7 @@ static struct { uint32_t hfn, lpu; } iocreg_mbcmd_p0[] = { 
/**

 * Host <-> LPU mailbox command/status registers - port 1

 */

static struct { uint32_t hfn, lpu; } iocreg_mbcmd_p1[] = {

static struct { u32 hfn, lpu; } iocreg_mbcmd_p1[] = {

	{ HOSTFN0_LPU1_MBOX0_CMD_STAT, LPU1_HOSTFN0_MBOX0_CMD_STAT },

	{ HOSTFN1_LPU1_MBOX0_CMD_STAT, LPU1_HOSTFN1_MBOX0_CMD_STAT },

	{ HOSTFN2_LPU1_MBOX0_CMD_STAT, LPU1_HOSTFN2_MBOX0_CMD_STAT },
@@ -274,7 +274,7 @@ static void 
bfa_ioc_ct_map_port(struct bfa_ioc_s *ioc)

{

	bfa_os_addr_t	rb = ioc->pcidev.pci_bar_kva;

	uint32_t	r32;

	u32	r32;



	/**

	 * For catapult, base port id on personality register and IOC type
@@ -294,7 +294,7 @@ static void 
bfa_ioc_ct_isr_mode_set(struct bfa_ioc_s *ioc, bfa_boolean_t msix)

{

	bfa_os_addr_t	rb = ioc->pcidev.pci_bar_kva;

	uint32_t	r32, mode;

	u32	r32, mode;



	r32 = bfa_reg_read(rb + FNC_PERS_REG);

	bfa_trc(ioc, r32);
@@ -324,7 +324,7 @@ static bfa_status_t 
bfa_ioc_ct_pll_init(struct bfa_ioc_s *ioc)

{

	bfa_os_addr_t	rb = ioc->pcidev.pci_bar_kva;

	uint32_t	pll_sclk, pll_fclk, r32;

	u32	pll_sclk, pll_fclk, r32;



	/*

	 *  Hold semaphore so that nobody can access the chip during init.

drivers/scsi/bfa/bfad_attr.h

+0 −9
Original line number Diff line number Diff line
@@ -17,9 +17,6 @@ 


#ifndef __BFAD_ATTR_H__

#define __BFAD_ATTR_H__

/**

 *  bfad_attr.h VMware driver configuration interface module.

 */



/**

 *  FC_transport_template FC transport template
@@ -52,12 +49,6 @@ bfad_im_get_starget_port_name(struct scsi_target *starget); 
void

bfad_im_get_host_port_id(struct Scsi_Host *shost);



/**

 * FC transport template entry, issue a LIP.

 */

int

bfad_im_issue_fc_host_lip(struct Scsi_Host *shost);



struct Scsi_Host*

bfad_os_starget_to_shost(struct scsi_target *starget);

drivers/scsi/bfa/bfad_drv.h

+0 −10
Original line number Diff line number Diff line
@@ -196,11 +196,6 @@ struct bfad_s { 
	bfa_boolean_t	ipfc_enabled;

	union bfad_tmp_buf tmp_buf;

	struct fc_host_statistics link_stats;



	struct kobject *bfa_kobj;

	struct kobject *ioc_kobj;

	struct kobject *pport_kobj;

	struct kobject *lport_kobj;

};



/*
@@ -286,11 +281,6 @@ void bfad_drv_uninit(struct bfad_s *bfad); 
void		bfad_drv_log_level_set(struct bfad_s *bfad);

bfa_status_t	bfad_fc4_module_init(void);

void		bfad_fc4_module_exit(void);



bfa_status_t	bfad_os_kthread_create(struct bfad_s *bfad);

void		bfad_os_kthread_stop(struct bfad_s *bfad);

void		bfad_os_kthread_wakeup(struct bfad_s *bfad);

int		bfad_os_kthread_should_stop(void);

int		bfad_worker (void *ptr);



void bfad_pci_remove(struct pci_dev *pdev);