diff options
author | Moore, Eric <Eric.Moore@lsil.com> | 2006-03-14 11:14:06 -0500 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-14 15:33:18 -0500 |
commit | c972c70fa03097be4235fc441658290a3b7af06f (patch) | |
tree | 16cc86cd334fc11422f133504cd3c38fdebe1223 | |
parent | 3a892bef3f7e94c4d6c2c20b9a1b546f43679fd3 (diff) |
[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: Eric Moore <Eric.Moore@lsil.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
-rw-r--r-- | drivers/message/fusion/mptbase.c | 4 | ||||
-rw-r--r-- | drivers/message/fusion/mptbase.h | 1 | ||||
-rw-r--r-- | drivers/message/fusion/mptctl.c | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c index 9960ef10366f..266414ca2814 100644 --- a/drivers/message/fusion/mptbase.c +++ b/drivers/message/fusion/mptbase.c | |||
@@ -180,6 +180,7 @@ static void mpt_sp_ioc_info(MPT_ADAPTER *ioc, u32 ioc_status, MPT_FRAME_HDR *mf) | |||
180 | static void mpt_fc_log_info(MPT_ADAPTER *ioc, u32 log_info); | 180 | static void mpt_fc_log_info(MPT_ADAPTER *ioc, u32 log_info); |
181 | static void mpt_spi_log_info(MPT_ADAPTER *ioc, u32 log_info); | 181 | static void mpt_spi_log_info(MPT_ADAPTER *ioc, u32 log_info); |
182 | static void mpt_sas_log_info(MPT_ADAPTER *ioc, u32 log_info); | 182 | static void mpt_sas_log_info(MPT_ADAPTER *ioc, u32 log_info); |
183 | static int mpt_read_ioc_pg_3(MPT_ADAPTER *ioc); | ||
183 | 184 | ||
184 | /* module entry point */ | 185 | /* module entry point */ |
185 | static int __init fusion_init (void); | 186 | static int __init fusion_init (void); |
@@ -4871,7 +4872,7 @@ done_and_free: | |||
4871 | return rc; | 4872 | return rc; |
4872 | } | 4873 | } |
4873 | 4874 | ||
4874 | int | 4875 | static int |
4875 | mpt_read_ioc_pg_3(MPT_ADAPTER *ioc) | 4876 | mpt_read_ioc_pg_3(MPT_ADAPTER *ioc) |
4876 | { | 4877 | { |
4877 | IOCPage3_t *pIoc3; | 4878 | IOCPage3_t *pIoc3; |
@@ -6453,7 +6454,6 @@ EXPORT_SYMBOL(mpt_stm_index); | |||
6453 | EXPORT_SYMBOL(mpt_HardResetHandler); | 6454 | EXPORT_SYMBOL(mpt_HardResetHandler); |
6454 | EXPORT_SYMBOL(mpt_config); | 6455 | EXPORT_SYMBOL(mpt_config); |
6455 | EXPORT_SYMBOL(mpt_findImVolumes); | 6456 | EXPORT_SYMBOL(mpt_findImVolumes); |
6456 | EXPORT_SYMBOL(mpt_read_ioc_pg_3); | ||
6457 | EXPORT_SYMBOL(mpt_alloc_fw_memory); | 6457 | EXPORT_SYMBOL(mpt_alloc_fw_memory); |
6458 | EXPORT_SYMBOL(mpt_free_fw_memory); | 6458 | EXPORT_SYMBOL(mpt_free_fw_memory); |
6459 | EXPORT_SYMBOL(mptbase_sas_persist_operation); | 6459 | EXPORT_SYMBOL(mptbase_sas_persist_operation); |
diff --git a/drivers/message/fusion/mptbase.h b/drivers/message/fusion/mptbase.h index fb22b28d1ab6..2b9c8b5522fa 100644 --- a/drivers/message/fusion/mptbase.h +++ b/drivers/message/fusion/mptbase.h | |||
@@ -1027,7 +1027,6 @@ extern int mpt_config(MPT_ADAPTER *ioc, CONFIGPARMS *cfg); | |||
1027 | extern void mpt_alloc_fw_memory(MPT_ADAPTER *ioc, int size); | 1027 | extern void mpt_alloc_fw_memory(MPT_ADAPTER *ioc, int size); |
1028 | extern void mpt_free_fw_memory(MPT_ADAPTER *ioc); | 1028 | extern void mpt_free_fw_memory(MPT_ADAPTER *ioc); |
1029 | extern int mpt_findImVolumes(MPT_ADAPTER *ioc); | 1029 | extern int mpt_findImVolumes(MPT_ADAPTER *ioc); |
1030 | extern int mpt_read_ioc_pg_3(MPT_ADAPTER *ioc); | ||
1031 | extern int mptbase_sas_persist_operation(MPT_ADAPTER *ioc, u8 persist_opcode); | 1030 | extern int mptbase_sas_persist_operation(MPT_ADAPTER *ioc, u8 persist_opcode); |
1032 | extern int mptbase_GetFcPortPage0(MPT_ADAPTER *ioc, int portnum); | 1031 | extern int mptbase_GetFcPortPage0(MPT_ADAPTER *ioc, int portnum); |
1033 | 1032 | ||
diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c index 3d555b724ed0..b4967bb8a7d6 100644 --- a/drivers/message/fusion/mptctl.c +++ b/drivers/message/fusion/mptctl.c | |||
@@ -140,7 +140,7 @@ static int mptctl_ioc_reset(MPT_ADAPTER *ioc, int reset_phase); | |||
140 | * Event Handler function | 140 | * Event Handler function |
141 | */ | 141 | */ |
142 | static int mptctl_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *pEvReply); | 142 | static int mptctl_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *pEvReply); |
143 | struct fasync_struct *async_queue=NULL; | 143 | static struct fasync_struct *async_queue=NULL; |
144 | 144 | ||
145 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ | 145 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ |
146 | /* | 146 | /* |