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

Commit c972c70f authored by Moore, Eric's avatar Moore, Eric Committed by James Bottomley
Browse files

[SCSI] fusion - static fix's 



Patch previously provided from Adrian Bunk <bunk@stusta.de>,
moving some functions to static.  This is already in
the -mm tree.

Signed-off-by: default avatarEric Moore <Eric.Moore@lsil.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 3a892bef

drivers/message/fusion/mptbase.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -180,6 +180,7 @@ static void mpt_sp_ioc_info(MPT_ADAPTER *ioc, u32 ioc_status, MPT_FRAME_HDR *mf) 
static void	mpt_fc_log_info(MPT_ADAPTER *ioc, u32 log_info);

static void	mpt_fc_log_info(MPT_ADAPTER *ioc, u32 log_info);

static void	mpt_spi_log_info(MPT_ADAPTER *ioc, u32 log_info);

static void	mpt_spi_log_info(MPT_ADAPTER *ioc, u32 log_info);

static void	mpt_sas_log_info(MPT_ADAPTER *ioc, u32 log_info);

static void	mpt_sas_log_info(MPT_ADAPTER *ioc, u32 log_info);

static int	mpt_read_ioc_pg_3(MPT_ADAPTER *ioc);





/* module entry point */

/* module entry point */

static int  __init    fusion_init  (void);

static int  __init    fusion_init  (void);
@@ -4871,7 +4872,7 @@ mpt_findImVolumes(MPT_ADAPTER *ioc) 
	return rc;

	return rc;

}

}





int

static int

mpt_read_ioc_pg_3(MPT_ADAPTER *ioc)

mpt_read_ioc_pg_3(MPT_ADAPTER *ioc)

{

{

	IOCPage3_t		*pIoc3;

	IOCPage3_t		*pIoc3;
@@ -6453,7 +6454,6 @@ EXPORT_SYMBOL(mpt_stm_index); 
EXPORT_SYMBOL(mpt_HardResetHandler);

EXPORT_SYMBOL(mpt_HardResetHandler);

EXPORT_SYMBOL(mpt_config);

EXPORT_SYMBOL(mpt_config);

EXPORT_SYMBOL(mpt_findImVolumes);

EXPORT_SYMBOL(mpt_findImVolumes);

EXPORT_SYMBOL(mpt_read_ioc_pg_3);

EXPORT_SYMBOL(mpt_alloc_fw_memory);

EXPORT_SYMBOL(mpt_alloc_fw_memory);

EXPORT_SYMBOL(mpt_free_fw_memory);

EXPORT_SYMBOL(mpt_free_fw_memory);

EXPORT_SYMBOL(mptbase_sas_persist_operation);

EXPORT_SYMBOL(mptbase_sas_persist_operation);

drivers/message/fusion/mptbase.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -1027,7 +1027,6 @@ extern int mpt_config(MPT_ADAPTER *ioc, CONFIGPARMS *cfg); 
extern void	 mpt_alloc_fw_memory(MPT_ADAPTER *ioc, int size);

extern void	 mpt_alloc_fw_memory(MPT_ADAPTER *ioc, int size);

extern void	 mpt_free_fw_memory(MPT_ADAPTER *ioc);

extern void	 mpt_free_fw_memory(MPT_ADAPTER *ioc);

extern int	 mpt_findImVolumes(MPT_ADAPTER *ioc);

extern int	 mpt_findImVolumes(MPT_ADAPTER *ioc);

extern int	 mpt_read_ioc_pg_3(MPT_ADAPTER *ioc);

extern int	 mptbase_sas_persist_operation(MPT_ADAPTER *ioc, u8 persist_opcode);

extern int	 mptbase_sas_persist_operation(MPT_ADAPTER *ioc, u8 persist_opcode);

extern int	 mptbase_GetFcPortPage0(MPT_ADAPTER *ioc, int portnum);

extern int	 mptbase_GetFcPortPage0(MPT_ADAPTER *ioc, int portnum);

drivers/message/fusion/mptctl.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -140,7 +140,7 @@ static int mptctl_ioc_reset(MPT_ADAPTER *ioc, int reset_phase); 
 * Event Handler function

 * Event Handler function

 */

 */

static int mptctl_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *pEvReply);

static int mptctl_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *pEvReply);

struct fasync_struct *async_queue=NULL;

static struct fasync_struct *async_queue=NULL;





/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/

/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/

/*

/*