From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [v5,08/13] usb: roles: Introduce stubs for the exiting functions in role.h. From: Heikki Krogerus Message-Id: <20190404132528.GD21319@kuha.fi.intel.com> Date: Thu, 4 Apr 2019 16:25:28 +0300 To: Yu Chen Cc: linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, john.stultz@linaro.org, suzhuangluan@hisilicon.com, kongfei@hisilicon.com, liuyu712@hisilicon.com, wanghu17@hisilicon.com, butao@hisilicon.com, chenyao11@huawei.com, fangshengzhou@hisilicon.com, lipengcheng8@huawei.com, songxiaowei@hisilicon.com, xuyiping@hisilicon.com, xuyoujun4@huawei.com, yudongbin@hisilicon.com, zangleigang@hisilicon.com, Greg Kroah-Hartman , Hans de Goede , Andy Shevchenko List-ID: T24gRnJpLCBNYXIgMjksIDIwMTkgYXQgMTI6MTQ6MDRQTSArMDgwMCwgWXUgQ2hlbiB3cm90ZToK PiBUaGlzIHBhdGNoIGFkZHMgc3R1YnMgZm9yIHRoZSBleGl0aW5nIGZ1bmN0aW9ucyB3aGlsZQo+ IENPTkZJR19VU0JfUk9MRV9TV0lUQ0ggZG9lcyBub3QgZW5hYmxlZC4KPiAKPiBDYzogR3JlZyBL cm9haC1IYXJ0bWFuIDxncmVna2hAbGludXhmb3VuZGF0aW9uLm9yZz4KPiBDYzogSGVpa2tpIEty b2dlcnVzIDxoZWlra2kua3JvZ2VydXNAbGludXguaW50ZWwuY29tPgo+IENjOiBIYW5zIGRlIEdv ZWRlIDxoZGVnb2VkZUByZWRoYXQuY29tPgo+IENjOiBBbmR5IFNoZXZjaGVua28gPGFuZHkuc2hl dmNoZW5rb0BnbWFpbC5jb20+Cj4gQ2M6IEpvaG4gU3R1bHR6IDxqb2huLnN0dWx0ekBsaW5hcm8u b3JnPgo+IFNpZ25lZC1vZmYtYnk6IFl1IENoZW4gPGNoZW55dTU2QGh1YXdlaS5jb20+CgpSZXZp ZXdlZC1ieTogSGVpa2tpIEtyb2dlcnVzIDxoZWlra2kua3JvZ2VydXNAbGludXguaW50ZWwuY29t PgoKPiAtLS0KPiAgaW5jbHVkZS9saW51eC91c2Ivcm9sZS5oIHwgMzAgKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrCj4gIDEgZmlsZSBjaGFuZ2VkLCAzMCBpbnNlcnRpb25zKCspCj4gCj4g ZGlmZiAtLWdpdCBhL2luY2x1ZGUvbGludXgvdXNiL3JvbGUuaCBiL2luY2x1ZGUvbGludXgvdXNi L3JvbGUuaAo+IGluZGV4IGMwNWZmYTZhYmRhOS4uZGEyYjk2NDFiODc3IDEwMDY0NAo+IC0tLSBh L2luY2x1ZGUvbGludXgvdXNiL3JvbGUuaAo+ICsrKyBiL2luY2x1ZGUvbGludXgvdXNiL3JvbGUu aAo+IEBAIC00Miw2ICs0Miw4IEBAIHN0cnVjdCB1c2Jfcm9sZV9zd2l0Y2hfZGVzYyB7Cj4gIAli b29sIGFsbG93X3VzZXJzcGFjZV9jb250cm9sOwo+ICB9Owo+ICAKPiArCj4gKyNpZiBJU19FTkFC TEVEKENPTkZJR19VU0JfUk9MRV9TV0lUQ0gpCj4gIGludCB1c2Jfcm9sZV9zd2l0Y2hfc2V0X3Jv bGUoc3RydWN0IHVzYl9yb2xlX3N3aXRjaCAqc3csIGVudW0gdXNiX3JvbGUgcm9sZSk7Cj4gIGVu dW0gdXNiX3JvbGUgdXNiX3JvbGVfc3dpdGNoX2dldF9yb2xlKHN0cnVjdCB1c2Jfcm9sZV9zd2l0 Y2ggKnN3KTsKPiAgc3RydWN0IHVzYl9yb2xlX3N3aXRjaCAqdXNiX3JvbGVfc3dpdGNoX2dldChz dHJ1Y3QgZGV2aWNlICpkZXYpOwo+IEBAIC01MSw1ICs1MywzMyBAQCBzdHJ1Y3QgdXNiX3JvbGVf c3dpdGNoICoKPiAgdXNiX3JvbGVfc3dpdGNoX3JlZ2lzdGVyKHN0cnVjdCBkZXZpY2UgKnBhcmVu dCwKPiAgCQkJIGNvbnN0IHN0cnVjdCB1c2Jfcm9sZV9zd2l0Y2hfZGVzYyAqZGVzYyk7Cj4gIHZv aWQgdXNiX3JvbGVfc3dpdGNoX3VucmVnaXN0ZXIoc3RydWN0IHVzYl9yb2xlX3N3aXRjaCAqc3cp Owo+ICsjZWxzZQo+ICtzdGF0aWMgaW5saW5lIGludCB1c2Jfcm9sZV9zd2l0Y2hfc2V0X3JvbGUo c3RydWN0IHVzYl9yb2xlX3N3aXRjaCAqc3csCj4gKwkJZW51bSB1c2Jfcm9sZSByb2xlKQo+ICt7 Cj4gKwlyZXR1cm4gMDsKPiArfQo+ICsKPiArc3RhdGljIGlubGluZSBlbnVtIHVzYl9yb2xlIHVz Yl9yb2xlX3N3aXRjaF9nZXRfcm9sZShzdHJ1Y3QgdXNiX3JvbGVfc3dpdGNoICpzdykKPiArewo+ ICsJcmV0dXJuIFVTQl9ST0xFX05PTkU7Cj4gK30KPiArCj4gK3N0YXRpYyBpbmxpbmUgc3RydWN0 IHVzYl9yb2xlX3N3aXRjaCAqdXNiX3JvbGVfc3dpdGNoX2dldChzdHJ1Y3QgZGV2aWNlICpkZXYp Cj4gK3sKPiArCXJldHVybiBFUlJfUFRSKC1FTk9ERVYpOwo+ICt9Cj4gKwo+ICtzdGF0aWMgaW5s aW5lIHZvaWQgdXNiX3JvbGVfc3dpdGNoX3B1dChzdHJ1Y3QgdXNiX3JvbGVfc3dpdGNoICpzdykg eyB9Cj4gKwo+ICtzdGF0aWMgaW5saW5lIHN0cnVjdCB1c2Jfcm9sZV9zd2l0Y2ggKgo+ICt1c2Jf cm9sZV9zd2l0Y2hfcmVnaXN0ZXIoc3RydWN0IGRldmljZSAqcGFyZW50LAo+ICsJCQkgY29uc3Qg c3RydWN0IHVzYl9yb2xlX3N3aXRjaF9kZXNjICpkZXNjKQo+ICt7Cj4gKwlyZXR1cm4gRVJSX1BU UigtRU5PREVWKTsKPiArfQo+ICsKPiArc3RhdGljIGlubGluZSB2b2lkIHVzYl9yb2xlX3N3aXRj aF91bnJlZ2lzdGVyKHN0cnVjdCB1c2Jfcm9sZV9zd2l0Y2ggKnN3KSB7IH0KPiArI2VuZGlmCj4g IAo+ICAjZW5kaWYgLyogX19MSU5VWF9VU0JfUk9MRV9IICovCj4gLS0gCj4gMi4xNS4wLXJjMgoK dGhhbmtzLAo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heikki Krogerus Subject: Re: [PATCH v5 08/13] usb: roles: Introduce stubs for the exiting functions in role.h. Date: Thu, 4 Apr 2019 16:25:28 +0300 Message-ID: <20190404132528.GD21319@kuha.fi.intel.com> References: <20190329041409.70138-1-chenyu56@huawei.com> <20190329041409.70138-9-chenyu56@huawei.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <20190329041409.70138-9-chenyu56@huawei.com> Sender: linux-kernel-owner@vger.kernel.org To: Yu Chen Cc: linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, john.stultz@linaro.org, suzhuangluan@hisilicon.com, kongfei@hisilicon.com, liuyu712@hisilicon.com, wanghu17@hisilicon.com, butao@hisilicon.com, chenyao11@huawei.com, fangshengzhou@hisilicon.com, lipengcheng8@huawei.com, songxiaowei@hisilicon.com, xuyiping@hisilicon.com, xuyoujun4@huawei.com, yudongbin@hisilicon.com, zangleigang@hisilicon.com, Greg Kroah-Hartman , Hans de Goede , Andy Shevchenko List-Id: devicetree@vger.kernel.org On Fri, Mar 29, 2019 at 12:14:04PM +0800, Yu Chen wrote: > This patch adds stubs for the exiting functions while > CONFIG_USB_ROLE_SWITCH does not enabled. > > Cc: Greg Kroah-Hartman > Cc: Heikki Krogerus > Cc: Hans de Goede > Cc: Andy Shevchenko > Cc: John Stultz > Signed-off-by: Yu Chen Reviewed-by: Heikki Krogerus > --- > include/linux/usb/role.h | 30 ++++++++++++++++++++++++++++++ > 1 file changed, 30 insertions(+) > > 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 */ > -- > 2.15.0-rc2 thanks, -- heikki