From patchwork Thu Mar 2 09:01:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bumwoo Lee X-Patchwork-Id: 63282 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp4127475wrd; Thu, 2 Mar 2023 01:04:58 -0800 (PST) X-Google-Smtp-Source: AK7set8kIEVGFcCg6+nWyfOERdpLyFPryP0aD09cNbZ+n4LiB4gUZq7A3gkCfTXImSB0YKJMmTy/ X-Received: by 2002:a17:903:32d2:b0:19a:7d73:ef47 with SMTP id i18-20020a17090332d200b0019a7d73ef47mr1698233plr.17.1677747898637; Thu, 02 Mar 2023 01:04:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677747898; cv=none; d=google.com; s=arc-20160816; b=EHETsy0MVC2ItMCYHqW+vIgExHBu3RgqQq7PY4PhceReEwZes3BVSe9SWQqORIL58r 1tpQUhfxaiqnpGTZvE605G9lkgQzVXzvSaH6LsyFsZimu5sJxGHoDfrpPR7J8ukTRGjx eVsW/UZFC4dJUAT67+dBKl2vliqubdpKYEjlF1fmEYrufew1e0u+T8reWk4zrZ50ia08 pVcPV9zdy7xvHuSehUbQ6sOcWJiNUkvfghsw0dN1/Odq4Gt23G5xo612pYWkuzKElM/X DXcjI6zzknemUYRYzciaXSPwtPZpSv5uJDzthvsvHsuu28v2sSZl4Z35pwLQO5krC8Rd g50w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:dlp-filter:cms-type :content-transfer-encoding:mime-version:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=TTV8W6gw3S+wohmFfLikBMFap7zij34yNhu2CdJ/iUI=; b=kucRgbN5Nnry0Q5n4PPNfYgM3DI/8f9jFDiaClwrIO8khMjOhYhVTwNaJJG49P8N7A xQqcK9sdXZkmzZWuAbEA96QqkJo6AesNIpczknulnlLgT/Ehtb1lBSYsNlAR1KLds+3o NPTYjKvsh0ZWOI66ZY0ZXcWb1ea2lmdP7rLy/YmeeoybHzt8eRGeUaYtMCdNw/WJmZSg nEO9ho1KpNDzO2GpWlnfQoAy735V9Z3LQYTPXqdt/gtnk8GqRPh4ZrimLV9lzZwDjsnM T+p+EXHurcp9ftOuMQWSo7StXQ6KLyazOwCcZq+aGXmozGwf6l+KRY3bvuFW25qi/I+x 6h7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@samsung.com header.s=mail20170921 header.b=gFRFreqs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=samsung.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z12-20020a170902d54c00b0019cce5618adsi14728463plf.642.2023.03.02.01.04.46; Thu, 02 Mar 2023 01:04:58 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@samsung.com header.s=mail20170921 header.b=gFRFreqs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=samsung.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229879AbjCBJCP (ORCPT + 99 others); Thu, 2 Mar 2023 04:02:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37516 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229654AbjCBJCG (ORCPT ); Thu, 2 Mar 2023 04:02:06 -0500 Received: from mailout3.samsung.com (mailout3.samsung.com [203.254.224.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED900392BC for ; Thu, 2 Mar 2023 01:01:53 -0800 (PST) Received: from epcas1p2.samsung.com (unknown [182.195.41.46]) by mailout3.samsung.com (KnoxPortal) with ESMTP id 20230302090150epoutp03f2291fc2fa2d3e0a0f5f4245d27d8dd0~Ijqdr0ZQ71834118341epoutp03C for ; Thu, 2 Mar 2023 09:01:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout3.samsung.com 20230302090150epoutp03f2291fc2fa2d3e0a0f5f4245d27d8dd0~Ijqdr0ZQ71834118341epoutp03C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1677747710; bh=TTV8W6gw3S+wohmFfLikBMFap7zij34yNhu2CdJ/iUI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gFRFreqs7bwfIEIuiMASUp0JQE0cHPyRGjFF8BA7VTuxyGGjxLp54Rsj5gpilj2nr d6Zp09bqI4Li55WRyBl7uH+jTBss0pWdhZ+vx6Kj8lWhOOlg5uA068eOSBbEO8ZbKg 1nbXzNFi0m7bOxUusPJSW2QYb7trnjUKNek8/+C0= Received: from epsnrtp2.localdomain (unknown [182.195.42.163]) by epcas1p4.samsung.com (KnoxPortal) with ESMTP id 20230302090150epcas1p492366bcc11166555e3d78b5cc1a92058~IjqdQeeje2943429434epcas1p4K; Thu, 2 Mar 2023 09:01:50 +0000 (GMT) Received: from epsmges1p1.samsung.com (unknown [182.195.36.227]) by epsnrtp2.localdomain (Postfix) with ESMTP id 4PS4q15t1Vz4x9Q3; Thu, 2 Mar 2023 09:01:49 +0000 (GMT) Received: from epcas1p4.samsung.com ( [182.195.41.48]) by epsmges1p1.samsung.com (Symantec Messaging Gateway) with SMTP id D3.7D.55531.DF560046; Thu, 2 Mar 2023 18:01:49 +0900 (KST) Received: from epsmtrp1.samsung.com (unknown [182.195.40.13]) by epcas1p3.samsung.com (KnoxPortal) with ESMTPA id 20230302090149epcas1p35d6a66bf8b29ef159ecee93441560c58~IjqcXJ4Dg0383503835epcas1p3O; Thu, 2 Mar 2023 09:01:49 +0000 (GMT) Received: from epsmgms1p1new.samsung.com (unknown [182.195.42.41]) by epsmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230302090149epsmtrp1ca2a7433e87756c9a25bc2cc70b71ccb~IjqcWaJl-0666306663epsmtrp1u; Thu, 2 Mar 2023 09:01:49 +0000 (GMT) X-AuditID: b6c32a35-00ffd7000000d8eb-10-640065fd207c Received: from epsmtip2.samsung.com ( [182.195.34.31]) by epsmgms1p1new.samsung.com (Symantec Messaging Gateway) with SMTP id 5C.4E.18071.DF560046; Thu, 2 Mar 2023 18:01:49 +0900 (KST) Received: from VDBS1418.vd.sec.samsung.net (unknown [168.219.244.30]) by epsmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230302090149epsmtip2db19be2dd5a7a1369d989fcf200909c1~IjqcMogOs0725107251epsmtip2F; Thu, 2 Mar 2023 09:01:49 +0000 (GMT) From: Bumwoo Lee To: MyungJoo Ham , Chanwoo Choi , linux-kernel@vger.kernel.org Cc: Bumwoo Lee Subject: [PATCH v4 1/4] extcon: Removed redundant null checking for class Date: Thu, 2 Mar 2023 18:01:40 +0900 Message-Id: <20230302090143.46678-2-bw365.lee@samsung.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230302090143.46678-1-bw365.lee@samsung.com> MIME-Version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrNKsWRmVeSWpSXmKPExsWy7bCmge7fVIYUg9/vdCxOrFnEZHH9y3NW i8u75rBZ3G5cwebA4tG3ZRWjx+dNcgFMUdk2GamJKalFCql5yfkpmXnptkrewfHO8aZmBoa6 hpYW5koKeYm5qbZKLj4Bum6ZOUCLlBTKEnNKgUIBicXFSvp2NkX5pSWpChn5xSW2SqkFKTkF ZgV6xYm5xaV56Xp5qSVWhgYGRqZAhQnZGes+vWIq+MdZsf35K9YGxmkcXYycHBICJhJfTp9n 72Lk4hAS2MEoseDPPUYI5xOjxO1/OxlBqoQEvjFKnP7IBNPx98kWqKK9jBL32uewQTi/GCUO n73BAlLFJqAhsediA1CCg0NEoFDicH82SJhZQE3iwaqN7CC2sICnROfr92A2i4CqxISP28Fa eQWsJOY/WMUKsUxeovvfH7A4p4C1xJvJXVA1ghInZz5hgZgpL9G8dTYzyA0SAtvYJU4928QI sldCwEXi2SQbiDnCEq+Ob2GHsKUkXva3QdnpEiuv3IGycyRe329nhLCNJd69XcsMMoZZQFNi /S59iLCixM7fcxkh1vJJvPvawwqxiVeio00IokRZovvBC2hQSUosfnoH6hgPiXM/PSAB1cco saPnF+MERoVZSJ6ZheSZWQiLFzAyr2IUSy0ozk1PLTYsMIRHb3J+7iZGcKrTMt3BOPHtB71D jEwcjIcYJTiYlUR4F97+kyzEm5JYWZValB9fVJqTWnyI0RQY1BOZpUST84HJNq8k3tDE0sDE zMjEwtjS2ExJnFfc9mSykEB6YklqdmpqQWoRTB8TB6dUA9Pl3Rya9TP3f5W+tJQ95na+iFPc h+U3xGOuZQR9XdggMTVIee1KsQkOJk4s/x+lMHC2vXkVWtlf+3Hld0UJsU1unz2+S9VPmRfW eNeed/6vGalb13Sw7XgTlztjxp4uHsGsR/E+0/tK/PbP+6+9uCVgYV55QbHVZptXD/MiVeKl qm90+H1+f6N0j93bu6nL+VSSAlOjnQ/46RsfXqpXfiLG3ntdxzm1vHX/P30Lq3pSY7f7/XRR xX8BZbvzfMqtNdNKZl5ym8XbWR90RK1IYMX3vdm3T/bX+aSGxN3KVQ2vE7i+8VTOupiTc5Zs WPr0llpJwaneewX3Qy3/O30OVPV84ZN+M6C4a+UMxgorISWW4oxEQy3mouJEADGkX03+AwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrBLMWRmVeSWpSXmKPExsWy7bCSvO7fVIYUg/+npSxOrFnEZHH9y3NW i8u75rBZ3G5cwebA4tG3ZRWjx+dNcgFMUVw2Kak5mWWpRfp2CVwZ6z69Yir4x1mx/fkr1gbG aRxdjJwcEgImEn+fbGHsYuTiEBLYzSixZd4TdoiEpMTZ5Y+AbA4gW1ji8OFiiJofjBK3zvxl A6lhE9CQ2HOxAcwWESiWuHBgMQuIzSygJvFg1UawOcICnhKdr9+D2SwCqhITPm4Hq+EVsJKY /2AVK8QueYnuf3/A4pwC1hJvJneB2UJANdNf7YOqF5Q4OfMJ1Hx5ieats5knMArMQpKahSS1 gJFpFaNkakFxbnpusWGBYV5quV5xYm5xaV66XnJ+7iZGcGBqae5g3L7qg94hRiYOxkOMEhzM SiK8C2//SRbiTUmsrEotyo8vKs1JLT7EKM3BoiTOe6HrZLyQQHpiSWp2ampBahFMlomDU6qB aU8K44+ptVelDnjUFAdcPC5keKLigVPEZyfT8Hn7I340nFo8w5tRiDvodP+fi3cCHYOaO60O /notrzZDo+7urVNGwrscOru2PNsTZ+e/69SaulvP2SLTIx9+MKja2+clW9b7f6/vh+Vim7Yo pQswvglxqfhmdk4scd6OuwpH5nmVz1l4MSWs+KCFA+fGXtlt2W9mfDi9lG/G28erNvLy73Jh 2/Yyt/Fg4t3Co3xRM93CQqPP7KzR5/TYy+e03/T8vz/7J8eLLGKrtuH+8axDUPS6o8qd/NSW gCP9JntZ9Nsi1EQzMzUWHlj0QNI93eDI9JY1H/kEwm433N+p0uzmtsiPUXiGQ97Gb9d5Ay9P UmIpzkg01GIuKk4EAIGkyFW7AgAA X-CMS-MailID: 20230302090149epcas1p35d6a66bf8b29ef159ecee93441560c58 X-Msg-Generator: CA X-Sendblock-Type: SVC_REQ_APPROVE CMS-TYPE: 101P DLP-Filter: Pass X-CFilter-Loop: Reflected X-CMS-RootMailID: 20230302090149epcas1p35d6a66bf8b29ef159ecee93441560c58 References: <20230302090143.46678-1-bw365.lee@samsung.com> X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759246180797330026?= X-GMAIL-MSGID: =?utf-8?q?1759246180797330026?= create_extcon_class() is already Null checking. Signed-off-by: Bumwoo Lee Acked-by: MyungJoo Ham --- drivers/extcon/extcon.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/drivers/extcon/extcon.c b/drivers/extcon/extcon.c index e1c71359b605..adcf01132f70 100644 --- a/drivers/extcon/extcon.c +++ b/drivers/extcon/extcon.c @@ -1012,12 +1012,13 @@ ATTRIBUTE_GROUPS(extcon); static int create_extcon_class(void) { - if (!extcon_class) { - extcon_class = class_create(THIS_MODULE, "extcon"); - if (IS_ERR(extcon_class)) - return PTR_ERR(extcon_class); - extcon_class->dev_groups = extcon_groups; - } + if (extcon_class) + return 0; + + extcon_class = class_create(THIS_MODULE, "extcon"); + if (IS_ERR(extcon_class)) + return PTR_ERR(extcon_class); + extcon_class->dev_groups = extcon_groups; return 0; } @@ -1088,11 +1089,9 @@ int extcon_dev_register(struct extcon_dev *edev) int ret, index = 0; static atomic_t edev_no = ATOMIC_INIT(-1); - if (!extcon_class) { - ret = create_extcon_class(); - if (ret < 0) - return ret; - } + ret = create_extcon_class(); + if (ret < 0) + return ret; if (!edev || !edev->supported_cable) return -EINVAL; From patchwork Thu Mar 2 09:01:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bumwoo Lee X-Patchwork-Id: 63285 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp4127954wrd; Thu, 2 Mar 2023 01:06:03 -0800 (PST) X-Google-Smtp-Source: AK7set8HLhtDH1vgYrTaPze5c8pModEvuzne6bTd5YIG6LTkBgvuzx9KPNOWAFf4jJlJxyfdUo7E X-Received: by 2002:a17:907:628a:b0:889:794d:f412 with SMTP id nd10-20020a170907628a00b00889794df412mr11236253ejc.10.1677747963649; Thu, 02 Mar 2023 01:06:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677747963; cv=none; d=google.com; s=arc-20160816; b=B9ALksXLmvCAbh2SJzseWWvOD3txzsH78c/8QKN40V+pEP3RhIwIF6b4p9TmrdP9xD AYJfDKajSve2jUEm1apNu04pvyQe/lQdWR9ua1LO5xYY2iw39SmIPH3pL7oTMtq3gPvb bM/CupQD2osA1F35TkXet2dVHcszQ95Y/crhnghhlI4p/ZzWiWaNcKdGvKxOmP6ocALY gyk0122MzFl7N2WjBiISOVUMKz4Np+WK6HOEyub9xND6aJwsmwQLKWjlj3O7+yAYalRq SmOrB36azVUEwxkqyb8XpUKI3uV5bkbhpyBrPW0GEKlMIdNGuvPdOjwTrxQHNTUrWlCh JenQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:dlp-filter:cms-type :content-transfer-encoding:mime-version:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=0uzqFSfpAvdZMsnO58nFZF6unKH5wBEwN0q4tolro1w=; b=0z+jkqojNsSUOemrg2l8JbValcePR1g85GYij8RSn61TieThhSdxJjrZXTUB6gsQLf 5eZeK3sXLU1nmEQ5OvnFWA5lq+YQe0zLs6Zx1qqYcR03idtkGKOvKSUCRyhXo+7GFYKo wUVf3FW3arFc+k2hTYQ/jitZewTUnLPQ7bnUTsNmRBDRAub+zuKUUjBQspPcPyGuTv9P aVYQsom11HarvW+PgJOFZwQJKsoQDW+CHxsMwsbdnjcEFanBXowkVLo5+OVSZuIXlnbL +eR/LJyrHiUEGfOacnKr5Ej8aFRcT/am0hXf2REcsMXWt0g9nOkL8Wkd6QNehC0eOvTK jX/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@samsung.com header.s=mail20170921 header.b=jmcYIYgt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=samsung.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c3-20020a170906924300b008b17e235ac3si2008284ejx.924.2023.03.02.01.05.41; Thu, 02 Mar 2023 01:06:03 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@samsung.com header.s=mail20170921 header.b=jmcYIYgt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=samsung.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229882AbjCBJC3 (ORCPT + 99 others); Thu, 2 Mar 2023 04:02:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37530 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229844AbjCBJCI (ORCPT ); Thu, 2 Mar 2023 04:02:08 -0500 Received: from mailout4.samsung.com (mailout4.samsung.com [203.254.224.34]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BD31F3B219 for ; Thu, 2 Mar 2023 01:01:54 -0800 (PST) Received: from epcas1p4.samsung.com (unknown [182.195.41.48]) by mailout4.samsung.com (KnoxPortal) with ESMTP id 20230302090152epoutp04acc1282dd02f1bda11ab30cd2b162c9e~Ijqexa79P2493224932epoutp04E for ; Thu, 2 Mar 2023 09:01:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout4.samsung.com 20230302090152epoutp04acc1282dd02f1bda11ab30cd2b162c9e~Ijqexa79P2493224932epoutp04E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1677747712; bh=0uzqFSfpAvdZMsnO58nFZF6unKH5wBEwN0q4tolro1w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jmcYIYgtl6vUeydt6eEyHLLh60OEm/qFXq1DDJ/dkFNy0rAGpyt6EgLzx+rRKt1Pd ZTMHxAtOPMcEbYllzfxLSbWKitWPV0SXBZhltRg/A49Ajkd1zt3y0ajPUcWchy6fW0 wLe4kyN1kXkVpHVajYT5Tw/yiDEfthNn7Q955mIg= Received: from epsnrtp4.localdomain (unknown [182.195.42.165]) by epcas1p1.samsung.com (KnoxPortal) with ESMTP id 20230302090151epcas1p19c0f3b0e223801c09dad12dc3d1d132a~Ijqedr5wQ2953829538epcas1p1C; Thu, 2 Mar 2023 09:01:51 +0000 (GMT) Received: from epsmges1p2.samsung.com (unknown [182.195.36.226]) by epsnrtp4.localdomain (Postfix) with ESMTP id 4PS4q24PkQz4x9Pw; Thu, 2 Mar 2023 09:01:50 +0000 (GMT) Received: from epcas1p4.samsung.com ( [182.195.41.48]) by epsmges1p2.samsung.com (Symantec Messaging Gateway) with SMTP id C5.AC.12562.DF560046; Thu, 2 Mar 2023 18:01:49 +0900 (KST) Received: from epsmtrp1.samsung.com (unknown [182.195.40.13]) by epcas1p2.samsung.com (KnoxPortal) with ESMTPA id 20230302090149epcas1p2bad39de9aa367644cda3ffcb4dd4a612~Ijqcc4kJy0051500515epcas1p2D; Thu, 2 Mar 2023 09:01:49 +0000 (GMT) Received: from epsmgms1p2.samsung.com (unknown [182.195.42.42]) by epsmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230302090149epsmtrp17fe465779d69392a29ce9dab828f2bed~IjqccNTcq0666306663epsmtrp1v; Thu, 2 Mar 2023 09:01:49 +0000 (GMT) X-AuditID: b6c32a36-e59fa70000023112-8f-640065fd0e35 Received: from epsmtip2.samsung.com ( [182.195.34.31]) by epsmgms1p2.samsung.com (Symantec Messaging Gateway) with SMTP id CC.2E.31821.DF560046; Thu, 2 Mar 2023 18:01:49 +0900 (KST) Received: from VDBS1418.vd.sec.samsung.net (unknown [168.219.244.30]) by epsmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230302090149epsmtip20792e78de5418056689e323c7da60751~IjqcQmmkh0659906599epsmtip2n; Thu, 2 Mar 2023 09:01:49 +0000 (GMT) From: Bumwoo Lee To: MyungJoo Ham , Chanwoo Choi , linux-kernel@vger.kernel.org Cc: Bumwoo Lee Subject: [PATCH v4 2/4] extcon: Added extcon_alloc_cables to simplify extcon register function Date: Thu, 2 Mar 2023 18:01:41 +0900 Message-Id: <20230302090143.46678-3-bw365.lee@samsung.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230302090143.46678-1-bw365.lee@samsung.com> MIME-Version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrLKsWRmVeSWpSXmKPExsWy7bCmge7fVIYUg9XLTC1OrFnEZHH9y3NW i8u75rBZ3G5cwebA4tG3ZRWjx+dNcgFMUdk2GamJKalFCql5yfkpmXnptkrewfHO8aZmBoa6 hpYW5koKeYm5qbZKLj4Bum6ZOUCLlBTKEnNKgUIBicXFSvp2NkX5pSWpChn5xSW2SqkFKTkF ZgV6xYm5xaV56Xp5qSVWhgYGRqZAhQnZGed6T7AWvJKv2HtoE2sD43nJLkZODgkBE4nvL+ey dTFycQgJ7GCUaH61gQXC+cQo8a93KhOE85lR4uvFbjaYlm9zH7NDJHYxSmz+8Ruq/xejxJnl 81hBqtgENCT2XGwASnBwiAgUShzuzwYJMwuoSTxYtZEdxBYWSJBY8fg4K0gJi4CqxILNsiBh XgEriZ2vJ7FA7JKX6P73B8zmFLCWeDO5iwWiRlDi5MwnLBAj5SWat85mBjlBQmAXu8Ti89OZ IZpdJNZP+cQIYQtLvDq+hR3ClpJ42d8GZadLrLxyB8rOkXh9vx2q3lji3du1zCC3MQtoSqzf pQ8RVpTY+XsuI8RePol3X3vAzpcQ4JXoaBOCKFGW6H7wggnClpRY/PQO1EQPids/bkPDs49R Yv7lv0wTGBVmIXlnFpJ3ZiFsXsDIvIpRLLWgODc9tdiwwAgewcn5uZsYwelOy2wH46S3H/QO MTJxMB5ilOBgVhLhXXj7T7IQb0piZVVqUX58UWlOavEhRlNgWE9klhJNzgcm3LySeEMTSwMT MyMTC2NLYzMlcV5x25PJQgLpiSWp2ampBalFMH1MHJxSDUzW068ozD7P8uNpT8KHWZMWzj7v mnP/eq2KUbWghQi7n2Gwy/rw5P1b3ge72hv9mzNV6VfokQsHNxruWupQ8GzX6ogr3qVqassq zC4ILxZ6FJd5VENv+aX7zr8Yt6+tnzr7oMKcV0dKtVjKzx0Xurh877u+sNP53xO7VTb2iKjf 3VCTbx6l2TZho1isVsaXRuNYQ7GJk/V1Z+jsn6+/ZvUbxag+p8Kd9pmLZV5ekKnZzNLH9vXn 2i4FhQczORaGPKvxPTKHpdCPcca1S/tWzguc3LQs7pi+yKeZShXTOu84Hqwu3TZzCkuJkdu2 xqSFG/8LZHNki4slT5jY6vJNNPvmtR5BKw1+87MT78y742WjxFKckWioxVxUnAgAAqDZwQAE AAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrOLMWRmVeSWpSXmKPExsWy7bCSvO7fVIYUgxNb5CxOrFnEZHH9y3NW i8u75rBZ3G5cwebA4tG3ZRWjx+dNcgFMUVw2Kak5mWWpRfp2CVwZ53pPsBa8kq/Ye2gTawPj eckuRk4OCQETiW9zH7N3MXJxCAnsYJS42vuGFSIhKXF2+SOgBAeQLSxx+HAxRM0PRonuU98Y QWrYBDQk9lxsYAOxRQSKJS4cWMwCYjMLqEk8WLWRHcQWFoiTeLn8N9gcFgFViQWbZUHCvAJW EjtfT2KBWCUv0f3vD5jNKWAt8WZyF5gtBFQz/dU+Foh6QYmTM59AjZeXaN46m3kCo8AsJKlZ SFILGJlWMUqmFhTnpucWGxYY5aWW6xUn5haX5qXrJefnbmIEh6WW1g7GPas+6B1iZOJgPMQo wcGsJMK78PafZCHelMTKqtSi/Pii0pzU4kOM0hwsSuK8F7pOxgsJpCeWpGanphakFsFkmTg4 pRqYipqaxBJ9tv/t+vznCd+hnoWTf/mez35leT5z/f8X2d9Y59WbqBXPWZFz5cey0I33Z9tn WnmnJshvPyZYpFzm/DjEabJdiP08xbyHLs+PysWfW2z9bWFL5IIVy8ItbZlF8+5n/V7wauVD 7s36vQZ8io3lnIw7I44uNnaqZVBkF/8nqFIXcOeIyq8qvq/ZJa8ML8rxzlz/mf3bj7RPe6sn HJHK+bMjUfC/9/SfDf6HP7vwz+H4uKApqi+AuWCrEJNtg+WOxsll15MtG89GfNGwt/7ofLMg VHl3ffnxyNcN9xgfbOq6VpnCvDCKebnJdCmXqw8nMbicW3VbjamRm1lqwdKNpbmzf+73f9PD NJFFiaU4I9FQi7moOBEA8CS2sLoCAAA= X-CMS-MailID: 20230302090149epcas1p2bad39de9aa367644cda3ffcb4dd4a612 X-Msg-Generator: CA X-Sendblock-Type: SVC_REQ_APPROVE CMS-TYPE: 101P DLP-Filter: Pass X-CFilter-Loop: Reflected X-CMS-RootMailID: 20230302090149epcas1p2bad39de9aa367644cda3ffcb4dd4a612 References: <20230302090143.46678-1-bw365.lee@samsung.com> X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759246248684779460?= X-GMAIL-MSGID: =?utf-8?q?1759246248684779460?= The cable allocation part is functionalized from extcon_dev_register. Signed-off-by: Bumwoo Lee --- drivers/extcon/extcon.c | 108 +++++++++++++++++++++++----------------- 1 file changed, 62 insertions(+), 46 deletions(-) diff --git a/drivers/extcon/extcon.c b/drivers/extcon/extcon.c index adcf01132f70..49605e96bedd 100644 --- a/drivers/extcon/extcon.c +++ b/drivers/extcon/extcon.c @@ -1070,6 +1070,63 @@ void extcon_dev_free(struct extcon_dev *edev) } EXPORT_SYMBOL_GPL(extcon_dev_free); +/** + * 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->max_supported) + return 0; + + edev->cables = kcalloc(edev->max_supported, + sizeof(struct extcon_cable), + GFP_KERNEL); + if (!edev->cables) + return -ENOMEM; + + for (index = 0; index < edev->max_supported; index++) { + cable = &edev->cables[index]; + + str = kasprintf(GFP_KERNEL, "cable.%d", index); + if (!str) { + for (index--; index >= 0; index--) { + cable = &edev->cables[index]; + kfree(cable->attr_g.name); + } + + kfree(edev->cables); + return -ENOMEM; + } + + cable->edev = edev; + cable->cable_index = index; + cable->attrs[0] = &cable->attr_name.attr; + cable->attrs[1] = &cable->attr_state.attr; + cable->attrs[2] = NULL; + cable->attr_g.name = str; + cable->attr_g.attrs = cable->attrs; + + sysfs_attr_init(&cable->attr_name.attr); + cable->attr_name.attr.name = "name"; + cable->attr_name.attr.mode = 0444; + cable->attr_name.show = cable_name_show; + + sysfs_attr_init(&cable->attr_state.attr); + cable->attr_state.attr.name = "state"; + cable->attr_state.attr.mode = 0444; + cable->attr_state.show = cable_state_show; + } + + return 0; +} + /** * extcon_dev_register() - Register an new extcon device * @edev: the extcon device to be registered @@ -1117,50 +1174,9 @@ int extcon_dev_register(struct extcon_dev *edev) dev_set_name(&edev->dev, "extcon%lu", (unsigned long)atomic_inc_return(&edev_no)); - if (edev->max_supported) { - char *str; - struct extcon_cable *cable; - - edev->cables = kcalloc(edev->max_supported, - sizeof(struct extcon_cable), - GFP_KERNEL); - if (!edev->cables) { - ret = -ENOMEM; - goto err_sysfs_alloc; - } - for (index = 0; index < edev->max_supported; index++) { - cable = &edev->cables[index]; - - str = kasprintf(GFP_KERNEL, "cable.%d", index); - if (!str) { - for (index--; index >= 0; index--) { - cable = &edev->cables[index]; - kfree(cable->attr_g.name); - } - ret = -ENOMEM; - - goto err_alloc_cables; - } - - cable->edev = edev; - cable->cable_index = index; - cable->attrs[0] = &cable->attr_name.attr; - cable->attrs[1] = &cable->attr_state.attr; - cable->attrs[2] = NULL; - cable->attr_g.name = str; - cable->attr_g.attrs = cable->attrs; - - sysfs_attr_init(&cable->attr_name.attr); - cable->attr_name.attr.name = "name"; - cable->attr_name.attr.mode = 0444; - cable->attr_name.show = cable_name_show; - - sysfs_attr_init(&cable->attr_state.attr); - cable->attr_state.attr.name = "state"; - cable->attr_state.attr.mode = 0444; - cable->attr_state.show = cable_state_show; - } - } + ret = extcon_alloc_cables(edev); + if (ret < 0) + goto err_alloc_cables; if (edev->max_supported && edev->mutually_exclusive) { char *name; @@ -1279,10 +1295,10 @@ int extcon_dev_register(struct extcon_dev *edev) err_muex: for (index = 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); From patchwork Thu Mar 2 09:01:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bumwoo Lee X-Patchwork-Id: 63284 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp4127826wrd; Thu, 2 Mar 2023 01:05:48 -0800 (PST) X-Google-Smtp-Source: AK7set+2ZAW1fd1t4m07v9A/fwA0yqBSNXXKm+A7c/5JvlEXEZoZxsiwunxFz/l0eOgvo2l+resY X-Received: by 2002:aa7:d94c:0:b0:4ad:5276:8ea4 with SMTP id l12-20020aa7d94c000000b004ad52768ea4mr9300874eds.20.1677747947908; Thu, 02 Mar 2023 01:05:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677747947; cv=none; d=google.com; s=arc-20160816; b=YiVl4hyUCFNdZq/rfEiCA7969qN28heJel/f7IEMFM6oZEcl9VY9yxAFscbkyioMfl b1GA4dO+K89vLEs9Lx5SHe8XzA70lMwMKuM93iufgweqNXi5TGCzhEvOMfZunE7+Ydup XZFOuvgFSGj1sA7WwwTdOKsW2ZOD0IRAsn//H6jx3fQbNLMyPHzDIRIWOxfm+H44m9LB HdBfZejctkvB2pm7QZ8jleFIY+YQTlZXMbcsK2UZhva2HWVvvhOyR502eveVFKwCiNQc FGtRY+koCQ0dulUWUntC6kh47oiQsJdoIjlFUZrH4yh62EWRfYhhFVHooFU16qeHR3kY fujA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:dlp-filter:cms-type :content-transfer-encoding:mime-version:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=cbn41A/zllFF1Fxp+oBfssVf1kqTC7m5c7lzXzDOAsk=; b=COffXUpM+KbdAkBP2hoRFN+EyjnLdaPYA7QT0jEt9+3wRa+wjVFDveiEvYet2rDoiA V/9ecn3U9pPCq7q6y2KX2J5em4cI2GC0I8oBrWD4QCHKrpjpViFI2L/485Hc99bQrww8 8mEdqwqXqh84XtqPOiol/8ax0E1j2T9uaq2ilJta/B3QLCDDR/5PyAHR3UvRNEXD8haB CSA9zBvVbQptjEsK9/YKXCUDLSLat8FHuGTPT3xRMnt/TCFi8qjyavq8BXc5a411qNur l5V8+dIKzMel6sAJ8+GZIO1HJtT0a+y3p8c7lJudgIqJQVBQvIiEueA9G8kRBxyyx47h WeOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@samsung.com header.s=mail20170921 header.b=vdKJd1v2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=samsung.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hb21-20020a170906b89500b008b2c034ca3dsi16675564ejb.744.2023.03.02.01.05.25; Thu, 02 Mar 2023 01:05:47 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@samsung.com header.s=mail20170921 header.b=vdKJd1v2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=samsung.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229889AbjCBJCZ (ORCPT + 99 others); Thu, 2 Mar 2023 04:02:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37532 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229764AbjCBJCH (ORCPT ); Thu, 2 Mar 2023 04:02:07 -0500 Received: from mailout4.samsung.com (mailout4.samsung.com [203.254.224.34]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BDEF43B22E for ; Thu, 2 Mar 2023 01:01:54 -0800 (PST) Received: from epcas1p3.samsung.com (unknown [182.195.41.47]) by mailout4.samsung.com (KnoxPortal) with ESMTP id 20230302090151epoutp042ed3ce725306f975551a142d1b2a6d07~IjqeE1BDN2133421334epoutp04e for ; Thu, 2 Mar 2023 09:01:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout4.samsung.com 20230302090151epoutp042ed3ce725306f975551a142d1b2a6d07~IjqeE1BDN2133421334epoutp04e DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1677747711; bh=cbn41A/zllFF1Fxp+oBfssVf1kqTC7m5c7lzXzDOAsk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vdKJd1v2L/SQ0vNu8n4r2pPUuUJwA0CZpPnq2AjkaAOeA7FghHVlkye6E0j5ZNxMm 9chXSX/61QQRiGGz6aEhE7SXU1TV/ZwIKbEHcxTh1R3BJ/SHzQuxzW1cLffkbjDkk8 gIv5q8j5O1hOZKr/aFNZHz2D9vnUTEKKbog5lVVw= Received: from epsnrtp2.localdomain (unknown [182.195.42.163]) by epcas1p3.samsung.com (KnoxPortal) with ESMTP id 20230302090150epcas1p3cb76ae87d181fa893073265dc441d7c4~Ijqdsfv660385703857epcas1p37; Thu, 2 Mar 2023 09:01:50 +0000 (GMT) Received: from epsmges1p1.samsung.com (unknown [182.195.36.225]) by epsnrtp2.localdomain (Postfix) with ESMTP id 4PS4q20BdTz4x9QL; Thu, 2 Mar 2023 09:01:50 +0000 (GMT) Received: from epcas1p2.samsung.com ( [182.195.41.46]) by epsmges1p1.samsung.com (Symantec Messaging Gateway) with SMTP id 24.7D.55531.DF560046; Thu, 2 Mar 2023 18:01:49 +0900 (KST) Received: from epsmtrp2.samsung.com (unknown [182.195.40.14]) by epcas1p3.samsung.com (KnoxPortal) with ESMTPA id 20230302090149epcas1p31a7f99d83947be1d6f06141b352ce041~IjqcjwIPC0385703857epcas1p3x; Thu, 2 Mar 2023 09:01:49 +0000 (GMT) Received: from epsmgms1p1new.samsung.com (unknown [182.195.42.41]) by epsmtrp2.samsung.com (KnoxPortal) with ESMTP id 20230302090149epsmtrp251ed4e49ec22ea642c4cdd9447ab8bdd~IjqcjChmv3164931649epsmtrp2c; Thu, 2 Mar 2023 09:01:49 +0000 (GMT) X-AuditID: b6c32a35-d9fff7000000d8eb-11-640065fdf7d4 Received: from epsmtip2.samsung.com ( [182.195.34.31]) by epsmgms1p1new.samsung.com (Symantec Messaging Gateway) with SMTP id AC.4E.18071.DF560046; Thu, 2 Mar 2023 18:01:49 +0900 (KST) Received: from VDBS1418.vd.sec.samsung.net (unknown [168.219.244.30]) by epsmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230302090149epsmtip2d0019787bb27da33a379e45bcdc60600~IjqcUzDiw0725207252epsmtip2F; Thu, 2 Mar 2023 09:01:49 +0000 (GMT) From: Bumwoo Lee To: MyungJoo Ham , Chanwoo Choi , linux-kernel@vger.kernel.org Cc: Bumwoo Lee Subject: [PATCH v4 3/4] extcon: Added extcon_alloc_muex to simplify extcon register function Date: Thu, 2 Mar 2023 18:01:42 +0900 Message-Id: <20230302090143.46678-4-bw365.lee@samsung.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230302090143.46678-1-bw365.lee@samsung.com> MIME-Version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrHKsWRmVeSWpSXmKPExsWy7bCmnu7fVIYUgweLrS1OrFnEZHH9y3NW i8u75rBZ3G5cwebA4tG3ZRWjx+dNcgFMUdk2GamJKalFCql5yfkpmXnptkrewfHO8aZmBoa6 hpYW5koKeYm5qbZKLj4Bum6ZOUCLlBTKEnNKgUIBicXFSvp2NkX5pSWpChn5xSW2SqkFKTkF ZgV6xYm5xaV56Xp5qSVWhgYGRqZAhQnZGecO/mYqWCpf8bBtA2sD4w+JLkZODgkBE4kby2+z dDFycQgJ7GCU2HnjBiuE84lRYkfrG3YI5xujRPvupawwLR1HTrBBJPYySjw+uQiq/xejxNbt rcwgVWwCGhJ7LjYAVXFwiAgUShzuzwYJMwuoSTxYtZEdxBYWiJM4/nQbmM0ioCqx6ukvNhCb V8BKYv/WqewQy+Qluv/9YQGxOQWsJd5M7mKBqBGUODnzCQvETHmJ5q2zmUFukBDYxy5xfX4f G0Szi8S/eddZIGxhiVfHt0ANlZL4/G4vVE26xMord6DiORKv77czQtjGEu/ermUGuZ9ZQFNi /S59iLCixM7fcxkh9vJJvPvawwpSIiHAK9HRJgRRoizR/eAFE4QtKbH46R2oiR4SC9cvhgZV H6PEw0N32CcwKsxC8s4sJO/MQti8gJF5FaNYakFxbnpqsWGBITyGk/NzNzGCE56W6Q7GiW8/ 6B1iZOJgPMQowcGsJMK78PafZCHelMTKqtSi/Pii0pzU4kOMpsDAnsgsJZqcD0y5eSXxhiaW BiZmRiYWxpbGZkrivOK2J5OFBNITS1KzU1MLUotg+pg4OKUamO6Vhfw511z4pm1G7YzZ2zSn 7DbxWDbzR3qL6s2r/96u9lYtdz0uvdLnzI+cbap7GKzzuV/IbgnYxnj9e3mOj6aR460ZZUnt hYGaKwr8dkQnNjD/43k39+h23SOvtjYoPSzQmaG9+a/k7OlVtcrJURfeeZ+ZzOhTzv024UBa 9Kxek8ss/uZ12RW5z3caPGuKuaC6inUew0ydPxKdrhGXZ9//ZfPt4j0ewfadHm79Uz98WPBq 9Y7S5OJ3ss9X7DU5tH1ewntm9pa7a7I+6zwv/9WwxiK56cspE67ofLG4mcdrrG8ZXVNetIBP s0eqw6Mt80zowXsa/x4cmPJ88fFqlwPL73xb/the94yJZXRvW5YSS3FGoqEWc1FxIgAcfUqD AQQAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrBLMWRmVeSWpSXmKPExsWy7bCSvO7fVIYUgy/blS1OrFnEZHH9y3NW i8u75rBZ3G5cwebA4tG3ZRWjx+dNcgFMUVw2Kak5mWWpRfp2CVwZ5w7+ZipYKl/xsG0DawPj D4kuRk4OCQETiY4jJ9i6GLk4hAR2M0pc2zaFBSIhKXF2+SP2LkYOIFtY4vDhYoiaH4wSHyZ2 MIPUsAloSOy52MAGYosIFEtcOLAYrJdZQE3iwaqN7CC2sECMxPkFH8FqWARUJVY9/QVm8wpY SezfOpUdYpe8RPe/P2C9nALWEm8md4HZQkA101/tY4GoF5Q4OfMJ1Hx5ieats5knMArMQpKa hSS1gJFpFaNkakFxbnpusWGBYV5quV5xYm5xaV66XnJ+7iZGcGBqae5g3L7qg94hRiYOxkOM EhzMSiK8C2//SRbiTUmsrEotyo8vKs1JLT7EKM3BoiTOe6HrZLyQQHpiSWp2ampBahFMlomD U6qBaddJw09//unU7dqYpXVzsnr0rtRL60sDd6qna1nOPBzz5VvTEsemu37hAn3NF37/9197 cN+jk0u+rl14b7OHbJBY1+QnGZqMgW4z/DakzZBoW70wW+DbwaVJR2M2/5X6fVBDMFdiStZf k4SDtozunUs/JsbkHxb4ynlkw/Tb7BdO8Ggs3+1oYHI2omeixLmnirLu6zUtriv1HWlbbdgQ b7NBSF1vTc3BqRxspnOMVy3UO9G47PSde9nLs5xku1c9srj339FM6vS8xSozTtdFHLVabJFc vyFL/tmPsE29V2sZA/P89j/8XWCo0NX04uf2k5sV9/1pisid+nq2aF7eO4Hz9WsnPNaVilXj dJZ+dFGJpTgj0VCLuag4EQCbuW0ruwIAAA== X-CMS-MailID: 20230302090149epcas1p31a7f99d83947be1d6f06141b352ce041 X-Msg-Generator: CA X-Sendblock-Type: SVC_REQ_APPROVE CMS-TYPE: 101P DLP-Filter: Pass X-CFilter-Loop: Reflected X-CMS-RootMailID: 20230302090149epcas1p31a7f99d83947be1d6f06141b352ce041 References: <20230302090143.46678-1-bw365.lee@samsung.com> X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759246231885036921?= X-GMAIL-MSGID: =?utf-8?q?1759246231885036921?= The mutual exclusive part is functionalized from extcon_dev_register. Signed-off-by: Bumwoo Lee --- drivers/extcon/extcon.c | 106 ++++++++++++++++++++++------------------ 1 file changed, 58 insertions(+), 48 deletions(-) diff --git a/drivers/extcon/extcon.c b/drivers/extcon/extcon.c index 49605e96bedd..321988231806 100644 --- a/drivers/extcon/extcon.c +++ b/drivers/extcon/extcon.c @@ -1127,6 +1127,60 @@ static int extcon_alloc_cables(struct extcon_dev *edev) return 0; } +/** + * 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->max_supported && edev->mutually_exclusive)) + return 0; + + /* Count the size of mutually_exclusive array */ + for (index = 0; edev->mutually_exclusive[index]; index++) + ; + + edev->attrs_muex = kcalloc(index + 1, + sizeof(struct attribute *), + GFP_KERNEL); + if (!edev->attrs_muex) + return -ENOMEM; + + edev->d_attrs_muex = kcalloc(index, + sizeof(struct device_attribute), + GFP_KERNEL); + if (!edev->d_attrs_muex) { + kfree(edev->attrs_muex); + return -ENOMEM; + } + + for (index = 0; edev->mutually_exclusive[index]; index++) { + name = kasprintf(GFP_KERNEL, "0x%x", + edev->mutually_exclusive[index]); + if (!name) { + for (index--; index >= 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 = name; + edev->d_attrs_muex[index].attr.mode = 0000; + edev->attrs_muex[index] = &edev->d_attrs_muex[index].attr; + } + edev->attr_g_muex.name = muex_name; + edev->attr_g_muex.attrs = edev->attrs_muex; + + return 0; +} + /** * extcon_dev_register() - Register an new extcon device * @edev: the extcon device to be registered @@ -1178,53 +1232,9 @@ int extcon_dev_register(struct extcon_dev *edev) if (ret < 0) goto err_alloc_cables; - if (edev->max_supported && edev->mutually_exclusive) { - char *name; - - /* Count the size of mutually_exclusive array */ - for (index = 0; edev->mutually_exclusive[index]; index++) - ; - - edev->attrs_muex = kcalloc(index + 1, - sizeof(struct attribute *), - GFP_KERNEL); - if (!edev->attrs_muex) { - ret = -ENOMEM; - goto err_muex; - } - - edev->d_attrs_muex = kcalloc(index, - sizeof(struct device_attribute), - GFP_KERNEL); - if (!edev->d_attrs_muex) { - ret = -ENOMEM; - kfree(edev->attrs_muex); - goto err_muex; - } - - for (index = 0; edev->mutually_exclusive[index]; index++) { - name = kasprintf(GFP_KERNEL, "0x%x", - edev->mutually_exclusive[index]); - if (!name) { - for (index--; index >= 0; index--) { - kfree(edev->d_attrs_muex[index].attr. - name); - } - kfree(edev->d_attrs_muex); - kfree(edev->attrs_muex); - ret = -ENOMEM; - goto err_muex; - } - sysfs_attr_init(&edev->d_attrs_muex[index].attr); - edev->d_attrs_muex[index].attr.name = name; - edev->d_attrs_muex[index].attr.mode = 0000; - edev->attrs_muex[index] = &edev->d_attrs_muex[index] - .attr; - } - edev->attr_g_muex.name = muex_name; - edev->attr_g_muex.attrs = edev->attrs_muex; - - } + ret = extcon_alloc_muex(edev); + if (ret < 0) + goto err_alloc_muex; if (edev->max_supported) { edev->extcon_dev_type.groups = @@ -1292,7 +1302,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 = 0; index < edev->max_supported; index++) kfree(edev->cables[index].attr_g.name); if (edev->max_supported) From patchwork Thu Mar 2 09:01:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bumwoo Lee X-Patchwork-Id: 63283 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp4127647wrd; Thu, 2 Mar 2023 01:05:24 -0800 (PST) X-Google-Smtp-Source: AK7set85zVVa09XWc8SLur8pfUstXM3isEvrootJMxiLakxLxKE7AiUK2o4YnfbipfZNcPG3QMei X-Received: by 2002:a05:6a20:8e04:b0:ce:ca9:ab56 with SMTP id y4-20020a056a208e0400b000ce0ca9ab56mr8791554pzj.34.1677747924653; Thu, 02 Mar 2023 01:05:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677747924; cv=none; d=google.com; s=arc-20160816; b=dSqyV/o3rZCT954I6fFPcBOMYWVrBTRT3zu2W33PFdSx+rpk+GT6W+J5zi9CUo/UlT DZUp9CPZVFmwNr+Yd41x2rZZsNYCg60RD1NDYWEGtpH2IBuN3sb9G/Lai2Ipz+LGkdRY TEvZmc9XjIDcohTBBRWDhJUl7d89ge+1FR0qqMFYKdq4zRdIBCiLTzpathkzmCpX/NWF /2caJJ042FY+ifowG6gNRA6vhpUu9yttEX4/hVgjLcM5GHaRyHK8qxWe0lFhcHDb8BGN uIvJSx4DBhW6TmCGbnr1Ztf2oN6vmqpFVWTFli7ZCOdp9ZX0AwxHee8b7PydSbQVUzOh /csw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:dlp-filter:cms-type :content-transfer-encoding:mime-version:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=6DcQ0Jug42gkmSPVW+jMowJJ54RpvUbXthnGbsypBM4=; b=RCIX6RZUX+6VtzelN3rShPVbctUjSOcgbBzTF8x8hOz+EZvKEiUDSdGK1xBEwyavEM 9WFLHU6ZHmVQ3AhMtihGwZpojrcWwQhCs2QlBoCU7riMFhfOHyi6URyZx+9MQWY84zah KGJnILD8cPc/ISbUra6blF4Fut1oe+AW8pzfmcepBiS2TuQ+D/HoDWBRhxKMt10Z+4lE w6CebOBR5CVrQhX/UaVhLUFFU0xoj5F7IdqR3njYmElucVhrcHitlcmJH+5bdU9nh77Z udfC7T3LZBzDAJ7QhiI6e8s9fl5pGoluWetPL2kU5iDZY6UcEw3PuAs0Gv39iuuEfJQB I9qw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@samsung.com header.s=mail20170921 header.b=pQreRKQG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=samsung.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g65-20020a625244000000b0060bfd9834adsi1843743pfb.212.2023.03.02.01.05.11; Thu, 02 Mar 2023 01:05:24 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@samsung.com header.s=mail20170921 header.b=pQreRKQG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=samsung.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229872AbjCBJCU (ORCPT + 99 others); Thu, 2 Mar 2023 04:02:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37520 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229688AbjCBJCG (ORCPT ); Thu, 2 Mar 2023 04:02:06 -0500 Received: from mailout3.samsung.com (mailout3.samsung.com [203.254.224.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED2BC26878 for ; Thu, 2 Mar 2023 01:01:53 -0800 (PST) Received: from epcas1p1.samsung.com (unknown [182.195.41.45]) by mailout3.samsung.com (KnoxPortal) with ESMTP id 20230302090151epoutp031538d46fbf84e6798f503c674344ae68~Ijqd1KeeD1833818338epoutp03E for ; Thu, 2 Mar 2023 09:01:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout3.samsung.com 20230302090151epoutp031538d46fbf84e6798f503c674344ae68~Ijqd1KeeD1833818338epoutp03E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1677747711; bh=6DcQ0Jug42gkmSPVW+jMowJJ54RpvUbXthnGbsypBM4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pQreRKQGt2WMMBhofaNxG42uuhCIQ2MhAKGXm7h8pmKRZ7sLTwikxhh7MGIBax0gZ Um9j/rXpPfJfi9jMpUR2GUFEueWVzEnTtlRSiVgo2w6tf2ept3nh7DIZRzHHD0RWb5 Uv45USrGXp5dURYkH1R7etnGCiJVkzbkiw/RBBe8= Received: from epsnrtp1.localdomain (unknown [182.195.42.162]) by epcas1p1.samsung.com (KnoxPortal) with ESMTP id 20230302090150epcas1p174cb16f20311e5904e1afa45fbc03d04~IjqdhmHnq0635206352epcas1p1d; Thu, 2 Mar 2023 09:01:50 +0000 (GMT) Received: from epsmges1p5.samsung.com (unknown [182.195.38.247]) by epsnrtp1.localdomain (Postfix) with ESMTP id 4PS4q20bhXz4x9QN; Thu, 2 Mar 2023 09:01:50 +0000 (GMT) Received: from epcas1p3.samsung.com ( [182.195.41.47]) by epsmges1p5.samsung.com (Symantec Messaging Gateway) with SMTP id 65.CB.54823.DF560046; Thu, 2 Mar 2023 18:01:49 +0900 (KST) Received: from epsmtrp1.samsung.com (unknown [182.195.40.13]) by epcas1p3.samsung.com (KnoxPortal) with ESMTPA id 20230302090149epcas1p33a5cd34ed350301b547c2ac3914569d4~IjqcjAbTE0383503835epcas1p3P; Thu, 2 Mar 2023 09:01:49 +0000 (GMT) Received: from epsmgms1p2.samsung.com (unknown [182.195.42.42]) by epsmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230302090149epsmtrp1160764b2a7349b876aa2c53ab129ec7d~IjqciMo_n0666306663epsmtrp1w; Thu, 2 Mar 2023 09:01:49 +0000 (GMT) X-AuditID: b6c32a39-a97ff7000000d627-b4-640065fd3dad Received: from epsmtip2.samsung.com ( [182.195.34.31]) by epsmgms1p2.samsung.com (Symantec Messaging Gateway) with SMTP id 1D.2E.31821.DF560046; Thu, 2 Mar 2023 18:01:49 +0900 (KST) Received: from VDBS1418.vd.sec.samsung.net (unknown [168.219.244.30]) by epsmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230302090149epsmtip2cac8c43d983d9d26f18f1a83086fd80b~IjqcY8Ogq0723807238epsmtip2E; Thu, 2 Mar 2023 09:01:49 +0000 (GMT) From: Bumwoo Lee To: MyungJoo Ham , Chanwoo Choi , linux-kernel@vger.kernel.org Cc: Bumwoo Lee Subject: [PATCH v4 4/4] extcon: Added extcon_alloc_groups to simplify extcon register function Date: Thu, 2 Mar 2023 18:01:43 +0900 Message-Id: <20230302090143.46678-5-bw365.lee@samsung.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230302090143.46678-1-bw365.lee@samsung.com> MIME-Version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrLKsWRmVeSWpSXmKPExsWy7bCmvu7fVIYUg9n3zS1OrFnEZHH9y3NW i8u75rBZ3G5cwebA4tG3ZRWjx+dNcgFMUdk2GamJKalFCql5yfkpmXnptkrewfHO8aZmBoa6 hpYW5koKeYm5qbZKLj4Bum6ZOUCLlBTKEnNKgUIBicXFSvp2NkX5pSWpChn5xSW2SqkFKTkF ZgV6xYm5xaV56Xp5qSVWhgYGRqZAhQnZGU0npQqmCFdcbm1la2B8xd/FyMkhIWAiceHhB7Yu Ri4OIYEdjBJnVqyCcj4xSqxafIsdwvnMKHH952kWmJbtLxqZIRK7GCVObFgD1fKLUWLb71Y2 kCo2AQ2JPRcbgGwODhGBQonD/dkgYWYBNYkHqzayg9jCAgkSHf87wcpZBFQllq96xQxi8wpY Sdx9fZYRYpm8RPe/P2CLOQWsJd5M7mKBqBGUODnzCQvETHmJ5q2zwQ6SENjFLvHs9XSoZheJ q09vMUHYwhKvjm9hh7ClJF72t0HZ6RIrr9yBsnMkXt9vh+o1lnj3di0zyP3MApoS63fpQ4QV JXb+nssIsZdP4t3XHlaQEgkBXomONiGIEmWJ7gcvoLZKSix+egdqoodE070eRkhQ9TFK/H3+ mWUCo8IsJO/MQvLOLITNCxiZVzGKpRYU56anFhsWmMIjODk/dxMjON1pWe5gnP72g94hRiYO xkOMEhzMSiK8C2//SRbiTUmsrEotyo8vKs1JLT7EaAoM7InMUqLJ+cCEm1cSb2hiaWBiZmRi YWxpbKYkzituezJZSCA9sSQ1OzW1ILUIpo+Jg1OqgckmtKQ644gyf6LcHevYf6ZVf/1TlrGc LTU+9+Oqdf1HQ753J+4IbOcXNNDdJb2t40G93Mqd7Jtar2c5660zmp2T3hezf3eHwJcjM18G /jNQffLjvOA9d/eLExlqLTbkFPNfmDhhr5GboGelcKvqU4lbr9geCPYw7A7snys+mSd205r8 tiVhSobe216G8pb5eu52Kn0wcWPv0g/V11/E/1mw8HZauhbT4ia+A2buWmbHV5ScfmzV8Ctq ffH9AMPl0/Lnnfy+UqY9le9Fmeb20r17J76yb9nnqX1OPPFi94uz3m3drC6FU3rfCPT1rNn/ 8afve/7o6EUbPkfZn32peunYo3+Hf+qtUC0vXeKvWKLEUpyRaKjFXFScCABfesZqAAQAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrOLMWRmVeSWpSXmKPExsWy7bCSvO7fVIYUg1VbVCxOrFnEZHH9y3NW i8u75rBZ3G5cwebA4tG3ZRWjx+dNcgFMUVw2Kak5mWWpRfp2CVwZTSelCqYIV1xubWVrYHzF 38XIySEhYCKx/UUjcxcjF4eQwA5GiasH7jBBJCQlzi5/xN7FyAFkC0scPlwMUfODUeLro0WM IDVsAhoSey42sIHYIgLFEhcOLGYBsZkF1CQerNrIDmILC8RJnLjyEmwmi4CqxPJVr5hBbF4B K4m7r88yQuySl+j+9wesl1PAWuLN5C4wWwioZvqrfSwQ9YISJ2c+gZovL9G8dTbzBEaBWUhS s5CkFjAyrWKUTC0ozk3PLTYsMMpLLdcrTswtLs1L10vOz93ECA5LLa0djHtWfdA7xMjEwXiI UYKDWUmEd+HtP8lCvCmJlVWpRfnxRaU5qcWHGKU5WJTEeS90nYwXEkhPLEnNTk0tSC2CyTJx cEo1MF3cFN1z4dcmlisv9lSEX7ybl38+l4dNJmx22WqeiNd9sVGKa1q8/AN17bbfjNg6/csC gbNrk36+qJEX4BFZmTdJsqf9msVK8/fTIjdfiiiyfGMqYNc3e73g3bviWROTm7WWFCl8eM2y Pi5GpqwyadXv+U0Hw2/vmlksyBhoGFfzZpLpuox/30VuxS5wna4597PX0/8Gl936Jr6N/X/D Ks27zTGpI/2ewLnLX52kP8lw3PzbkNbnf+uPl1pN7MPd9/STLXI+7gzdt+jTFd+kmcaPpcIu Jj7u5vTkzJTaeCTAvTkocVb5Ua3ou54V2nc4DuT6PT4b4/2wsbDr54lNW959YZtikej6apb4 VX3u90osxRmJhlrMRcWJAAcaYsy6AgAA X-CMS-MailID: 20230302090149epcas1p33a5cd34ed350301b547c2ac3914569d4 X-Msg-Generator: CA X-Sendblock-Type: SVC_REQ_APPROVE CMS-TYPE: 101P DLP-Filter: Pass X-CFilter-Loop: Reflected X-CMS-RootMailID: 20230302090149epcas1p33a5cd34ed350301b547c2ac3914569d4 References: <20230302090143.46678-1-bw365.lee@samsung.com> X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759246207998877032?= X-GMAIL-MSGID: =?utf-8?q?1759246207998877032?= The alloc groups is functionalized from extcon_dev_register. Signed-off-by: Bumwoo Lee --- drivers/extcon/extcon.c | 58 +++++++++++++++++++++++++---------------- 1 file changed, 36 insertions(+), 22 deletions(-) diff --git a/drivers/extcon/extcon.c b/drivers/extcon/extcon.c index 321988231806..c366a7988daf 100644 --- a/drivers/extcon/extcon.c +++ b/drivers/extcon/extcon.c @@ -1181,6 +1181,39 @@ static int extcon_alloc_muex(struct extcon_dev *edev) return 0; } +/** + * 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->max_supported) + return 0; + + edev->extcon_dev_type.groups = kcalloc(edev->max_supported + 2, + sizeof(struct attribute_group *), + GFP_KERNEL); + if (!edev->extcon_dev_type.groups) + return -ENOMEM; + + edev->extcon_dev_type.name = dev_name(&edev->dev); + edev->extcon_dev_type.release = dummy_sysfs_dev_release; + + for (index = 0; index < edev->max_supported; index++) + edev->extcon_dev_type.groups[index] = &edev->cables[index].attr_g; + + if (edev->mutually_exclusive) + edev->extcon_dev_type.groups[index] = &edev->attr_g_muex; + + edev->dev.type = &edev->extcon_dev_type; + + return 0; +} + /** * extcon_dev_register() - Register an new extcon device * @edev: the extcon device to be registered @@ -1236,28 +1269,9 @@ int extcon_dev_register(struct extcon_dev *edev) if (ret < 0) goto err_alloc_muex; - if (edev->max_supported) { - edev->extcon_dev_type.groups = - kcalloc(edev->max_supported + 2, - sizeof(struct attribute_group *), - GFP_KERNEL); - if (!edev->extcon_dev_type.groups) { - ret = -ENOMEM; - goto err_alloc_groups; - } - - edev->extcon_dev_type.name = dev_name(&edev->dev); - edev->extcon_dev_type.release = dummy_sysfs_dev_release; - - for (index = 0; index < edev->max_supported; index++) - edev->extcon_dev_type.groups[index] = - &edev->cables[index].attr_g; - if (edev->mutually_exclusive) - edev->extcon_dev_type.groups[index] = - &edev->attr_g_muex; - - edev->dev.type = &edev->extcon_dev_type; - } + ret = extcon_alloc_groups(edev); + if (ret < 0) + goto err_alloc_groups; spin_lock_init(&edev->lock); if (edev->max_supported) {