From nobody Thu Sep 11 12:08:05 2025 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 B98CEC6FD1D for ; Mon, 20 Mar 2023 03:20:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229959AbjCTDUU (ORCPT ); Sun, 19 Mar 2023 23:20:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47220 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229848AbjCTDT7 (ORCPT ); Sun, 19 Mar 2023 23:19:59 -0400 Received: from mailout4.samsung.com (mailout4.samsung.com [203.254.224.34]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3E8DF168BF for ; Sun, 19 Mar 2023 20:19:52 -0700 (PDT) Received: from epcas1p4.samsung.com (unknown [182.195.41.48]) by mailout4.samsung.com (KnoxPortal) with ESMTP id 20230320031950epoutp0444293e5625c1cda210ac40332ebf86ed~OAm-TQzng0263502635epoutp04r for ; Mon, 20 Mar 2023 03:19:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout4.samsung.com 20230320031950epoutp0444293e5625c1cda210ac40332ebf86ed~OAm-TQzng0263502635epoutp04r DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1679282390; bh=xrEvdUuMxzcMej7Qy4wHwy7MJJB2yIz5OFPTHnqfDbQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aMBKWwvuWQ8lHWV2h7iR3V5PkQGPHnG2Bkq94TZB8VK4c472GJx+C0I+aQSvTvG8E eb1A7ZMjJhXkpNUcsvTtYMlH3j99rTHKjJp4p/E+VKh/78/w4J1sZHtqMpAJE6KtPF YegcOEuv7/ugIHrLbimQTGbNLoBocf+LrEOrOadM= Received: from epsnrtp1.localdomain (unknown [182.195.42.162]) by epcas1p3.samsung.com (KnoxPortal) with ESMTP id 20230320031949epcas1p3d7e1ab45cf4ac8f1ebf2f059aa4c683b~OAm_12Vgv0336603366epcas1p3K; Mon, 20 Mar 2023 03:19:49 +0000 (GMT) Received: from epsmges1p3.samsung.com (unknown [182.195.36.227]) by epsnrtp1.localdomain (Postfix) with ESMTP id 4Pg0N46nsFz4x9Pv; Mon, 20 Mar 2023 03:19:48 +0000 (GMT) Received: from epcas1p4.samsung.com ( [182.195.41.48]) by epsmges1p3.samsung.com (Symantec Messaging Gateway) with SMTP id 1C.1B.52037.4D0D7146; Mon, 20 Mar 2023 12:19:48 +0900 (KST) Received: from epsmtrp2.samsung.com (unknown [182.195.40.14]) by epcas1p3.samsung.com (KnoxPortal) with ESMTPA id 20230320031947epcas1p370cac9b65ba7267554e3c342a858bb43~OAm877k5t0336603366epcas1p3B; Mon, 20 Mar 2023 03:19:47 +0000 (GMT) Received: from epsmgms1p1new.samsung.com (unknown [182.195.42.41]) by epsmtrp2.samsung.com (KnoxPortal) with ESMTP id 20230320031947epsmtrp2f666b0a47491b133d15e26d15300c01c~OAm86FZSU1098210982epsmtrp2M; Mon, 20 Mar 2023 03:19:47 +0000 (GMT) X-AuditID: b6c32a37-7cbfd7000001cb45-c6-6417d0d4da40 Received: from epsmtip1.samsung.com ( [182.195.34.30]) by epsmgms1p1new.samsung.com (Symantec Messaging Gateway) with SMTP id 99.58.18071.3D0D7146; Mon, 20 Mar 2023 12:19:47 +0900 (KST) Received: from VDBS1418.vd.sec.samsung.net (unknown [168.219.244.30]) by epsmtip1.samsung.com (KnoxPortal) with ESMTPA id 20230320031947epsmtip155b824429a4144296d81064ca9b171a4~OAm8xsBqw1384113841epsmtip1u; Mon, 20 Mar 2023 03:19:47 +0000 (GMT) From: Bumwoo Lee To: MyungJoo Ham , Chanwoo Choi , linux-kernel@vger.kernel.org Cc: Bumwoo Lee Subject: [PATCH v5 1/3] extcon: Add extcon_alloc_cables to simplify extcon register function Date: Mon, 20 Mar 2023 12:19:37 +0900 Message-Id: <20230320031939.28862-2-bw365.lee@samsung.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230320031939.28862-1-bw365.lee@samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrNKsWRmVeSWpSXmKPExsWy7bCmge6VC+IpBp/Xs1mcWLOIyeL6l+es Fpd3zWGzuN24gs2BxaNvyypGj8+b5AKYorJtMlITU1KLFFLzkvNTMvPSbZW8g+Od403NDAx1 DS0tzJUU8hJzU22VXHwCdN0yc4AWKSmUJeaUAoUCEouLlfTtbIryS0tSFTLyi0tslVILUnIK zAr0ihNzi0vz0vXyUkusDA0MjEyBChOyM96vechS0K9QsebIXPYGxpeSXYycHBICJhJ33l1m 72Lk4hAS2MEo8e7gQSYI5xOjxI0vaxghnG+MEre//mOGaZk68xJUYi+jRNOUHqj+X4wS8zr6 GUGq2AQ0JPZcbGDrYuTgEBEolDjcnw0SZhZQk3iwaiM7iC0sECfx/d03VhCbRUBV4tq+pywg 5bwCVhLfZslB7JKX6P73hwXE5hSwlrh4/BPYdF4BQYmTM5+wQIyUl2jeOpsZ5AQJgV3sEpcm dDNCNLtI/Fp0mh3CFpZ4dXwLlC0l8fndXjYIO11i5ZU7UPEcidf326F6jSXevV3LDHIPs4Cm xPpd+hBhRYmdv+cyQuzlk3j3tYcVpERCgFeio00IokRZovvBCyYIW1Ji8dM7jBAlHhIrzoID XUigj1Fi1RHnCYwKs5A8MwvJM7MQ9i5gZF7FKJZaUJybnlpsWGAMj97k/NxNjOBUp2W+g3Ha 2w96hxiZOBgPMUpwMCuJ8PotEE0R4k1JrKxKLcqPLyrNSS0+xGgKDOmJzFKiyfnAZJtXEm9o YmlgYmZkYmFsaWymJM4rbnsyWUggPbEkNTs1tSC1CKaPiYNTqoHp2OeX24pOJPQHP89Z/M46 dIGXwsLTeVadO+eprw2fd9u1+O1kfrY3R4ILWgzWMBTXdkf3KGoq3ph5huXJpyDRa36ZbnJz 1F6zbMqpzU2T3F4j/oP1Vj2rxHvt2UzxMXymG7IVYv2d1pVdeeld+XnuQjvfTR84FU25visH +Yc+Lpl/R6R4696a0GcbDmmUP2hL3Hsjarfv8hMzklM2pZp87hCfcJ61wq7kDvuScOUAKeEk yfqrz7JLN2S83VbufKfLT+PBxJSILwobVNUjDnjO2n5j/lHbHwd46+b4ahQ/sRHhSi1hSPr7 sjupcU5kIlf+nOVdWoIf/2u5/Uw7Imalcr5Jeq5UwAyG84XG+UosxRmJhlrMRcWJAFnJfjb+ AwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrGLMWRmVeSWpSXmKPExsWy7bCSnO7lC+IpBi+/6FicWLOIyeL6l+es Fpd3zWGzuN24gs2BxaNvyypGj8+b5AKYorhsUlJzMstSi/TtErgy3q95yFLQr1Cx5shc9gbG l5JdjJwcEgImElNnXmLsYuTiEBLYzSgxo/MJC0RCUuLs8kfsXYwcQLawxOHDxRA1Pxgl3l85 wA5SwyagIbHnYgMbiC0iUCxx4cBisF5mATWJB6s2gtUIC8RILF91CayGRUBV4tq+pywgM3kF rCS+zZKDWCUv0f3vD1grp4C1xMXjnxhBSoSASn73Z4CEeQUEJU7OfAI1XV6ieets5gmMArOQ pGYhSS1gZFrFKJlaUJybnltsWGCYl1quV5yYW1yal66XnJ+7iREclFqaOxi3r/qgd4iRiYPx EKMEB7OSCK/fAtEUId6UxMqq1KL8+KLSnNTiQ4zSHCxK4rwXuk7GCwmkJ5akZqemFqQWwWSZ ODilGpi6th7WCzzA5FbcdonNavuZX/F66ref1DeI9r3M1/t2O63511/Dt9Gej9iWOO52YS57 5ezjGlnV2OZTcmyVbcTClDcC/G/9rI7FRWyNf85beivC8mevcjFj9e3lgS2Bn5cm1sq6bZuy YXf3uzu5VsVz2eKbhTuTH9xpDPtm6eq32WSvhKyOeLZM+H6X9rK/zyd7p5rOvyerwHwgK3TV 3xj+yPhtV2+sKbLmSGmZ5GemtG33Ar9+wfM2kRVZoty8J25vc1pzxmPZw7qLN84GyUXLei+4 cU91Z7mqurzTNcn6w6Zl127uKPWaIHgu31Hp8hP21inrFyztOPw/V8oqT+6fxNJUM0PD7q6f +9crK7EUZyQaajEXFScCAPFGm325AgAA X-CMS-MailID: 20230320031947epcas1p370cac9b65ba7267554e3c342a858bb43 X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-Sendblock-Type: SVC_REQ_APPROVE CMS-TYPE: 101P DLP-Filter: Pass X-CFilter-Loop: Reflected X-CMS-RootMailID: 20230320031947epcas1p370cac9b65ba7267554e3c342a858bb43 References: <20230320031939.28862-1-bw365.lee@samsung.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The cable allocation part is functionalized from extcon_dev_register. Signed-off-by: Bumwoo Lee --- drivers/extcon/extcon.c | 111 +++++++++++++++++++++++----------------- 1 file changed, 65 insertions(+), 46 deletions(-) diff --git a/drivers/extcon/extcon.c b/drivers/extcon/extcon.c index adcf01132f70..402d674e2896 100644 --- a/drivers/extcon/extcon.c +++ b/drivers/extcon/extcon.c @@ -1070,6 +1070,66 @@ void extcon_dev_free(struct extcon_dev *edev) } EXPORT_SYMBOL_GPL(extcon_dev_free); =20 +/** + * extcon_alloc_cables() - alloc the cables for extcon device + * @edev: extcon device which has cables + * + * Returns 0 if success or error number if fail. + */ +static int extcon_alloc_cables(struct extcon_dev *edev) +{ + int index; + char *str; + struct extcon_cable *cable; + + if (!edev) + return -EINVAL; + + if (!edev->max_supported) + return 0; + + edev->cables =3D kcalloc(edev->max_supported, + sizeof(struct extcon_cable), + GFP_KERNEL); + if (!edev->cables) + return -ENOMEM; + + for (index =3D 0; index < edev->max_supported; index++) { + cable =3D &edev->cables[index]; + + str =3D kasprintf(GFP_KERNEL, "cable.%d", index); + if (!str) { + for (index--; index >=3D 0; index--) { + cable =3D &edev->cables[index]; + kfree(cable->attr_g.name); + } + + kfree(edev->cables); + return -ENOMEM; + } + + cable->edev =3D edev; + cable->cable_index =3D index; + cable->attrs[0] =3D &cable->attr_name.attr; + cable->attrs[1] =3D &cable->attr_state.attr; + cable->attrs[2] =3D NULL; + cable->attr_g.name =3D str; + cable->attr_g.attrs =3D cable->attrs; + + sysfs_attr_init(&cable->attr_name.attr); + cable->attr_name.attr.name =3D "name"; + cable->attr_name.attr.mode =3D 0444; + cable->attr_name.show =3D cable_name_show; + + sysfs_attr_init(&cable->attr_state.attr); + cable->attr_state.attr.name =3D "state"; + cable->attr_state.attr.mode =3D 0444; + cable->attr_state.show =3D cable_state_show; + } + + return 0; +} + /** * extcon_dev_register() - Register an new extcon device * @edev: the extcon device to be registered @@ -1117,50 +1177,9 @@ int extcon_dev_register(struct extcon_dev *edev) dev_set_name(&edev->dev, "extcon%lu", (unsigned long)atomic_inc_return(&edev_no)); =20 - if (edev->max_supported) { - char *str; - struct extcon_cable *cable; - - edev->cables =3D kcalloc(edev->max_supported, - sizeof(struct extcon_cable), - GFP_KERNEL); - if (!edev->cables) { - ret =3D -ENOMEM; - goto err_sysfs_alloc; - } - for (index =3D 0; index < edev->max_supported; index++) { - cable =3D &edev->cables[index]; - - str =3D kasprintf(GFP_KERNEL, "cable.%d", index); - if (!str) { - for (index--; index >=3D 0; index--) { - cable =3D &edev->cables[index]; - kfree(cable->attr_g.name); - } - ret =3D -ENOMEM; - - goto err_alloc_cables; - } - - cable->edev =3D edev; - cable->cable_index =3D index; - cable->attrs[0] =3D &cable->attr_name.attr; - cable->attrs[1] =3D &cable->attr_state.attr; - cable->attrs[2] =3D NULL; - cable->attr_g.name =3D str; - cable->attr_g.attrs =3D cable->attrs; - - sysfs_attr_init(&cable->attr_name.attr); - cable->attr_name.attr.name =3D "name"; - cable->attr_name.attr.mode =3D 0444; - cable->attr_name.show =3D cable_name_show; - - sysfs_attr_init(&cable->attr_state.attr); - cable->attr_state.attr.name =3D "state"; - cable->attr_state.attr.mode =3D 0444; - cable->attr_state.show =3D cable_state_show; - } - } + ret =3D extcon_alloc_cables(edev); + if (ret < 0) + goto err_alloc_cables; =20 if (edev->max_supported && edev->mutually_exclusive) { char *name; @@ -1279,10 +1298,10 @@ int extcon_dev_register(struct extcon_dev *edev) err_muex: for (index =3D 0; index < edev->max_supported; index++) kfree(edev->cables[index].attr_g.name); -err_alloc_cables: if (edev->max_supported) kfree(edev->cables); -err_sysfs_alloc: +err_alloc_cables: + return ret; } EXPORT_SYMBOL_GPL(extcon_dev_register); --=20 2.35.1 From nobody Thu Sep 11 12:08:05 2025 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 C59A0C7618A for ; Mon, 20 Mar 2023 03:20:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229945AbjCTDUJ (ORCPT ); Sun, 19 Mar 2023 23:20:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47186 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229964AbjCTDT5 (ORCPT ); Sun, 19 Mar 2023 23:19:57 -0400 Received: from mailout3.samsung.com (mailout3.samsung.com [203.254.224.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 29484168B5 for ; Sun, 19 Mar 2023 20:19:51 -0700 (PDT) Received: from epcas1p1.samsung.com (unknown [182.195.41.45]) by mailout3.samsung.com (KnoxPortal) with ESMTP id 20230320031949epoutp03d31f8c720fe5d63242f19522a21d3542~OAm_ZEGDy1277912779epoutp03c for ; Mon, 20 Mar 2023 03:19:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout3.samsung.com 20230320031949epoutp03d31f8c720fe5d63242f19522a21d3542~OAm_ZEGDy1277912779epoutp03c DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1679282389; bh=v/ZddSulWTEJ8HQ/jkuFUPRKQ6i17lFyLtrKLMjI/ko=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vO61vWmH33Ol8W7wH3BsxThGudNjMgyssAhzqYkCpOlK1V6BraN5A1v1Q5JhA1OKq KNpL0H9tYbHk9J8nYvWCFucmtmk2Kg8lWTbZ7fFldPIovRuf+ud6mlKkTOD5BKwlx7 Mvzdkhn2c4+OTp5PQcn01MJmb0HeaVXePAXyBA9o= Received: from epsnrtp1.localdomain (unknown [182.195.42.162]) by epcas1p4.samsung.com (KnoxPortal) with ESMTP id 20230320031949epcas1p4460142fb245b8ff91b3751df2ff4d938~OAm_KqP9F1698116981epcas1p4D; Mon, 20 Mar 2023 03:19:49 +0000 (GMT) Received: from epsmges1p1.samsung.com (unknown [182.195.38.247]) by epsnrtp1.localdomain (Postfix) with ESMTP id 4Pg0N41CZVz4x9Q7; Mon, 20 Mar 2023 03:19:48 +0000 (GMT) Received: from epcas1p3.samsung.com ( [182.195.41.47]) by epsmges1p1.samsung.com (Symantec Messaging Gateway) with SMTP id 4B.7B.55531.4D0D7146; Mon, 20 Mar 2023 12:19:48 +0900 (KST) Received: from epsmtrp2.samsung.com (unknown [182.195.40.14]) by epcas1p4.samsung.com (KnoxPortal) with ESMTPA id 20230320031947epcas1p4e2a38d0d56cec1bca48e46e1130fe8db~OAm87HozU1698116981epcas1p4z; Mon, 20 Mar 2023 03:19:47 +0000 (GMT) Received: from epsmgms1p1new.samsung.com (unknown [182.195.42.41]) by epsmtrp2.samsung.com (KnoxPortal) with ESMTP id 20230320031947epsmtrp2fa3c576bf7a9aaf2777ec8927f88e4b9~OAm86X0Qn1098210982epsmtrp2N; Mon, 20 Mar 2023 03:19:47 +0000 (GMT) X-AuditID: b6c32a35-d9fff7000000d8eb-19-6417d0d41cb4 Received: from epsmtip1.samsung.com ( [182.195.34.30]) by epsmgms1p1new.samsung.com (Symantec Messaging Gateway) with SMTP id A9.58.18071.3D0D7146; Mon, 20 Mar 2023 12:19:47 +0900 (KST) Received: from VDBS1418.vd.sec.samsung.net (unknown [168.219.244.30]) by epsmtip1.samsung.com (KnoxPortal) with ESMTPA id 20230320031947epsmtip15b49070f7630e474e364ddfd751bc29b~OAm8zaLDz1384813848epsmtip1x; Mon, 20 Mar 2023 03:19:47 +0000 (GMT) From: Bumwoo Lee To: MyungJoo Ham , Chanwoo Choi , linux-kernel@vger.kernel.org Cc: Bumwoo Lee Subject: [PATCH v5 2/3] extcon: Add extcon_alloc_muex to simplify extcon register function Date: Mon, 20 Mar 2023 12:19:38 +0900 Message-Id: <20230320031939.28862-3-bw365.lee@samsung.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230320031939.28862-1-bw365.lee@samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrLKsWRmVeSWpSXmKPExsWy7bCmvu6VC+IpBkc62S1OrFnEZHH9y3NW i8u75rBZ3G5cwebA4tG3ZRWjx+dNcgFMUdk2GamJKalFCql5yfkpmXnptkrewfHO8aZmBoa6 hpYW5koKeYm5qbZKLj4Bum6ZOUCLlBTKEnNKgUIBicXFSvp2NkX5pSWpChn5xSW2SqkFKTkF ZgV6xYm5xaV56Xp5qSVWhgYGRqZAhQnZGdP3LmUpOCVfMXXXJOYGxkmSXYycHBICJhJzTm1k 6WLk4hAS2MEocXzbcUYI5xOjxLKtu5kgnG+MEjumfGKFaXlz9SIzRGIvo8Tp+WugnF+MEr9P 7GYDqWIT0JDYc7EByObgEBEolDjcnw0SZhZQk3iwaiM7iC0sECPx4UcvI0gJi4CqxO2pYCfx ClhJPFl3kwVil7xE978/YDangLXExeOfGCFqBCVOznzCAjFSXqJ562ywEyQEdrFLzL77kRmi 2UWi+/87qKOFJV4d38IOYUtJfH63lw3CTpdYeeUOVDxH4vX9dkYI21ji3du1zCC3MQtoSqzf pQ8RVpTY+XsuI8RePol3X3tYQUokBHglOtqEIEqUJbofvGCCsCUlFj+9AzXRQ2L9rHXQwO1j lJh2+T3LBEaFWUjemYXknVkImxcwMq9iFEstKM5NTy02LDCER3Byfu4mRnC60zLdwTjx7Qe9 Q4xMHIyHGCU4mJVEeP0WiKYI8aYkVlalFuXHF5XmpBYfYjQFhvVEZinR5Hxgws0riTc0sTQw MTMysTC2NDZTEucVtz2ZLCSQnliSmp2aWpBaBNPHxMEp1cCUXt/6cZXANOcpRZ4dO+ac3nfY r/pGf6zQyxfT1++8XRd5flOFI3dI3SZHpSPtq+bXKx9d4nRx5Tkm3o8PauN6/Xy9Fk4yF41e /fH9Jc5nOxW/GW76vu4y09564TaDl+7RW9w3/hM60Ltfu7esWXGtiN6JRZ7J/n23irf+iNiy 0eW0xcVP83Yty2i43a4R/EOK64ZHVP3NRyUx9lyW0s7Ltkw6esIr//u9+KqHmzjb1hXqWTH9 kf8wlTnvQpuc3JxVLZtv/XnUdG3l1Vf2zhf0nTjklrEp2hxf12JmVGrIx9TsG8MeUye/u/SF D8/eTbfl2iQF3j87WjCPX22tw69w37zEv6XdTJxL35wx9slSYinOSDTUYi4qTgQA1acs4gAE AAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrGLMWRmVeSWpSXmKPExsWy7bCSnO7lC+IpBlOP6FmcWLOIyeL6l+es Fpd3zWGzuN24gs2BxaNvyypGj8+b5AKYorhsUlJzMstSi/TtErgypu9dylJwSr5i6q5JzA2M kyS7GDk5JARMJN5cvcjcxcjFISSwm1HiwYQFbBAJSYmzyx+xdzFyANnCEocPF0PU/GCUuPpy BSNIDZuAhsSeiw1g9SICxRIXDixmAbGZBdQkHqzayA5iCwtESUy6PoMFZA6LgKrE7alge3kF rCSerLvJArFKXqL73x8wm1PAWuLi8U+MIOVCQDW/+zMgygUlTs58AjVdXqJ562zmCYwCs5Ck ZiFJLWBkWsUomVpQnJueW2xYYJiXWq5XnJhbXJqXrpecn7uJERyUWpo7GLev+qB3iJGJg/EQ owQHs5IIr98C0RQh3pTEyqrUovz4otKc1OJDjNIcLErivBe6TsYLCaQnlqRmp6YWpBbBZJk4 OKUamOqyS2/laWqy7V1wNObc/WSeqREd96ZtbY96F9FW/Us1+laF5w/71lvylZEzThRKlIU2 8q1qOBz58px4nmRPQOefgvJlTzbPXXBoIYOXvaSCFNOFm2sfzyyurI3eWqdTeUzl4Or8x0Hx O13PR8UuiGrZVFescW1/jpXEWXam5hOsOgzpOW9bTmqYXf1+4sryT67RQb27pE119/REaRpY Ltdh7a3cYbtwV0jdPz+VTbai2q3se937OcwWqQUctb7bdys9pub+lTWnXxUlsQesFJ+TUd9S KpJu8ndlausn3g17Fjg6daQGqeQ4Rnjczl1zpuXRiYd+V9ct+7LoX9err6cibt0+9SuaLb/l jlSuEktxRqKhFnNRcSIAnuqZULkCAAA= X-CMS-MailID: 20230320031947epcas1p4e2a38d0d56cec1bca48e46e1130fe8db X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-Sendblock-Type: SVC_REQ_APPROVE CMS-TYPE: 101P DLP-Filter: Pass X-CFilter-Loop: Reflected X-CMS-RootMailID: 20230320031947epcas1p4e2a38d0d56cec1bca48e46e1130fe8db References: <20230320031939.28862-1-bw365.lee@samsung.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The mutual exclusive part is functionalized from extcon_dev_register. Signed-off-by: Bumwoo Lee --- drivers/extcon/extcon.c | 109 ++++++++++++++++++++++------------------ 1 file changed, 61 insertions(+), 48 deletions(-) diff --git a/drivers/extcon/extcon.c b/drivers/extcon/extcon.c index 402d674e2896..86290afa35fb 100644 --- a/drivers/extcon/extcon.c +++ b/drivers/extcon/extcon.c @@ -1130,6 +1130,63 @@ static int extcon_alloc_cables(struct extcon_dev *ed= ev) return 0; } =20 +/** + * extcon_alloc_muex() - alloc the mutual exclusive for extcon device + * @edev: extcon device + * + * Returns 0 if success or error number if fail. + */ +static int extcon_alloc_muex(struct extcon_dev *edev) +{ + char *name; + int index; + + if (!edev) + return -EINVAL; + + if (!(edev->max_supported && edev->mutually_exclusive)) + return 0; + + /* Count the size of mutually_exclusive array */ + for (index =3D 0; edev->mutually_exclusive[index]; index++) + ; + + edev->attrs_muex =3D kcalloc(index + 1, + sizeof(struct attribute *), + GFP_KERNEL); + if (!edev->attrs_muex) + return -ENOMEM; + + edev->d_attrs_muex =3D kcalloc(index, + sizeof(struct device_attribute), + GFP_KERNEL); + if (!edev->d_attrs_muex) { + kfree(edev->attrs_muex); + return -ENOMEM; + } + + for (index =3D 0; edev->mutually_exclusive[index]; index++) { + name =3D kasprintf(GFP_KERNEL, "0x%x", + edev->mutually_exclusive[index]); + if (!name) { + for (index--; index >=3D 0; index--) + kfree(edev->d_attrs_muex[index].attr.name); + + kfree(edev->d_attrs_muex); + kfree(edev->attrs_muex); + return -ENOMEM; + } + sysfs_attr_init(&edev->d_attrs_muex[index].attr); + edev->d_attrs_muex[index].attr.name =3D name; + edev->d_attrs_muex[index].attr.mode =3D 0000; + edev->attrs_muex[index] =3D &edev->d_attrs_muex[index].attr; + } + edev->attr_g_muex.name =3D muex_name; + edev->attr_g_muex.attrs =3D edev->attrs_muex; + + return 0; +} + /** * extcon_dev_register() - Register an new extcon device * @edev: the extcon device to be registered @@ -1181,53 +1238,9 @@ int extcon_dev_register(struct extcon_dev *edev) if (ret < 0) goto err_alloc_cables; =20 - if (edev->max_supported && edev->mutually_exclusive) { - char *name; - - /* Count the size of mutually_exclusive array */ - for (index =3D 0; edev->mutually_exclusive[index]; index++) - ; - - edev->attrs_muex =3D kcalloc(index + 1, - sizeof(struct attribute *), - GFP_KERNEL); - if (!edev->attrs_muex) { - ret =3D -ENOMEM; - goto err_muex; - } - - edev->d_attrs_muex =3D kcalloc(index, - sizeof(struct device_attribute), - GFP_KERNEL); - if (!edev->d_attrs_muex) { - ret =3D -ENOMEM; - kfree(edev->attrs_muex); - goto err_muex; - } - - for (index =3D 0; edev->mutually_exclusive[index]; index++) { - name =3D kasprintf(GFP_KERNEL, "0x%x", - edev->mutually_exclusive[index]); - if (!name) { - for (index--; index >=3D 0; index--) { - kfree(edev->d_attrs_muex[index].attr. - name); - } - kfree(edev->d_attrs_muex); - kfree(edev->attrs_muex); - ret =3D -ENOMEM; - goto err_muex; - } - sysfs_attr_init(&edev->d_attrs_muex[index].attr); - edev->d_attrs_muex[index].attr.name =3D name; - edev->d_attrs_muex[index].attr.mode =3D 0000; - edev->attrs_muex[index] =3D &edev->d_attrs_muex[index] - .attr; - } - edev->attr_g_muex.name =3D muex_name; - edev->attr_g_muex.attrs =3D edev->attrs_muex; - - } + ret =3D extcon_alloc_muex(edev); + if (ret < 0) + goto err_alloc_muex; =20 if (edev->max_supported) { edev->extcon_dev_type.groups =3D @@ -1295,7 +1308,7 @@ int extcon_dev_register(struct extcon_dev *edev) kfree(edev->d_attrs_muex); kfree(edev->attrs_muex); } -err_muex: +err_alloc_muex: for (index =3D 0; index < edev->max_supported; index++) kfree(edev->cables[index].attr_g.name); if (edev->max_supported) --=20 2.35.1 From nobody Thu Sep 11 12:08:05 2025 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 246FFC6FD1D for ; Mon, 20 Mar 2023 03:20:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229966AbjCTDUP (ORCPT ); Sun, 19 Mar 2023 23:20:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47218 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229842AbjCTDT7 (ORCPT ); Sun, 19 Mar 2023 23:19:59 -0400 Received: from mailout1.samsung.com (mailout1.samsung.com [203.254.224.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CDD96168BD for ; Sun, 19 Mar 2023 20:19:51 -0700 (PDT) Received: from epcas1p4.samsung.com (unknown [182.195.41.48]) by mailout1.samsung.com (KnoxPortal) with ESMTP id 20230320031949epoutp011432e2dc172844f49259850a762b9b31~OAm_OnroK2587325873epoutp01Y for ; Mon, 20 Mar 2023 03:19:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.samsung.com 20230320031949epoutp011432e2dc172844f49259850a762b9b31~OAm_OnroK2587325873epoutp01Y DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1679282389; bh=n8qYCuhn70pfO+KBPCeDayPqzV8taksYowQoEHyjQh0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IThrBbDbNmoMsgu6yLv5ZIiI4iJCw6PM9EANn+q93MVftH24NowQe4MAZQ7PF93t9 1ja+RQyBQfuh3N6fCSbZgxeZ1iq9tFObiJ1KVbO1z1J69RswyhbarBTzAhF5X4oPSw H0Ny69CdMeNiDVhV0zTJVZ5FwAJERBkZPzx5nOiU= Received: from epsnrtp1.localdomain (unknown [182.195.42.162]) by epcas1p4.samsung.com (KnoxPortal) with ESMTP id 20230320031948epcas1p4a1adcae9c3a55962318ae0b9d52b3316~OAm99MBQh1698116981epcas1p4A; Mon, 20 Mar 2023 03:19:48 +0000 (GMT) Received: from epsmges1p1.samsung.com (unknown [182.195.36.223]) by epsnrtp1.localdomain (Postfix) with ESMTP id 4Pg0N41CH2z4x9Q5; Mon, 20 Mar 2023 03:19:48 +0000 (GMT) Received: from epcas1p4.samsung.com ( [182.195.41.48]) by epsmges1p1.samsung.com (Symantec Messaging Gateway) with SMTP id 3B.7B.55531.4D0D7146; Mon, 20 Mar 2023 12:19:48 +0900 (KST) Received: from epsmtrp1.samsung.com (unknown [182.195.40.13]) by epcas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230320031947epcas1p17117b8bc458903348e9b29061d00b343~OAm8-GNYq2336023360epcas1p1g; Mon, 20 Mar 2023 03:19:47 +0000 (GMT) Received: from epsmgms1p1new.samsung.com (unknown [182.195.42.41]) by epsmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230320031947epsmtrp19c14567f6ce0d20c6d1caae174f0bf6a~OAm8_b6ik2582625826epsmtrp1j; Mon, 20 Mar 2023 03:19:47 +0000 (GMT) X-AuditID: b6c32a35-00ffd7000000d8eb-18-6417d0d47965 Received: from epsmtip1.samsung.com ( [182.195.34.30]) by epsmgms1p1new.samsung.com (Symantec Messaging Gateway) with SMTP id F9.58.18071.3D0D7146; Mon, 20 Mar 2023 12:19:47 +0900 (KST) Received: from VDBS1418.vd.sec.samsung.net (unknown [168.219.244.30]) by epsmtip1.samsung.com (KnoxPortal) with ESMTPA id 20230320031947epsmtip119eea3f84b8bbcb5a90fa04cb0ceb533~OAm81HF6S1384113841epsmtip1v; Mon, 20 Mar 2023 03:19:47 +0000 (GMT) From: Bumwoo Lee To: MyungJoo Ham , Chanwoo Choi , linux-kernel@vger.kernel.org Cc: Bumwoo Lee Subject: [PATCH v5 3/3] extcon: Add extcon_alloc_groups to simplify extcon register function Date: Mon, 20 Mar 2023 12:19:39 +0900 Message-Id: <20230320031939.28862-4-bw365.lee@samsung.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230320031939.28862-1-bw365.lee@samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrDKsWRmVeSWpSXmKPExsWy7bCmge6VC+IpBt2d7BYn1ixisrj+5Tmr xeVdc9gsbjeuYHNg8ejbsorR4/MmuQCmqGybjNTElNQihdS85PyUzLx0WyXv4HjneFMzA0Nd Q0sLcyWFvMTcVFslF58AXbfMHKBFSgpliTmlQKGAxOJiJX07m6L80pJUhYz84hJbpdSClJwC swK94sTc4tK8dL281BIrQwMDI1OgwoTsjEldnYwFO4UrVk16wdTA2CLQxcjJISFgItGz+Dlz FyMXh5DADkaJX1+nQjmfGCXmXX7HBOF8Y5RYf20iM0zLuvvtbCC2kMBeRonva9Mgin4xSty9 dpMFJMEmoCGx52IDUBEHh4hAocTh/myQMLOAmsSDVRvZQWxhgTiJjZeawWwWAVWJt8snMoHY vAJWEm83bWKB2CUv0f3vD5jNKWAtcfH4J0aIGkGJkzOfsEDMlJdo3job7GoJgV3sEgtfvYA6 1EXi+uKtTBC2sMSr41vYIWwpiZf9bVB2usTKK3eg7ByJ1/fbGSFsY4l3b9cyg9zPLKApsX6X PkRYUWLn77mMEHv5JN597WEFKZEQ4JXoaBOCKFGW6H7wAmqrpMTip3cYIUo8JG7ez4eEVB+j RMvDDawTGBVmIflmFpJvZiEsXsDIvIpRLLWgODc9tdiwwBAev8n5uZsYwclOy3QH48S3H/QO MTJxMB5ilOBgVhLh9VsgmiLEm5JYWZValB9fVJqTWnyI0RQY1hOZpUST84HpNq8k3tDE0sDE zMjEwtjS2ExJnFfc9mSykEB6YklqdmpqQWoRTB8TB6dUA1PXBcdlOutyHRaYXA6drq8TeeVp VGlu/fb0HFvlr0K1NyZvfZDOU7SudWJXZ/SihhnXD8+c/en1ot62Hx/713z7G5ls4aTwjvPe mnaJHI8fRmcVzZ15+pfXMHNfatnJK9X2aEr1oVnTGfaYcZxZG7B5+tU9SuWqib0LdF6bb5iz zZSpPOVp/Kltr9QXfvtv4ZP5I13i8yOJzpSo+7O5n9fo3Np3w/6JbH5tfvGHnCdf9JRr9zxl u5RwJnt2+Pf9Jbt4Pm3MiV49RWta7bUJl26/+2DsyLeQ0VT/XvbSSYIL380tqeVm3Btfqrhq Gss+XWbNpUpla8IWM2xOlco2mWyl+G+5g66H95QYVW3Fs2uVWIozEg21mIuKEwG4tqCH/wMA AA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrOLMWRmVeSWpSXmKPExsWy7bCSnO7lC+IpBnfXG1icWLOIyeL6l+es Fpd3zWGzuN24gs2BxaNvyypGj8+b5AKYorhsUlJzMstSi/TtErgyJnV1MhbsFK5YNekFUwNj i0AXIyeHhICJxLr77WxdjFwcQgK7GSW6lr1jhUhISpxd/oi9i5EDyBaWOHy4GKLmB6PE/5N/ WUBq2AQ0JPZcbGADsUUEiiUuHFgMFmcWUJN4sGojO4gtLBAjcbHvD1gNi4CqxNvlE5lAbF4B K4m3mzaxQOySl+j+9wfM5hSwlrh4/BMjyF4hoJrf/RkQ5YISJ2c+gRovL9G8dTbzBEaBWUhS s5CkFjAyrWKUTC0ozk3PLTYsMMxLLdcrTswtLs1L10vOz93ECA5LLc0djNtXfdA7xMjEwXiI UYKDWUmE12+BaIoQb0piZVVqUX58UWlOavEhRmkOFiVx3gtdJ+OFBNITS1KzU1MLUotgskwc nFINTFnLV28+qfajaMuCXA7mkzxP3vw83/9vhc/Dak+nsKulEldylOKaN5+Zd9eZb+blX2u1 12qoBOvGXIvgapjPVxIfMCVl8e51DMYzVnDf/8lokuO3SUefbZ5D6Mfu8lSxBI0F4ndNH0ck Hr0UyHHl7V6ZK/dfpJmX+C0zfXM5zeOca2z2Vf5ZG15pT1eSDj9VnlKxybLx4RmW5+HrpdJz k2b+NnuuscWle+E//WfbJ4ktbwt8kvfjjE532YuV9uy7JHbcbd1t9qH9wJFtqw2s2N0Y+liW nF8rfFic/0RIx/qLL/oad3c9FxNLYwtlcTAwjVlap3B5sdatm99XfWW4c8pLUI+XYaPnp4JT TOyce5VYijMSDbWYi4oTAaEXIha6AgAA X-CMS-MailID: 20230320031947epcas1p17117b8bc458903348e9b29061d00b343 X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-Sendblock-Type: SVC_REQ_APPROVE CMS-TYPE: 101P DLP-Filter: Pass X-CFilter-Loop: Reflected X-CMS-RootMailID: 20230320031947epcas1p17117b8bc458903348e9b29061d00b343 References: <20230320031939.28862-1-bw365.lee@samsung.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The alloc groups is functionalized from extcon_dev_register. Signed-off-by: Bumwoo Lee --- drivers/extcon/extcon.c | 61 ++++++++++++++++++++++++++--------------- 1 file changed, 39 insertions(+), 22 deletions(-) diff --git a/drivers/extcon/extcon.c b/drivers/extcon/extcon.c index 86290afa35fb..26a84bed0874 100644 --- a/drivers/extcon/extcon.c +++ b/drivers/extcon/extcon.c @@ -1187,6 +1187,42 @@ static int extcon_alloc_muex(struct extcon_dev *edev) return 0; } =20 +/** + * extcon_alloc_groups() - alloc the groups for extcon device + * @edev: extcon device + * + * Returns 0 if success or error number if fail. + */ +static int extcon_alloc_groups(struct extcon_dev *edev) +{ + int index; + + if (!edev) + return -EINVAL; + + if (!edev->max_supported) + return 0; + + edev->extcon_dev_type.groups =3D kcalloc(edev->max_supported + 2, + sizeof(struct attribute_group *), + GFP_KERNEL); + if (!edev->extcon_dev_type.groups) + return -ENOMEM; + + edev->extcon_dev_type.name =3D dev_name(&edev->dev); + edev->extcon_dev_type.release =3D dummy_sysfs_dev_release; + + for (index =3D 0; index < edev->max_supported; index++) + edev->extcon_dev_type.groups[index] =3D &edev->cables[index].attr_g; + + if (edev->mutually_exclusive) + edev->extcon_dev_type.groups[index] =3D &edev->attr_g_muex; + + edev->dev.type =3D &edev->extcon_dev_type; + + return 0; +} + /** * extcon_dev_register() - Register an new extcon device * @edev: the extcon device to be registered @@ -1242,28 +1278,9 @@ int extcon_dev_register(struct extcon_dev *edev) if (ret < 0) goto err_alloc_muex; =20 - if (edev->max_supported) { - edev->extcon_dev_type.groups =3D - kcalloc(edev->max_supported + 2, - sizeof(struct attribute_group *), - GFP_KERNEL); - if (!edev->extcon_dev_type.groups) { - ret =3D -ENOMEM; - goto err_alloc_groups; - } - - edev->extcon_dev_type.name =3D dev_name(&edev->dev); - edev->extcon_dev_type.release =3D dummy_sysfs_dev_release; - - for (index =3D 0; index < edev->max_supported; index++) - edev->extcon_dev_type.groups[index] =3D - &edev->cables[index].attr_g; - if (edev->mutually_exclusive) - edev->extcon_dev_type.groups[index] =3D - &edev->attr_g_muex; - - edev->dev.type =3D &edev->extcon_dev_type; - } + ret =3D extcon_alloc_groups(edev); + if (ret < 0) + goto err_alloc_groups; =20 spin_lock_init(&edev->lock); if (edev->max_supported) { --=20 2.35.1