From: Alex Elder <elder@linaro.org>
Date: Tue, 16 Apr 2024 23:10:14 +0000 (-0500)
Subject: net: ipa: include "ipa_interrupt.h" where needed
X-Git-Tag: net-accept-more-20240515~4^2~197^2~4
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=a53c85f352587f0c4a9723acd385e3ef26d82187;p=linux-block.git

net: ipa: include "ipa_interrupt.h" where needed

The IPA structure contains an ipa_interrupt structure pointer, and
that structure is declared in "ipa.h".  There is no need to include
"ipa_interrupt.h" in that header file.

Instead, include "ipa_interrupt.h" in the three source files (in
addition to "ipa_main.c") that actually use the functions that are
declared there.

Similarly, three files use symbols defined in "ipa_reg.h" but do not
include that file; include it.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---

diff --git a/drivers/net/ipa/ipa.h b/drivers/net/ipa/ipa.h
index 968175019a5e..cdfd579af5b9 100644
--- a/drivers/net/ipa/ipa.h
+++ b/drivers/net/ipa/ipa.h
@@ -14,7 +14,6 @@
 #include "ipa_mem.h"
 #include "ipa_qmi.h"
 #include "ipa_endpoint.h"
-#include "ipa_interrupt.h"
 
 struct clk;
 struct icc_path;
diff --git a/drivers/net/ipa/ipa_cmd.c b/drivers/net/ipa/ipa_cmd.c
index 2e7762171e48..969b93fe5c49 100644
--- a/drivers/net/ipa/ipa_cmd.c
+++ b/drivers/net/ipa/ipa_cmd.c
@@ -14,6 +14,7 @@
 #include "gsi_trans.h"
 #include "ipa.h"
 #include "ipa_endpoint.h"
+#include "ipa_reg.h"
 #include "ipa_table.h"
 #include "ipa_cmd.h"
 #include "ipa_mem.h"
diff --git a/drivers/net/ipa/ipa_endpoint.c b/drivers/net/ipa/ipa_endpoint.c
index 4e8849c1f32d..8284b0a1178c 100644
--- a/drivers/net/ipa/ipa_endpoint.c
+++ b/drivers/net/ipa/ipa_endpoint.c
@@ -19,9 +19,11 @@
 #include "ipa_cmd.h"
 #include "ipa_mem.h"
 #include "ipa_modem.h"
+#include "ipa_reg.h"
 #include "ipa_table.h"
 #include "ipa_gsi.h"
 #include "ipa_power.h"
+#include "ipa_interrupt.h"
 
 /* Hardware is told about receive buffers once a "batch" has been queued */
 #define IPA_REPLENISH_BATCH	16		/* Must be non-zero */
diff --git a/drivers/net/ipa/ipa_power.c b/drivers/net/ipa/ipa_power.c
index 41ca7ef5e20f..42d728f08c93 100644
--- a/drivers/net/ipa/ipa_power.c
+++ b/drivers/net/ipa/ipa_power.c
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 
 /* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.
- * Copyright (C) 2018-2022 Linaro Ltd.
+ * Copyright (C) 2018-2024 Linaro Ltd.
  */
 
 #include <linux/clk.h>
@@ -15,6 +15,7 @@
 
 #include "ipa.h"
 #include "ipa_power.h"
+#include "ipa_interrupt.h"
 #include "ipa_endpoint.h"
 #include "ipa_modem.h"
 #include "ipa_data.h"
diff --git a/drivers/net/ipa/ipa_uc.c b/drivers/net/ipa/ipa_uc.c
index bfd5dc6dab43..17352f21d5f8 100644
--- a/drivers/net/ipa/ipa_uc.c
+++ b/drivers/net/ipa/ipa_uc.c
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 
 /* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.
- * Copyright (C) 2018-2022 Linaro Ltd.
+ * Copyright (C) 2018-2024 Linaro Ltd.
  */
 
 #include <linux/types.h>
@@ -10,8 +10,10 @@
 #include <linux/pm_runtime.h>
 
 #include "ipa.h"
+#include "ipa_reg.h"
 #include "ipa_uc.h"
 #include "ipa_power.h"
+#include "ipa_interrupt.h"
 
 /**
  * DOC:  The IPA embedded microcontroller