Fixes the following W=1 kernel build warning(s):
drivers/scsi/megaraid/megaraid_sas_base.c:240:5: warning: no previous
prototype for ‘megasas_readl’ [-Wmissing-prototypes]
240 | u32 megasas_readl(struct megasas_instance *instance,
| ^~~~~~~~~~~~~
drivers/scsi/megaraid/megaraid_sas_base.c:301:21: warning: no previous
prototype for ‘megasas_get_cmd’ [-Wmissing-prototypes]
301 | struct megasas_cmd *megasas_get_cmd(struct megasas_instance
| ^~~~~~~~~~~~~~~
drivers/scsi/megaraid/megaraid_sas_base.c:327:1: warning: no previous
prototype for ‘megasas_return_cmd’ [-Wmissing-prototypes]
327 | megasas_return_cmd(struct megasas_instance *instance, struct megasas_cmd
*cmd)
| ^~~~~~~~~~~~~~~~~~
drivers/scsi/megaraid/megaraid_sas_base.c:1088:1: warning: no previous
prototype for ‘megasas_issue_polled’ [-Wmissing-prototypes]
1088 | megasas_issue_polled(struct megasas_instance *instance, struct
megasas_cmd *cmd)
| ^~~~~~~~~~~~~~~~~~~~
drivers/scsi/megaraid/megaraid_sas_base.c:2149:6: warning: no previous
prototype for ‘megaraid_sas_kill_hba’ [-Wmissing-prototypes]
2149 | void megaraid_sas_kill_hba(struct megasas_instance *instance)
| ^~~~~~~~~~~~~~~~~~~~~
drivers/scsi/megaraid/megaraid_sas_base.c:2186:1: warning: no previous
prototype for ‘megasas_check_and_restore_queue_depth’ [-Wmissing-prototypes]
2186 | megasas_check_and_restore_queue_depth(struct megasas_instance *instance)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/scsi/megaraid/megaraid_sas_base.c:2263:6: warning: no previous
prototype for ‘megasas_start_timer’ [-Wmissing-prototypes]
2263 | void megasas_start_timer(struct megasas_instance *instance)
| ^~~~~~~~~~~~~~~~~~~
drivers/scsi/megaraid/megaraid_sas_base.c:2579:5: warning: no previous
prototype for ‘megasas_sriov_start_heartbeat’ [-Wmissing-prototypes]
2579 | int megasas_sriov_start_heartbeat(struct megasas_instance *instance,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/scsi/megaraid/megaraid_sas_base.c:4292:6: warning: no previous
prototype for ‘megasas_free_cmds’ [-Wmissing-prototypes]
4292 | void megasas_free_cmds(struct megasas_instance *instance)
| ^~~~~~~~~~~~~~~~~
drivers/scsi/megaraid/megaraid_sas_base.c:4329:5: warning: no previous
prototype for ‘megasas_alloc_cmds’ [-Wmissing-prototypes]
4329 | int megasas_alloc_cmds(struct megasas_instance *instance)
| ^~~~~~~~~~~~~~~~~~
Cc: Kashyap Desai <kashyap.de...@broadcom.com>
Cc: Sumit Saxena <sumit.sax...@broadcom.com>
Cc: Shivasharan S <shivasharan.srikanteshw...@broadcom.com>
Cc: megaraidlinux....@broadcom.com
Signed-off-by: Lee Jones <lee.jo...@linaro.org>
---
drivers/scsi/megaraid/megaraid_sas.h | 25 +++++++++++++++++-
drivers/scsi/megaraid/megaraid_sas_fusion.c | 29 ---------------------
2 files changed, 24 insertions(+), 30 deletions(-)
diff --git a/drivers/scsi/megaraid/megaraid_sas.h
b/drivers/scsi/megaraid/megaraid_sas.h
index af2c7a2a95657..5c8037fca5fc6 100644
--- a/drivers/scsi/megaraid/megaraid_sas.h
+++ b/drivers/scsi/megaraid/megaraid_sas.h
@@ -2683,8 +2683,31 @@ void megasas_return_cmd_fusion(struct megasas_instance
*instance,
struct megasas_cmd_fusion *cmd);
int megasas_issue_blocked_cmd(struct megasas_instance *instance,
struct megasas_cmd *cmd, int timeout);
-void __megasas_return_cmd(struct megasas_instance *instance,
+void megasas_return_cmd(struct megasas_instance *instance,
struct megasas_cmd *cmd);
+u32 megasas_readl(struct megasas_instance *instance,
+ const volatile void __iomem *addr);
+void megasas_free_cmds(struct megasas_instance *instance);
+struct megasas_cmd *megasas_get_cmd(struct megasas_instance *instance);
+void megaraid_sas_kill_hba(struct megasas_instance *instance);
+void megasas_complete_cmd(struct megasas_instance *instance,
+ struct megasas_cmd *cmd, u8 alt_status);
+int wait_and_poll(struct megasas_instance *instance, struct megasas_cmd *cmd,
+ int seconds);
+
+int megasas_alloc_cmds(struct megasas_instance *instance);
+int megasas_clear_intr_fusion(struct megasas_instance *instance);
+int megasas_issue_polled(struct megasas_instance *instance,
+ struct megasas_cmd *cmd);
+void megasas_check_and_restore_queue_depth(struct megasas_instance *instance);
+
+int megasas_transition_to_ready(struct megasas_instance *instance, int ocr);
+void megaraid_sas_kill_hba(struct megasas_instance *instance);
+
+extern u32 megasas_dbg_lvl;
+int megasas_sriov_start_heartbeat(struct megasas_instance *instance,
+ int initial);
+void megasas_start_timer(struct megasas_instance *instance);
void megasas_return_mfi_mpt_pthr(struct megasas_instance *instance,
struct megasas_cmd *cmd_mfi, struct megasas_cmd_fusion *cmd_fusion);
diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c
b/drivers/scsi/megaraid/megaraid_sas_fusion.c
index a0cf55776361c..fd0f40bc1795d 100644
--- a/drivers/scsi/megaraid/megaraid_sas_fusion.c
+++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c
@@ -48,34 +48,7 @@
#include "megaraid_sas.h"
-extern void megasas_free_cmds(struct megasas_instance *instance);
-extern struct megasas_cmd *megasas_get_cmd(struct megasas_instance
- *instance);
-extern void
-megasas_complete_cmd(struct megasas_instance *instance,
- struct megasas_cmd *cmd, u8 alt_status);
-int
-wait_and_poll(struct megasas_instance *instance, struct megasas_cmd *cmd,
- int seconds);
-
-void
-megasas_return_cmd(struct megasas_instance *instance, struct megasas_cmd *cmd);
-int megasas_alloc_cmds(struct megasas_instance *instance);
-int
-megasas_clear_intr_fusion(struct megasas_instance *instance);
-int
-megasas_issue_polled(struct megasas_instance *instance,
- struct megasas_cmd *cmd);
-void
-megasas_check_and_restore_queue_depth(struct megasas_instance *instance);
-
-int megasas_transition_to_ready(struct megasas_instance *instance, int ocr);
-void megaraid_sas_kill_hba(struct megasas_instance *instance);
-extern u32 megasas_dbg_lvl;
-int megasas_sriov_start_heartbeat(struct megasas_instance *instance,
- int initial);
-void megasas_start_timer(struct megasas_instance *instance);
extern struct megasas_mgmt_info megasas_mgmt_info;
extern unsigned int resetwaittime;
extern unsigned int dual_qdepth_disable;
@@ -84,8 +57,6 @@ static void megasas_free_reply_fusion(struct megasas_instance
*instance);
static inline
void megasas_configure_queue_sizes(struct megasas_instance *instance);
static void megasas_fusion_crash_dump(struct megasas_instance *instance);
-extern u32 megasas_readl(struct megasas_instance *instance,
- const volatile void __iomem *addr);
/**
* megasas_adp_reset_wait_for_ready - initiate chip reset and wait for
--
2.25.1
