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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EB5C3C4332F for ; Wed, 16 Mar 2022 19:20:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1357862AbiCPTVm (ORCPT ); Wed, 16 Mar 2022 15:21:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51236 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357851AbiCPTVl (ORCPT ); Wed, 16 Mar 2022 15:21:41 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2CAF940A3F; Wed, 16 Mar 2022 12:20:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: Content-Type:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc: To:From:Sender:Reply-To:Content-ID:Content-Description; bh=4Krw3MostSzdRmJotMI0a/aFHrz6hD4Rnz4KlkBsZsY=; b=oMmN0YOyCxbwsqUbjdCoYoeLS5 xwOMYvr9c6y0ZD0gLE9DMUnynweLItGGubfTLvG/AFTS8gDdpV6qbKOe2/SN3s2MVuCKG2ip8Mj1T daPYsOGmw7rRzY22M54r0qxbz7gAzmEjzHxFdcWBVn37bavK9d81on5K0p1gEE5WIrLXqWY8/fU6M s5P/mifVEcH7CseJqbey8V+DTjHnfTd9wcLrhUE4NbrJGroreYsn7JZe2n7d0wMy7AotAiFE9ZHGk 8JL0YSuhRL0OVQ5l3GWEQSBBUdGvXVahxlykI44NQpLaQo/Se64NnCywaP3JRAx3A9pSa/0AcvqOF CO5qvuzA==; Received: from [2601:1c0:6280:3f0::aa0b] (helo=bombadil.infradead.org) by bombadil.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1nUZC5-00EArp-Jb; Wed, 16 Mar 2022 19:20:25 +0000 From: Randy Dunlap To: linux-kernel@vger.kernel.org Cc: Randy Dunlap , "Michael S. Tsirkin" , Jason Wang , Paolo Bonzini , Stefan Hajnoczi , Jens Axboe , Amit Shah , Arnd Bergmann , Greg Kroah-Hartman , Eli Cohen , Saeed Mahameed , Leon Romanovsky , Pablo Neira Ayuso , Jozsef Kadlecsik , Florian Westphal , "David S. Miller" , Jakub Kicinski , "James E.J. Bottomley" , "Martin K. Petersen" , Felipe Balbi , =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= , Sebastian Andrzej Siewior , Krzysztof Opasiak , Igor Kotrasinski , Valentina Manea , Shuah Khan , Shuah Khan , Jussi Kivilinna , Joachim Fritschi , Herbert Xu , Thomas Gleixner , Steven Rostedt , Ingo Molnar , Karol Herbst , Pekka Paalanen , Dave Hansen , Andy Lutomirski , Peter Zijlstra , Borislav Petkov , "H. Peter Anvin" , netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, linux-block@vger.kernel.org, linux-crypto@vger.kernel.org, linux-rdma@vger.kernel.org, linux-scsi@vger.kernel.org, linux-usb@vger.kernel.org, nouveau@lists.freedesktop.org, virtualization@lists.linux-foundation.org, x86@kernel.org Subject: [PATCH 6/9] usb: gadget: eliminate anonymous module_init & module_exit Date: Wed, 16 Mar 2022 12:20:07 -0700 Message-Id: <20220316192010.19001-7-rdunlap@infradead.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220316192010.19001-1-rdunlap@infradead.org> References: <20220316192010.19001-1-rdunlap@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org Eliminate anonymous module_init() and module_exit(), which can lead to confusion or ambiguity when reading System.map, crashes/oops/bugs, or an initcall_debug log. Give each of these init and exit functions unique driver-specific names to eliminate the anonymous names. Example 1: (System.map) ffffffff832fc78c t init ffffffff832fc79e t init ffffffff832fc8f8 t init Example 2: (initcall_debug log) calling init+0x0/0x12 @ 1 initcall init+0x0/0x12 returned 0 after 15 usecs calling init+0x0/0x60 @ 1 initcall init+0x0/0x60 returned 0 after 2 usecs calling init+0x0/0x9a @ 1 initcall init+0x0/0x9a returned 0 after 74 usecs Fixes: bd25a14edb75 ("usb: gadget: legacy/serial: allow dynamic removal") Fixes: 7bb5ea54be47 ("usb gadget serial: use composite gadget framework") Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Randy Dunlap Cc: Felipe Balbi Cc: Michał Mirosław Cc: Greg Kroah-Hartman Cc: Sebastian Andrzej Siewior Cc: linux-usb@vger.kernel.org --- drivers/usb/gadget/legacy/inode.c | 8 ++++---- drivers/usb/gadget/legacy/serial.c | 10 +++++----- drivers/usb/gadget/udc/dummy_hcd.c | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) --- lnx-517-rc8.orig/drivers/usb/gadget/legacy/serial.c +++ lnx-517-rc8/drivers/usb/gadget/legacy/serial.c @@ -273,7 +273,7 @@ static struct usb_composite_driver gseri static int switch_gserial_enable(bool do_enable) { if (!serial_config_driver.label) - /* init() was not called, yet */ + /* gserial_init() was not called, yet */ return 0; if (do_enable) @@ -283,7 +283,7 @@ static int switch_gserial_enable(bool do return 0; } -static int __init init(void) +static int __init gserial_init(void) { /* We *could* export two configs; that'd be much cleaner... * but neither of these product IDs was defined that way. @@ -314,11 +314,11 @@ static int __init init(void) return usb_composite_probe(&gserial_driver); } -module_init(init); +module_init(gserial_init); -static void __exit cleanup(void) +static void __exit gserial_cleanup(void) { if (enable) usb_composite_unregister(&gserial_driver); } -module_exit(cleanup); +module_exit(gserial_cleanup); --- lnx-517-rc8.orig/drivers/usb/gadget/udc/dummy_hcd.c +++ lnx-517-rc8/drivers/usb/gadget/udc/dummy_hcd.c @@ -2765,7 +2765,7 @@ static struct platform_driver dummy_hcd_ static struct platform_device *the_udc_pdev[MAX_NUM_UDC]; static struct platform_device *the_hcd_pdev[MAX_NUM_UDC]; -static int __init init(void) +static int __init dummy_hcd_init(void) { int retval = -ENOMEM; int i; @@ -2887,9 +2887,9 @@ err_alloc_udc: platform_device_put(the_hcd_pdev[i]); return retval; } -module_init(init); +module_init(dummy_hcd_init); -static void __exit cleanup(void) +static void __exit dummy_hcd_cleanup(void) { int i; @@ -2905,4 +2905,4 @@ static void __exit cleanup(void) platform_driver_unregister(&dummy_udc_driver); platform_driver_unregister(&dummy_hcd_driver); } -module_exit(cleanup); +module_exit(dummy_hcd_cleanup); --- lnx-517-rc8.orig/drivers/usb/gadget/legacy/inode.c +++ lnx-517-rc8/drivers/usb/gadget/legacy/inode.c @@ -2101,7 +2101,7 @@ MODULE_ALIAS_FS("gadgetfs"); /*----------------------------------------------------------------------*/ -static int __init init (void) +static int __init gadgetfs_init (void) { int status; @@ -2111,12 +2111,12 @@ static int __init init (void) shortname, driver_desc); return status; } -module_init (init); +module_init (gadgetfs_init); -static void __exit cleanup (void) +static void __exit gadgetfs_cleanup (void) { pr_debug ("unregister %s\n", shortname); unregister_filesystem (&gadgetfs_type); } -module_exit (cleanup); +module_exit (gadgetfs_cleanup); 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 Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DF3AAC433EF for ; Wed, 16 Mar 2022 19:21:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 9A05841821; Wed, 16 Mar 2022 19:21:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Z6TWPfxeeth1; Wed, 16 Mar 2022 19:21:22 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp4.osuosl.org (Postfix) with ESMTPS id 11B94417EF; Wed, 16 Mar 2022 19:21:22 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id D6743C0012; Wed, 16 Mar 2022 19:21:21 +0000 (UTC) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 65E44C000B for ; Wed, 16 Mar 2022 19:21:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 44B48611C6 for ; Wed, 16 Mar 2022 19:21:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp3.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=infradead.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZIk-JGRsR8WZ for ; Wed, 16 Mar 2022 19:21:19 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) by smtp3.osuosl.org (Postfix) with ESMTPS id 90C3A61213 for ; Wed, 16 Mar 2022 19:21:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: Content-Type:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc: To:From:Sender:Reply-To:Content-ID:Content-Description; bh=4Krw3MostSzdRmJotMI0a/aFHrz6hD4Rnz4KlkBsZsY=; b=oMmN0YOyCxbwsqUbjdCoYoeLS5 xwOMYvr9c6y0ZD0gLE9DMUnynweLItGGubfTLvG/AFTS8gDdpV6qbKOe2/SN3s2MVuCKG2ip8Mj1T daPYsOGmw7rRzY22M54r0qxbz7gAzmEjzHxFdcWBVn37bavK9d81on5K0p1gEE5WIrLXqWY8/fU6M s5P/mifVEcH7CseJqbey8V+DTjHnfTd9wcLrhUE4NbrJGroreYsn7JZe2n7d0wMy7AotAiFE9ZHGk 8JL0YSuhRL0OVQ5l3GWEQSBBUdGvXVahxlykI44NQpLaQo/Se64NnCywaP3JRAx3A9pSa/0AcvqOF CO5qvuzA==; Received: from [2601:1c0:6280:3f0::aa0b] (helo=bombadil.infradead.org) by bombadil.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1nUZC5-00EArp-Jb; Wed, 16 Mar 2022 19:20:25 +0000 From: Randy Dunlap To: linux-kernel@vger.kernel.org Subject: [PATCH 6/9] usb: gadget: eliminate anonymous module_init & module_exit Date: Wed, 16 Mar 2022 12:20:07 -0700 Message-Id: <20220316192010.19001-7-rdunlap@infradead.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220316192010.19001-1-rdunlap@infradead.org> References: <20220316192010.19001-1-rdunlap@infradead.org> MIME-Version: 1.0 Cc: linux-usb@vger.kernel.org, Andy Lutomirski , "Michael S. Tsirkin" , Peter Zijlstra , nouveau@lists.freedesktop.org, Dave Hansen , Valentina Manea , virtualization@lists.linux-foundation.org, Krzysztof Opasiak , Eli Cohen , netdev@vger.kernel.org, Shuah Khan , Thomas Gleixner , "H. Peter Anvin" , Arnd Bergmann , Leon Romanovsky , linux-rdma@vger.kernel.org, Ingo Molnar , Jozsef Kadlecsik , coreteam@netfilter.org, Jakub Kicinski , Sebastian Andrzej Siewior , Pablo Neira Ayuso , Joachim Fritschi , Felipe Balbi , Amit Shah , "James E.J. Bottomley" , Steven Rostedt , =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= , linux-block@vger.kernel.org, Pekka Paalanen , Borislav Petkov , Stefan Hajnoczi , Shuah Khan , Jussi Kivilinna , Herbert Xu , Jens Axboe , x86@kernel.org, linux-scsi@vger.kernel.org, "Martin K. Petersen" , Greg Kroah-Hartman , Randy Dunlap , Florian Westphal , Karol Herbst , netfilter-devel@vger.kernel.org, linux-crypto@vger.kernel.org, Igor Kotrasinski , Paolo Bonzini , Saeed Mahameed , "David S. Miller" X-BeenThere: virtualization@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Linux virtualization List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: virtualization-bounces@lists.linux-foundation.org Sender: "Virtualization" RWxpbWluYXRlIGFub255bW91cyBtb2R1bGVfaW5pdCgpIGFuZCBtb2R1bGVfZXhpdCgpLCB3aGlj aCBjYW4gbGVhZCB0bwpjb25mdXNpb24gb3IgYW1iaWd1aXR5IHdoZW4gcmVhZGluZyBTeXN0ZW0u bWFwLCBjcmFzaGVzL29vcHMvYnVncywKb3IgYW4gaW5pdGNhbGxfZGVidWcgbG9nLgoKR2l2ZSBl YWNoIG9mIHRoZXNlIGluaXQgYW5kIGV4aXQgZnVuY3Rpb25zIHVuaXF1ZSBkcml2ZXItc3BlY2lm aWMKbmFtZXMgdG8gZWxpbWluYXRlIHRoZSBhbm9ueW1vdXMgbmFtZXMuCgpFeGFtcGxlIDE6IChT eXN0ZW0ubWFwKQogZmZmZmZmZmY4MzJmYzc4YyB0IGluaXQKIGZmZmZmZmZmODMyZmM3OWUgdCBp bml0CiBmZmZmZmZmZjgzMmZjOGY4IHQgaW5pdAoKRXhhbXBsZSAyOiAoaW5pdGNhbGxfZGVidWcg bG9nKQogY2FsbGluZyAgaW5pdCsweDAvMHgxMiBAIDEKIGluaXRjYWxsIGluaXQrMHgwLzB4MTIg cmV0dXJuZWQgMCBhZnRlciAxNSB1c2VjcwogY2FsbGluZyAgaW5pdCsweDAvMHg2MCBAIDEKIGlu aXRjYWxsIGluaXQrMHgwLzB4NjAgcmV0dXJuZWQgMCBhZnRlciAyIHVzZWNzCiBjYWxsaW5nICBp bml0KzB4MC8weDlhIEAgMQogaW5pdGNhbGwgaW5pdCsweDAvMHg5YSByZXR1cm5lZCAwIGFmdGVy IDc0IHVzZWNzCgpGaXhlczogYmQyNWExNGVkYjc1ICgidXNiOiBnYWRnZXQ6IGxlZ2FjeS9zZXJp YWw6IGFsbG93IGR5bmFtaWMgcmVtb3ZhbCIpCkZpeGVzOiA3YmI1ZWE1NGJlNDcgKCJ1c2IgZ2Fk Z2V0IHNlcmlhbDogdXNlIGNvbXBvc2l0ZSBnYWRnZXQgZnJhbWV3b3JrIikKRml4ZXM6IDFkYTE3 N2U0YzNmNCAoIkxpbnV4LTIuNi4xMi1yYzIiKQpTaWduZWQtb2ZmLWJ5OiBSYW5keSBEdW5sYXAg PHJkdW5sYXBAaW5mcmFkZWFkLm9yZz4KQ2M6IEZlbGlwZSBCYWxiaSA8ZmVsaXBlLmJhbGJpQGxp bnV4LmludGVsLmNvbT4KQ2M6IE1pY2hhxYIgTWlyb3PFgmF3IDxtaXJxLWxpbnV4QHJlcmUucW1x bS5wbD4KQ2M6IEdyZWcgS3JvYWgtSGFydG1hbiA8Z3JlZ2toQGxpbnV4Zm91bmRhdGlvbi5vcmc+ CkNjOiBTZWJhc3RpYW4gQW5kcnplaiBTaWV3aW9yIDxiaWdlYXN5QGxpbnV0cm9uaXguZGU+CkNj OiBsaW51eC11c2JAdmdlci5rZXJuZWwub3JnCi0tLQogZHJpdmVycy91c2IvZ2FkZ2V0L2xlZ2Fj eS9pbm9kZS5jICB8ICAgIDggKysrKy0tLS0KIGRyaXZlcnMvdXNiL2dhZGdldC9sZWdhY3kvc2Vy aWFsLmMgfCAgIDEwICsrKysrLS0tLS0KIGRyaXZlcnMvdXNiL2dhZGdldC91ZGMvZHVtbXlfaGNk LmMgfCAgICA4ICsrKystLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDEzIGluc2VydGlvbnMoKyksIDEz IGRlbGV0aW9ucygtKQoKLS0tIGxueC01MTctcmM4Lm9yaWcvZHJpdmVycy91c2IvZ2FkZ2V0L2xl Z2FjeS9zZXJpYWwuYworKysgbG54LTUxNy1yYzgvZHJpdmVycy91c2IvZ2FkZ2V0L2xlZ2FjeS9z ZXJpYWwuYwpAQCAtMjczLDcgKzI3Myw3IEBAIHN0YXRpYyBzdHJ1Y3QgdXNiX2NvbXBvc2l0ZV9k cml2ZXIgZ3NlcmkKIHN0YXRpYyBpbnQgc3dpdGNoX2dzZXJpYWxfZW5hYmxlKGJvb2wgZG9fZW5h YmxlKQogewogCWlmICghc2VyaWFsX2NvbmZpZ19kcml2ZXIubGFiZWwpCi0JCS8qIGluaXQoKSB3 YXMgbm90IGNhbGxlZCwgeWV0ICovCisJCS8qIGdzZXJpYWxfaW5pdCgpIHdhcyBub3QgY2FsbGVk LCB5ZXQgKi8KIAkJcmV0dXJuIDA7CiAKIAlpZiAoZG9fZW5hYmxlKQpAQCAtMjgzLDcgKzI4Myw3 IEBAIHN0YXRpYyBpbnQgc3dpdGNoX2dzZXJpYWxfZW5hYmxlKGJvb2wgZG8KIAlyZXR1cm4gMDsK IH0KIAotc3RhdGljIGludCBfX2luaXQgaW5pdCh2b2lkKQorc3RhdGljIGludCBfX2luaXQgZ3Nl cmlhbF9pbml0KHZvaWQpCiB7CiAJLyogV2UgKmNvdWxkKiBleHBvcnQgdHdvIGNvbmZpZ3M7IHRo YXQnZCBiZSBtdWNoIGNsZWFuZXIuLi4KIAkgKiBidXQgbmVpdGhlciBvZiB0aGVzZSBwcm9kdWN0 IElEcyB3YXMgZGVmaW5lZCB0aGF0IHdheS4KQEAgLTMxNCwxMSArMzE0LDExIEBAIHN0YXRpYyBp bnQgX19pbml0IGluaXQodm9pZCkKIAogCXJldHVybiB1c2JfY29tcG9zaXRlX3Byb2JlKCZnc2Vy aWFsX2RyaXZlcik7CiB9Ci1tb2R1bGVfaW5pdChpbml0KTsKK21vZHVsZV9pbml0KGdzZXJpYWxf aW5pdCk7CiAKLXN0YXRpYyB2b2lkIF9fZXhpdCBjbGVhbnVwKHZvaWQpCitzdGF0aWMgdm9pZCBf X2V4aXQgZ3NlcmlhbF9jbGVhbnVwKHZvaWQpCiB7CiAJaWYgKGVuYWJsZSkKIAkJdXNiX2NvbXBv c2l0ZV91bnJlZ2lzdGVyKCZnc2VyaWFsX2RyaXZlcik7CiB9Ci1tb2R1bGVfZXhpdChjbGVhbnVw KTsKK21vZHVsZV9leGl0KGdzZXJpYWxfY2xlYW51cCk7Ci0tLSBsbngtNTE3LXJjOC5vcmlnL2Ry aXZlcnMvdXNiL2dhZGdldC91ZGMvZHVtbXlfaGNkLmMKKysrIGxueC01MTctcmM4L2RyaXZlcnMv dXNiL2dhZGdldC91ZGMvZHVtbXlfaGNkLmMKQEAgLTI3NjUsNyArMjc2NSw3IEBAIHN0YXRpYyBz dHJ1Y3QgcGxhdGZvcm1fZHJpdmVyIGR1bW15X2hjZF8KIHN0YXRpYyBzdHJ1Y3QgcGxhdGZvcm1f ZGV2aWNlICp0aGVfdWRjX3BkZXZbTUFYX05VTV9VRENdOwogc3RhdGljIHN0cnVjdCBwbGF0Zm9y bV9kZXZpY2UgKnRoZV9oY2RfcGRldltNQVhfTlVNX1VEQ107CiAKLXN0YXRpYyBpbnQgX19pbml0 IGluaXQodm9pZCkKK3N0YXRpYyBpbnQgX19pbml0IGR1bW15X2hjZF9pbml0KHZvaWQpCiB7CiAJ aW50CXJldHZhbCA9IC1FTk9NRU07CiAJaW50CWk7CkBAIC0yODg3LDkgKzI4ODcsOSBAQCBlcnJf YWxsb2NfdWRjOgogCQlwbGF0Zm9ybV9kZXZpY2VfcHV0KHRoZV9oY2RfcGRldltpXSk7CiAJcmV0 dXJuIHJldHZhbDsKIH0KLW1vZHVsZV9pbml0KGluaXQpOworbW9kdWxlX2luaXQoZHVtbXlfaGNk X2luaXQpOwogCi1zdGF0aWMgdm9pZCBfX2V4aXQgY2xlYW51cCh2b2lkKQorc3RhdGljIHZvaWQg X19leGl0IGR1bW15X2hjZF9jbGVhbnVwKHZvaWQpCiB7CiAJaW50IGk7CiAKQEAgLTI5MDUsNCAr MjkwNSw0IEBAIHN0YXRpYyB2b2lkIF9fZXhpdCBjbGVhbnVwKHZvaWQpCiAJcGxhdGZvcm1fZHJp dmVyX3VucmVnaXN0ZXIoJmR1bW15X3VkY19kcml2ZXIpOwogCXBsYXRmb3JtX2RyaXZlcl91bnJl Z2lzdGVyKCZkdW1teV9oY2RfZHJpdmVyKTsKIH0KLW1vZHVsZV9leGl0KGNsZWFudXApOworbW9k dWxlX2V4aXQoZHVtbXlfaGNkX2NsZWFudXApOwotLS0gbG54LTUxNy1yYzgub3JpZy9kcml2ZXJz L3VzYi9nYWRnZXQvbGVnYWN5L2lub2RlLmMKKysrIGxueC01MTctcmM4L2RyaXZlcnMvdXNiL2dh ZGdldC9sZWdhY3kvaW5vZGUuYwpAQCAtMjEwMSw3ICsyMTAxLDcgQEAgTU9EVUxFX0FMSUFTX0ZT KCJnYWRnZXRmcyIpOwogCiAvKi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0qLwogCi1zdGF0aWMgaW50IF9faW5pdCBp bml0ICh2b2lkKQorc3RhdGljIGludCBfX2luaXQgZ2FkZ2V0ZnNfaW5pdCAodm9pZCkKIHsKIAlp bnQgc3RhdHVzOwogCkBAIC0yMTExLDEyICsyMTExLDEyIEBAIHN0YXRpYyBpbnQgX19pbml0IGlu aXQgKHZvaWQpCiAJCQlzaG9ydG5hbWUsIGRyaXZlcl9kZXNjKTsKIAlyZXR1cm4gc3RhdHVzOwog fQotbW9kdWxlX2luaXQgKGluaXQpOworbW9kdWxlX2luaXQgKGdhZGdldGZzX2luaXQpOwogCi1z dGF0aWMgdm9pZCBfX2V4aXQgY2xlYW51cCAodm9pZCkKK3N0YXRpYyB2b2lkIF9fZXhpdCBnYWRn ZXRmc19jbGVhbnVwICh2b2lkKQogewogCXByX2RlYnVnICgidW5yZWdpc3RlciAlc1xuIiwgc2hv cnRuYW1lKTsKIAl1bnJlZ2lzdGVyX2ZpbGVzeXN0ZW0gKCZnYWRnZXRmc190eXBlKTsKIH0KLW1v ZHVsZV9leGl0IChjbGVhbnVwKTsKK21vZHVsZV9leGl0IChnYWRnZXRmc19jbGVhbnVwKTsKIApf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpWaXJ0dWFsaXph dGlvbiBtYWlsaW5nIGxpc3QKVmlydHVhbGl6YXRpb25AbGlzdHMubGludXgtZm91bmRhdGlvbi5v cmcKaHR0cHM6Ly9saXN0cy5saW51eGZvdW5kYXRpb24ub3JnL21haWxtYW4vbGlzdGluZm8vdmly dHVhbGl6YXRpb24= 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 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D5C9EC433F5 for ; Sun, 27 Mar 2022 07:44:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DA40910E036; Sun, 27 Mar 2022 07:44:03 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) by gabe.freedesktop.org (Postfix) with ESMTPS id D0F5210E9C9 for ; Wed, 16 Mar 2022 19:21:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: Content-Type:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc: To:From:Sender:Reply-To:Content-ID:Content-Description; bh=4Krw3MostSzdRmJotMI0a/aFHrz6hD4Rnz4KlkBsZsY=; b=oMmN0YOyCxbwsqUbjdCoYoeLS5 xwOMYvr9c6y0ZD0gLE9DMUnynweLItGGubfTLvG/AFTS8gDdpV6qbKOe2/SN3s2MVuCKG2ip8Mj1T daPYsOGmw7rRzY22M54r0qxbz7gAzmEjzHxFdcWBVn37bavK9d81on5K0p1gEE5WIrLXqWY8/fU6M s5P/mifVEcH7CseJqbey8V+DTjHnfTd9wcLrhUE4NbrJGroreYsn7JZe2n7d0wMy7AotAiFE9ZHGk 8JL0YSuhRL0OVQ5l3GWEQSBBUdGvXVahxlykI44NQpLaQo/Se64NnCywaP3JRAx3A9pSa/0AcvqOF CO5qvuzA==; Received: from [2601:1c0:6280:3f0::aa0b] (helo=bombadil.infradead.org) by bombadil.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1nUZC5-00EArp-Jb; Wed, 16 Mar 2022 19:20:25 +0000 From: Randy Dunlap To: linux-kernel@vger.kernel.org Date: Wed, 16 Mar 2022 12:20:07 -0700 Message-Id: <20220316192010.19001-7-rdunlap@infradead.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220316192010.19001-1-rdunlap@infradead.org> References: <20220316192010.19001-1-rdunlap@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Mailman-Approved-At: Sun, 27 Mar 2022 07:44:03 +0000 Subject: [Nouveau] [PATCH 6/9] usb: gadget: eliminate anonymous module_init & module_exit X-BeenThere: nouveau@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Nouveau development list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-usb@vger.kernel.org, Andy Lutomirski , "Michael S. Tsirkin" , Peter Zijlstra , nouveau@lists.freedesktop.org, Jason Wang , Dave Hansen , Valentina Manea , virtualization@lists.linux-foundation.org, Krzysztof Opasiak , Eli Cohen , netdev@vger.kernel.org, Shuah Khan , Thomas Gleixner , "H. Peter Anvin" , Arnd Bergmann , Leon Romanovsky , linux-rdma@vger.kernel.org, Ingo Molnar , Jozsef Kadlecsik , coreteam@netfilter.org, Jakub Kicinski , Sebastian Andrzej Siewior , Pablo Neira Ayuso , Joachim Fritschi , Felipe Balbi , Amit Shah , "James E.J. Bottomley" , Steven Rostedt , =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= , linux-block@vger.kernel.org, Pekka Paalanen , Borislav Petkov , Stefan Hajnoczi , Shuah Khan , Jussi Kivilinna , Herbert Xu , Jens Axboe , x86@kernel.org, linux-scsi@vger.kernel.org, "Martin K. Petersen" , Greg Kroah-Hartman , Randy Dunlap , Florian Westphal , netfilter-devel@vger.kernel.org, linux-crypto@vger.kernel.org, Igor Kotrasinski , Paolo Bonzini , Saeed Mahameed , "David S. Miller" Errors-To: nouveau-bounces@lists.freedesktop.org Sender: "Nouveau" Eliminate anonymous module_init() and module_exit(), which can lead to confusion or ambiguity when reading System.map, crashes/oops/bugs, or an initcall_debug log. Give each of these init and exit functions unique driver-specific names to eliminate the anonymous names. Example 1: (System.map) ffffffff832fc78c t init ffffffff832fc79e t init ffffffff832fc8f8 t init Example 2: (initcall_debug log) calling init+0x0/0x12 @ 1 initcall init+0x0/0x12 returned 0 after 15 usecs calling init+0x0/0x60 @ 1 initcall init+0x0/0x60 returned 0 after 2 usecs calling init+0x0/0x9a @ 1 initcall init+0x0/0x9a returned 0 after 74 usecs Fixes: bd25a14edb75 ("usb: gadget: legacy/serial: allow dynamic removal") Fixes: 7bb5ea54be47 ("usb gadget serial: use composite gadget framework") Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Randy Dunlap Cc: Felipe Balbi Cc: Michał Mirosław Cc: Greg Kroah-Hartman Cc: Sebastian Andrzej Siewior Cc: linux-usb@vger.kernel.org --- drivers/usb/gadget/legacy/inode.c | 8 ++++---- drivers/usb/gadget/legacy/serial.c | 10 +++++----- drivers/usb/gadget/udc/dummy_hcd.c | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) --- lnx-517-rc8.orig/drivers/usb/gadget/legacy/serial.c +++ lnx-517-rc8/drivers/usb/gadget/legacy/serial.c @@ -273,7 +273,7 @@ static struct usb_composite_driver gseri static int switch_gserial_enable(bool do_enable) { if (!serial_config_driver.label) - /* init() was not called, yet */ + /* gserial_init() was not called, yet */ return 0; if (do_enable) @@ -283,7 +283,7 @@ static int switch_gserial_enable(bool do return 0; } -static int __init init(void) +static int __init gserial_init(void) { /* We *could* export two configs; that'd be much cleaner... * but neither of these product IDs was defined that way. @@ -314,11 +314,11 @@ static int __init init(void) return usb_composite_probe(&gserial_driver); } -module_init(init); +module_init(gserial_init); -static void __exit cleanup(void) +static void __exit gserial_cleanup(void) { if (enable) usb_composite_unregister(&gserial_driver); } -module_exit(cleanup); +module_exit(gserial_cleanup); --- lnx-517-rc8.orig/drivers/usb/gadget/udc/dummy_hcd.c +++ lnx-517-rc8/drivers/usb/gadget/udc/dummy_hcd.c @@ -2765,7 +2765,7 @@ static struct platform_driver dummy_hcd_ static struct platform_device *the_udc_pdev[MAX_NUM_UDC]; static struct platform_device *the_hcd_pdev[MAX_NUM_UDC]; -static int __init init(void) +static int __init dummy_hcd_init(void) { int retval = -ENOMEM; int i; @@ -2887,9 +2887,9 @@ err_alloc_udc: platform_device_put(the_hcd_pdev[i]); return retval; } -module_init(init); +module_init(dummy_hcd_init); -static void __exit cleanup(void) +static void __exit dummy_hcd_cleanup(void) { int i; @@ -2905,4 +2905,4 @@ static void __exit cleanup(void) platform_driver_unregister(&dummy_udc_driver); platform_driver_unregister(&dummy_hcd_driver); } -module_exit(cleanup); +module_exit(dummy_hcd_cleanup); --- lnx-517-rc8.orig/drivers/usb/gadget/legacy/inode.c +++ lnx-517-rc8/drivers/usb/gadget/legacy/inode.c @@ -2101,7 +2101,7 @@ MODULE_ALIAS_FS("gadgetfs"); /*----------------------------------------------------------------------*/ -static int __init init (void) +static int __init gadgetfs_init (void) { int status; @@ -2111,12 +2111,12 @@ static int __init init (void) shortname, driver_desc); return status; } -module_init (init); +module_init (gadgetfs_init); -static void __exit cleanup (void) +static void __exit gadgetfs_cleanup (void) { pr_debug ("unregister %s\n", shortname); unregister_filesystem (&gadgetfs_type); } -module_exit (cleanup); +module_exit (gadgetfs_cleanup);