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: [v6,08/13] usb: roles: Introduce stubs for the exiting functions in role.h. From: Yu Chen Message-Id: <20190420064019.57522-9-chenyu56@huawei.com> Date: Sat, 20 Apr 2019 14:40:14 +0800 To: linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: 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, Yu Chen , Greg Kroah-Hartman , Heikki Krogerus , Hans de Goede , Andy Shevchenko List-ID: VGhpcyBwYXRjaCBhZGRzIHN0dWJzIGZvciB0aGUgZXhpdGluZyBmdW5jdGlvbnMgd2hpbGUKQ09O RklHX1VTQl9ST0xFX1NXSVRDSCBkb2VzIG5vdCBlbmFibGVkLgoKQ2M6IEdyZWcgS3JvYWgtSGFy dG1hbiA8Z3JlZ2toQGxpbnV4Zm91bmRhdGlvbi5vcmc+CkNjOiBIZWlra2kgS3JvZ2VydXMgPGhl aWtraS5rcm9nZXJ1c0BsaW51eC5pbnRlbC5jb20+CkNjOiBIYW5zIGRlIEdvZWRlIDxoZGVnb2Vk ZUByZWRoYXQuY29tPgpDYzogQW5keSBTaGV2Y2hlbmtvIDxhbmR5LnNoZXZjaGVua29AZ21haWwu Y29tPgpDYzogSm9obiBTdHVsdHogPGpvaG4uc3R1bHR6QGxpbmFyby5vcmc+ClJldmlld2VkLWJ5 OiBIZWlra2kgS3JvZ2VydXMgPGhlaWtraS5rcm9nZXJ1c0BsaW51eC5pbnRlbC5jb20+ClNpZ25l ZC1vZmYtYnk6IFl1IENoZW4gPGNoZW55dTU2QGh1YXdlaS5jb20+Ci0tLQogaW5jbHVkZS9saW51 eC91c2Ivcm9sZS5oIHwgMzAgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCiAxIGZpbGUg Y2hhbmdlZCwgMzAgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2luY2x1ZGUvbGludXgvdXNi L3JvbGUuaCBiL2luY2x1ZGUvbGludXgvdXNiL3JvbGUuaAppbmRleCBjMDVmZmE2YWJkYTkuLmRh MmI5NjQxYjg3NyAxMDA2NDQKLS0tIGEvaW5jbHVkZS9saW51eC91c2Ivcm9sZS5oCisrKyBiL2lu Y2x1ZGUvbGludXgvdXNiL3JvbGUuaApAQCAtNDIsNiArNDIsOCBAQCBzdHJ1Y3QgdXNiX3JvbGVf c3dpdGNoX2Rlc2MgewogCWJvb2wgYWxsb3dfdXNlcnNwYWNlX2NvbnRyb2w7CiB9OwogCisKKyNp ZiBJU19FTkFCTEVEKENPTkZJR19VU0JfUk9MRV9TV0lUQ0gpCiBpbnQgdXNiX3JvbGVfc3dpdGNo X3NldF9yb2xlKHN0cnVjdCB1c2Jfcm9sZV9zd2l0Y2ggKnN3LCBlbnVtIHVzYl9yb2xlIHJvbGUp OwogZW51bSB1c2Jfcm9sZSB1c2Jfcm9sZV9zd2l0Y2hfZ2V0X3JvbGUoc3RydWN0IHVzYl9yb2xl X3N3aXRjaCAqc3cpOwogc3RydWN0IHVzYl9yb2xlX3N3aXRjaCAqdXNiX3JvbGVfc3dpdGNoX2dl dChzdHJ1Y3QgZGV2aWNlICpkZXYpOwpAQCAtNTEsNSArNTMsMzMgQEAgc3RydWN0IHVzYl9yb2xl X3N3aXRjaCAqCiB1c2Jfcm9sZV9zd2l0Y2hfcmVnaXN0ZXIoc3RydWN0IGRldmljZSAqcGFyZW50 LAogCQkJIGNvbnN0IHN0cnVjdCB1c2Jfcm9sZV9zd2l0Y2hfZGVzYyAqZGVzYyk7CiB2b2lkIHVz Yl9yb2xlX3N3aXRjaF91bnJlZ2lzdGVyKHN0cnVjdCB1c2Jfcm9sZV9zd2l0Y2ggKnN3KTsKKyNl bHNlCitzdGF0aWMgaW5saW5lIGludCB1c2Jfcm9sZV9zd2l0Y2hfc2V0X3JvbGUoc3RydWN0IHVz Yl9yb2xlX3N3aXRjaCAqc3csCisJCWVudW0gdXNiX3JvbGUgcm9sZSkKK3sKKwlyZXR1cm4gMDsK K30KKworc3RhdGljIGlubGluZSBlbnVtIHVzYl9yb2xlIHVzYl9yb2xlX3N3aXRjaF9nZXRfcm9s ZShzdHJ1Y3QgdXNiX3JvbGVfc3dpdGNoICpzdykKK3sKKwlyZXR1cm4gVVNCX1JPTEVfTk9ORTsK K30KKworc3RhdGljIGlubGluZSBzdHJ1Y3QgdXNiX3JvbGVfc3dpdGNoICp1c2Jfcm9sZV9zd2l0 Y2hfZ2V0KHN0cnVjdCBkZXZpY2UgKmRldikKK3sKKwlyZXR1cm4gRVJSX1BUUigtRU5PREVWKTsK K30KKworc3RhdGljIGlubGluZSB2b2lkIHVzYl9yb2xlX3N3aXRjaF9wdXQoc3RydWN0IHVzYl9y b2xlX3N3aXRjaCAqc3cpIHsgfQorCitzdGF0aWMgaW5saW5lIHN0cnVjdCB1c2Jfcm9sZV9zd2l0 Y2ggKgordXNiX3JvbGVfc3dpdGNoX3JlZ2lzdGVyKHN0cnVjdCBkZXZpY2UgKnBhcmVudCwKKwkJ CSBjb25zdCBzdHJ1Y3QgdXNiX3JvbGVfc3dpdGNoX2Rlc2MgKmRlc2MpCit7CisJcmV0dXJuIEVS Ul9QVFIoLUVOT0RFVik7Cit9CisKK3N0YXRpYyBpbmxpbmUgdm9pZCB1c2Jfcm9sZV9zd2l0Y2hf dW5yZWdpc3RlcihzdHJ1Y3QgdXNiX3JvbGVfc3dpdGNoICpzdykgeyB9CisjZW5kaWYKIAogI2Vu ZGlmIC8qIF9fTElOVVhfVVNCX1JPTEVfSCAqLwo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.1 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS, UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 201CFC282E2 for ; Sat, 20 Apr 2019 06:41:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EAA2521871 for ; Sat, 20 Apr 2019 06:41:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728246AbfDTGlF (ORCPT ); Sat, 20 Apr 2019 02:41:05 -0400 Received: from szxga06-in.huawei.com ([45.249.212.32]:39544 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728079AbfDTGkp (ORCPT ); Sat, 20 Apr 2019 02:40:45 -0400 Received: from DGGEMS410-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 8406C7FA3296301000AE; Sat, 20 Apr 2019 14:40:39 +0800 (CST) Received: from vm100-107-113-134.huawei.com (100.107.113.134) by DGGEMS410-HUB.china.huawei.com (10.3.19.210) with Microsoft SMTP Server id 14.3.408.0; Sat, 20 Apr 2019 14:40:30 +0800 From: Yu Chen To: , , CC: , , , , , , , , , , , , , , Yu Chen , "Greg Kroah-Hartman" , Heikki Krogerus , Hans de Goede , "Andy Shevchenko" Subject: [PATCH v6 08/13] usb: roles: Introduce stubs for the exiting functions in role.h. Date: Sat, 20 Apr 2019 14:40:14 +0800 Message-ID: <20190420064019.57522-9-chenyu56@huawei.com> X-Mailer: git-send-email 2.15.0-rc2 In-Reply-To: <20190420064019.57522-1-chenyu56@huawei.com> References: <20190420064019.57522-1-chenyu56@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" X-Originating-IP: [100.107.113.134] X-CFilter-Loop: Reflected Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Message-ID: <20190420064014.yHCazFKlSmzUNayTQW-0qVTtgEZZmPe5hxoaols-r7w@z> 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 Reviewed-by: Heikki Krogerus Signed-off-by: Yu Chen --- 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