From 4468fe74a8c64e7953627fc100ea875b0f4314e0 Mon Sep 17 00:00:00 2001
From: Oliver Neukum <oneukum@suse.com>
Date: Tue, 24 Jan 2023 09:31:58 +0100
Subject: [PATCH 2/3] paddings for the new structures for roles
Patch-mainline: Never (kABI padding)
References: bsc#1207439

Signed-off-by: Oliver Neukum <oneukum@suse.com>
---
 include/linux/usb/otg-fsm.h       | 4 ++++
 include/linux/usb/otg.h           | 1 +
 include/linux/usb/phy.h           | 4 ++++
 include/linux/usb/phy_companion.h | 2 ++
 include/linux/usb/role.h          | 2 ++
 5 files changed, 13 insertions(+)

diff --git a/include/linux/usb/otg-fsm.h b/include/linux/usb/otg-fsm.h
index 6135d076c..2a92b1b8b 100644
--- a/include/linux/usb/otg-fsm.h
+++ b/include/linux/usb/otg-fsm.h
@@ -185,6 +185,8 @@ struct otg_fsm {
 	struct delayed_work hnp_polling_work;
 	bool hnp_work_inited;
 	bool state_changed;
+
+	void *suse_kabi_padding;
 };
 
 struct otg_fsm_ops {
@@ -199,6 +201,8 @@ struct otg_fsm_ops {
 	void	(*del_timer)(struct otg_fsm *fsm, enum otg_fsm_timer timer);
 	int	(*start_host)(struct otg_fsm *fsm, int on);
 	int	(*start_gadget)(struct otg_fsm *fsm, int on);
+
+	void *suse_kabi_padding;
 };
 
 
diff --git a/include/linux/usb/otg.h b/include/linux/usb/otg.h
index 6475f880b..a89d58b9a 100644
--- a/include/linux/usb/otg.h
+++ b/include/linux/usb/otg.h
@@ -40,6 +40,7 @@ struct usb_otg {
 	/* start or continue HNP role switch */
 	int	(*start_hnp)(struct usb_otg *otg);
 
+	void *suse_kabi_padding;
 };
 
 /**
diff --git a/include/linux/usb/phy.h b/include/linux/usb/phy.h
index e4de6bc1f..b1f5a96b0 100644
--- a/include/linux/usb/phy.h
+++ b/include/linux/usb/phy.h
@@ -72,6 +72,8 @@ struct usb_otg;
 struct usb_phy_io_ops {
 	int (*read)(struct usb_phy *x, u32 reg);
 	int (*write)(struct usb_phy *x, u32 val, u32 reg);
+
+	void *suse_kabi_padding;
 };
 
 struct usb_charger_current {
@@ -155,6 +157,8 @@ struct usb_phy {
 	 * manually detect the charger type.
 	 */
 	enum usb_charger_type (*charger_detect)(struct usb_phy *x);
+
+	void *suse_kabi_padding;
 };
 
 /* for board-specific init logic */
diff --git a/include/linux/usb/phy_companion.h b/include/linux/usb/phy_companion.h
index 862aaeca2..502439961 100644
--- a/include/linux/usb/phy_companion.h
+++ b/include/linux/usb/phy_companion.h
@@ -20,6 +20,8 @@ struct phy_companion {
 
 	/* for B devices only:  start session with A-Host */
 	int	(*start_srp)(struct phy_companion *x);
+
+	void *suse_kabi_padding;
 };
 
 #endif /* __DRIVERS_PHY_COMPANION_H */
diff --git a/include/linux/usb/role.h b/include/linux/usb/role.h
index b5deafd91..054850dd9 100644
--- a/include/linux/usb/role.h
+++ b/include/linux/usb/role.h
@@ -45,6 +45,8 @@ struct usb_role_switch_desc {
 	bool allow_userspace_control;
 	void *driver_data;
 	const char *name;
+
+	void *suse_kabi_padding;
 };
 
 
-- 
2.39.0