[v6,05/10] usb: roles: Introduce stubs for the exiting functions in role.h.

Commit Message

Chunfeng Yun (云春峰) May 29, 2019, 7:43 a.m. UTC

From: Yu Chen <[e-mail]>

This patch adds stubs for the exiting functions while
CONFIG_USB_ROLE_SWITCH does not enabled.

Cc: Greg Kroah-Hartman <[e-mail]>
Cc: Heikki Krogerus <[e-mail]>
Cc: Hans de Goede <[e-mail]>
Cc: Andy Shevchenko <[e-mail]>
Cc: John Stultz <[e-mail]>
Reviewed-by: Heikki Krogerus <[e-mail]>
Signed-off-by: Yu Chen <[e-mail]>
---
v6:
  merge this patch [1] into this series to add new API

	[1] https://patchwork.kernel.org/patch/10909971/
---
 include/linux/usb/role.h | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

Comments

Greg KH June 3, 2019, 1:19 p.m. UTC | #1

On Wed, May 29, 2019 at 03:43:43PM +0800, Chunfeng Yun wrote:
> From: Yu Chen <[e-mail]>
> 
> This patch adds stubs for the exiting functions while
> CONFIG_USB_ROLE_SWITCH does not enabled.
> 
> Cc: Greg Kroah-Hartman <[e-mail]>
> Cc: Heikki Krogerus <[e-mail]>
> Cc: Hans de Goede <[e-mail]>
> Cc: Andy Shevchenko <[e-mail]>
> Cc: John Stultz <[e-mail]>
> Reviewed-by: Heikki Krogerus <[e-mail]>
> Signed-off-by: Yu Chen <[e-mail]>

Same here, you need to sign off on it too.

thanks,

greg k-h

Chunfeng Yun (云春峰) June 4, 2019, 6:43 a.m. UTC | #2

On Mon, 2019-06-03 at 15:19 +0200, Greg Kroah-Hartman wrote:
> On Wed, May 29, 2019 at 03:43:43PM +0800, Chunfeng Yun wrote:
> > From: Yu Chen <[e-mail]>
> > 
> > This patch adds stubs for the exiting functions while
> > CONFIG_USB_ROLE_SWITCH does not enabled.
> > 
> > Cc: Greg Kroah-Hartman <[e-mail]>
> > Cc: Heikki Krogerus <[e-mail]>
> > Cc: Hans de Goede <[e-mail]>
> > Cc: Andy Shevchenko <[e-mail]>
> > Cc: John Stultz <[e-mail]>
> > Reviewed-by: Heikki Krogerus <[e-mail]>
> > Signed-off-by: Yu Chen <[e-mail]>
> 
> Same here, you need to sign off on it too.
Ok, thanks
> 
> thanks,
> 
> greg k-h

Patch

diff --git a/include/linux/usb/role.h b/include/linux/usb/role.h
index c05ffa6abda9..da2b9641b877 100644
--- a/include/linux/usb/role.h
+++ b/include/linux/usb/role.h
@@ -42,6 +42,8 @@  struct usb_role_switch_desc {
 	bool allow_userspace_control;
 };
 
+
+#if IS_ENABLED(CONFIG_USB_ROLE_SWITCH)
 int usb_role_switch_set_role(struct usb_role_switch *sw, enum usb_role role);
 enum usb_role usb_role_switch_get_role(struct usb_role_switch *sw);
 struct usb_role_switch *usb_role_switch_get(struct device *dev);
@@ -51,5 +53,33 @@  struct usb_role_switch *
 usb_role_switch_register(struct device *parent,
 			 const struct usb_role_switch_desc *desc);
 void usb_role_switch_unregister(struct usb_role_switch *sw);
+#else
+static inline int usb_role_switch_set_role(struct usb_role_switch *sw,
+		enum usb_role role)
+{
+	return 0;
+}
+
+static inline enum usb_role usb_role_switch_get_role(struct usb_role_switch *sw)
+{
+	return USB_ROLE_NONE;
+}
+
+static inline struct usb_role_switch *usb_role_switch_get(struct device *dev)
+{
+	return ERR_PTR(-ENODEV);
+}
+
+static inline void usb_role_switch_put(struct usb_role_switch *sw) { }
+
+static inline struct usb_role_switch *
+usb_role_switch_register(struct device *parent,
+			 const struct usb_role_switch_desc *desc)
+{
+	return ERR_PTR(-ENODEV);
+}
+
+static inline void usb_role_switch_unregister(struct usb_role_switch *sw) { }
+#endif
 
 #endif /* __LINUX_USB_ROLE_H */