From: Bumwoo Lee <bw365.lee@samsung.com>
To: MyungJoo Ham <myungjoo.ham@samsung.com>,
Chanwoo Choi <cw00.choi@samsung.com>,
linux-kernel@vger.kernel.org
Cc: Bumwoo Lee <bw365.lee@samsung.com>
Subject: [PATCH 3/4] extcon: added extcon_alloc_muex to simplify extcon register function
Date: Fri, 17 Feb 2023 17:46:12 +0900 [thread overview]
Message-ID: <20230217084613.25359-4-bw365.lee@samsung.com> (raw)
In-Reply-To: <20230217084613.25359-1-bw365.lee@samsung.com>
The mutual exclusive part is functionalized from extcon_dev_register.
Signed-off-by: Bumwoo Lee <bw365.lee@samsung.com>
---
drivers/extcon/extcon.c | 105 ++++++++++++++++++++++------------------
1 file changed, 57 insertions(+), 48 deletions(-)
diff --git a/drivers/extcon/extcon.c b/drivers/extcon/extcon.c
index 28058a1d2745..93cab4fe178e 100644
--- a/drivers/extcon/extcon.c
+++ b/drivers/extcon/extcon.c
@@ -1125,6 +1125,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
@@ -1175,53 +1229,8 @@ int extcon_dev_register(struct extcon_dev *edev)
if (extcon_alloc_cables(edev))
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;
-
- }
+ if (extcon_alloc_muex(edev))
+ goto err_alloc_muex;
if (edev->max_supported) {
edev->extcon_dev_type.groups =
@@ -1289,7 +1298,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);
err_alloc_cables:
--
2.35.1
next prev parent reply other threads:[~2023-02-17 8:48 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20230217084732epcas1p29956bd24132b13b21923afd2563bf3dd@epcas1p2.samsung.com>
2023-02-17 8:46 ` [PATCH 0/4] simplify extcon_dev_register function Bumwoo Lee
[not found] ` <CGME20230217084803epcas1p12b708d8119263cef2233d652062ba3d1@epcas1p1.samsung.com>
2023-02-17 8:46 ` [PATCH 1/4] extcon: remove redundant null checking for class Bumwoo Lee
[not found] ` <CGME20230217084803epcas1p29ef858c842b18de89f1b034acb26086a@epcas1p2.samsung.com>
2023-02-17 8:46 ` [PATCH 2/4] extcon: added extcon_alloc_cables to simplify extcon register function Bumwoo Lee
[not found] ` <CGME20230217084803epcas1p2d5e3ca2fbadd5fde7f58a8ae1940d53f@epcas1p2.samsung.com>
2023-02-17 8:46 ` Bumwoo Lee [this message]
[not found] ` <CGME20230217084803epcas1p17f034701f5bf98ef2650f2ec27cd2d35@epcas1p1.samsung.com>
2023-02-17 8:46 ` [PATCH 4/4] extcon: added extcon_alloc_groups " Bumwoo Lee
[not found] ` <CGME20230217084803epcas1p2d5e3ca2fbadd5fde7f58a8ae1940d53f@epcms1p6>
2023-02-20 4:36 ` [PATCH 3/4] extcon: added extcon_alloc_muex " MyungJoo Ham
[not found] ` <CGME20230217084803epcas1p29ef858c842b18de89f1b034acb26086a@epcms1p7>
2023-02-20 4:38 ` [PATCH 2/4] extcon: added extcon_alloc_cables " MyungJoo Ham
2023-02-20 4:57 ` Bumwoo Lee
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230217084613.25359-4-bw365.lee@samsung.com \
--to=bw365.lee@samsung.com \
--cc=cw00.choi@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=myungjoo.ham@samsung.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®