msm: ipa3: remove odu_bridge functions from ipa.h

As part of IPA driver refactoring, a separation has been made
between IPA core driver and the IPA clients.
odu_bridge driver has moved to the ipa_clients folder and a
dedicated header file has been created in order to provide
a direct interface between IPA odu_bridge client driver and
other drivers without a direct interaction with the IPA core
driver.
This change moves odu_bridge functions and structure from
ipa.h to the ipa_odu_bridge.h header.

CRs-fixed: 999935
Change-Id: I1b24c4e13daaae3e63c5cacefcbda12b8cfbeeb8
Signed-off-by: Amir Levy <alevy@codeaurora.org>

2 files changed, 52 insertions, 68 deletions

diff --git a/include/linux/ipa.h b/include/linux/ipa.h
index 4e14dd8a36bf..3a87177b623f 100644
--- a/include/linux/ipa.h
+++ b/include/linux/ipa.h
@@ -1052,30 +1052,6 @@ struct ipa_wdi_buffer_info {
 };
 
 /**
- * struct odu_bridge_params - parameters for odu bridge initialization API
- *
- * @netdev_name: network interface name
- * @priv: private data that will be supplied to client's callback
- * @tx_dp_notify: callback for handling SKB. the following event are supported:
- *	IPA_WRITE_DONE:	will be called after client called to odu_bridge_tx_dp()
- *			Client is expected to free the skb.
- *	IPA_RECEIVE:	will be called for delivering skb to APPS.
- *			Client is expected to deliver the skb to network stack.
- * @send_dl_skb: callback for sending skb on downlink direction to adapter.
- *		Client is expected to free the skb.
- * @device_ethaddr: device Ethernet address in network order.
- * @ipa_desc_size: IPA Sys Pipe Desc Size
- */
-struct odu_bridge_params {
-	const char *netdev_name;
-	void *priv;
-	ipa_notify_cb tx_dp_notify;
-	int (*send_dl_skb)(void *priv, struct sk_buff *skb);
-	u8 device_ethaddr[ETH_ALEN];
-	u32 ipa_desc_size;
-};
-
-/**
  * enum ipa_mhi_event_type - event type for mhi callback
  *
  * @IPA_MHI_EVENT_READY: IPA MHI is ready and IPA uC is loaded. After getting
@@ -1438,20 +1414,6 @@ enum ipacm_client_enum ipa_get_client(int pipe_idx);
 bool ipa_get_client_uplink(int pipe_idx);
 
 /*
- * ODU bridge
- */
-
-int odu_bridge_init(struct odu_bridge_params *params);
-
-int odu_bridge_connect(void);
-
-int odu_bridge_disconnect(void);
-
-int odu_bridge_tx_dp(struct sk_buff *skb, struct ipa_tx_meta *metadata);
-
-int odu_bridge_cleanup(void);
-
-/*
  * IPADMA
  */
 int ipa_dma_init(void);
@@ -2104,36 +2066,6 @@ static inline bool ipa_get_client_uplink(int pipe_idx)
 	return -EPERM;
 }
 
-
-/*
- * ODU bridge
- */
-static inline int odu_bridge_init(struct odu_bridge_params *params)
-{
-	return -EPERM;
-}
-
-static inline int odu_bridge_disconnect(void)
-{
-	return -EPERM;
-}
-
-static inline int odu_bridge_connect(void)
-{
-	return -EPERM;
-}
-
-static inline int odu_bridge_tx_dp(struct sk_buff *skb,
-						struct ipa_tx_meta *metadata)
-{
-	return -EPERM;
-}
-
-static inline int odu_bridge_cleanup(void)
-{
-	return -EPERM;
-}
-
 /*
  * IPADMA
  */
diff --git a/include/linux/ipa_odu_bridge.h b/include/linux/ipa_odu_bridge.h
index 04b809b70942..1d9ec737d0a1 100644
--- a/include/linux/ipa_odu_bridge.h
+++ b/include/linux/ipa_odu_bridge.h
@@ -13,6 +13,30 @@
 #ifndef _IPA_ODO_BRIDGE_H_
 #define _IPA_ODO_BRIDGE_H_
 
+/**
+ * struct odu_bridge_params - parameters for odu bridge initialization API
+ *
+ * @netdev_name: network interface name
+ * @priv: private data that will be supplied to client's callback
+ * @tx_dp_notify: callback for handling SKB. the following event are supported:
+ *	IPA_WRITE_DONE:	will be called after client called to odu_bridge_tx_dp()
+ *			Client is expected to free the skb.
+ *	IPA_RECEIVE:	will be called for delivering skb to APPS.
+ *			Client is expected to deliver the skb to network stack.
+ * @send_dl_skb: callback for sending skb on downlink direction to adapter.
+ *		Client is expected to free the skb.
+ * @device_ethaddr: device Ethernet address in network order.
+ * @ipa_desc_size: IPA Sys Pipe Desc Size
+ */
+struct odu_bridge_params {
+	const char *netdev_name;
+	void *priv;
+	ipa_notify_cb tx_dp_notify;
+	int (*send_dl_skb)(void *priv, struct sk_buff *skb);
+	u8 device_ethaddr[ETH_ALEN];
+	u32 ipa_desc_size;
+};
+
 #if defined CONFIG_IPA || defined CONFIG_IPA3
 
 int odu_bridge_init(struct odu_bridge_params *params);
@@ -25,6 +49,34 @@ int odu_bridge_tx_dp(struct sk_buff *skb, struct ipa_tx_meta *metadata);
 
 int odu_bridge_cleanup(void);
 
+#else
+
+static inline int odu_bridge_init(struct odu_bridge_params *params)
+{
+	return -EPERM;
+}
+
+static inline int odu_bridge_disconnect(void)
+{
+	return -EPERM;
+}
+
+static inline int odu_bridge_connect(void)
+{
+	return -EPERM;
+}
+
+static inline int odu_bridge_tx_dp(struct sk_buff *skb,
+						struct ipa_tx_meta *metadata)
+{
+	return -EPERM;
+}
+
+static inline int odu_bridge_cleanup(void)
+{
+	return -EPERM;
+}
+
 #endif /* CONFIG_IPA || defined CONFIG_IPA3 */
 
 #endif /* _IPA_ODO_BRIDGE_H */