diff options
author | James Bottomley <jejb@titanic.(none)> | 2006-01-29 13:10:24 -0500 |
---|---|---|
committer | James Bottomley <jejb@titanic.(none)> | 2006-01-31 15:39:43 -0500 |
commit | 663e1aa12f9fc338fccee09f98d9f5bf68517f72 (patch) | |
tree | c6d5dfec129285c284222f08983cfc6365918eed | |
parent | fda4c2c8d0c9e22e3b9eeb6d75706d876af988f8 (diff) |
[SCSI] fusion: fix compile
The prior fusion patches moved an invocation of a function,
mptscsih_TMHandler(), static to mptscsih.c into mptsas.c
Make the function unstatic, move the header to mptscsih.h and export it.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
-rw-r--r-- | drivers/message/fusion/mptscsih.c | 4 | ||||
-rw-r--r-- | drivers/message/fusion/mptscsih.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c index 56c3d1f78f05..aa9cde807632 100644 --- a/drivers/message/fusion/mptscsih.c +++ b/drivers/message/fusion/mptscsih.c | |||
@@ -144,7 +144,6 @@ static int mptscsih_tm_pending_wait(MPT_SCSI_HOST * hd); | |||
144 | static int mptscsih_tm_wait_for_completion(MPT_SCSI_HOST * hd, ulong timeout ); | 144 | static int mptscsih_tm_wait_for_completion(MPT_SCSI_HOST * hd, ulong timeout ); |
145 | static u32 SCPNT_TO_LOOKUP_IDX(struct scsi_cmnd *sc); | 145 | static u32 SCPNT_TO_LOOKUP_IDX(struct scsi_cmnd *sc); |
146 | 146 | ||
147 | static int mptscsih_TMHandler(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 target, u8 lun, int ctx2abort, ulong timeout); | ||
148 | static int mptscsih_IssueTaskMgmt(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 target, u8 lun, int ctx2abort, ulong timeout); | 147 | static int mptscsih_IssueTaskMgmt(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 target, u8 lun, int ctx2abort, ulong timeout); |
149 | 148 | ||
150 | int mptscsih_ioc_reset(MPT_ADAPTER *ioc, int post_reset); | 149 | int mptscsih_ioc_reset(MPT_ADAPTER *ioc, int post_reset); |
@@ -1528,7 +1527,7 @@ mptscsih_freeChainBuffers(MPT_ADAPTER *ioc, int req_idx) | |||
1528 | * | 1527 | * |
1529 | * Returns 0 for SUCCESS or -1 if FAILED. | 1528 | * Returns 0 for SUCCESS or -1 if FAILED. |
1530 | */ | 1529 | */ |
1531 | static int | 1530 | int |
1532 | mptscsih_TMHandler(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 target, u8 lun, int ctx2abort, ulong timeout) | 1531 | mptscsih_TMHandler(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 target, u8 lun, int ctx2abort, ulong timeout) |
1533 | { | 1532 | { |
1534 | MPT_ADAPTER *ioc; | 1533 | MPT_ADAPTER *ioc; |
@@ -5601,5 +5600,6 @@ EXPORT_SYMBOL(mptscsih_event_process); | |||
5601 | EXPORT_SYMBOL(mptscsih_ioc_reset); | 5600 | EXPORT_SYMBOL(mptscsih_ioc_reset); |
5602 | EXPORT_SYMBOL(mptscsih_change_queue_depth); | 5601 | EXPORT_SYMBOL(mptscsih_change_queue_depth); |
5603 | EXPORT_SYMBOL(mptscsih_timer_expired); | 5602 | EXPORT_SYMBOL(mptscsih_timer_expired); |
5603 | EXPORT_SYMBOL(mptscsih_TMHandler); | ||
5604 | 5604 | ||
5605 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ | 5605 | /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ |
diff --git a/drivers/message/fusion/mptscsih.h b/drivers/message/fusion/mptscsih.h index d3cba12f4bd9..44b248d51ea3 100644 --- a/drivers/message/fusion/mptscsih.h +++ b/drivers/message/fusion/mptscsih.h | |||
@@ -108,3 +108,4 @@ extern int mptscsih_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *pE | |||
108 | extern int mptscsih_ioc_reset(MPT_ADAPTER *ioc, int post_reset); | 108 | extern int mptscsih_ioc_reset(MPT_ADAPTER *ioc, int post_reset); |
109 | extern int mptscsih_change_queue_depth(struct scsi_device *sdev, int qdepth); | 109 | extern int mptscsih_change_queue_depth(struct scsi_device *sdev, int qdepth); |
110 | extern void mptscsih_timer_expired(unsigned long data); | 110 | extern void mptscsih_timer_expired(unsigned long data); |
111 | extern int mptscsih_TMHandler(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 target, u8 lun, int ctx2abort, ulong timeout); | ||