From: Zev Weiss <zev@bewilderbeest.net>
To: openbmc@lists.ozlabs.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Jeremy Kerr <jk@codeconstruct.com.au>,
Joel Stanley <joel@jms.id.au>, Rob Herring <robh+dt@kernel.org>,
devicetree@vger.kernel.org, Zev Weiss <zev@bewilderbeest.net>,
Frank Rowand <frowand.list@gmail.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH 4/9] of: add self parameter to __of_sysfs_remove_bin_file()
Date: Wed, 6 Oct 2021 17:09:49 -0700 [thread overview]
Message-ID: <20211007000954.30621-5-zev@bewilderbeest.net> (raw)
In-Reply-To: <20211007000954.30621-1-zev@bewilderbeest.net>
This allows using the function to remove a bin_attribute from that
attribute's own methods (by calling sysfs_remove_bin_file_self()
instead of sysfs_remove_bin_file()).
Signed-off-by: Zev Weiss <zev@bewilderbeest.net>
---
drivers/of/kobj.c | 13 ++++++++-----
drivers/of/of_private.h | 2 +-
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/drivers/of/kobj.c b/drivers/of/kobj.c
index 6675b5e56960..06d6c90f7aa1 100644
--- a/drivers/of/kobj.c
+++ b/drivers/of/kobj.c
@@ -84,12 +84,15 @@ int __of_add_property_sysfs(struct device_node *np, struct property *pp)
return rc;
}
-void __of_sysfs_remove_bin_file(struct device_node *np, struct property *prop)
+void __of_sysfs_remove_bin_file(struct device_node *np, struct property *prop, bool self)
{
if (!IS_ENABLED(CONFIG_SYSFS))
return;
- sysfs_remove_bin_file(&np->kobj, &prop->attr);
+ if (self)
+ sysfs_remove_bin_file_self(&np->kobj, &prop->attr);
+ else
+ sysfs_remove_bin_file(&np->kobj, &prop->attr);
kfree(prop->attr.attr.name);
}
@@ -97,7 +100,7 @@ void __of_remove_property_sysfs(struct device_node *np, struct property *prop)
{
/* at early boot, bail here and defer setup to of_init() */
if (of_kset && of_node_is_attached(np))
- __of_sysfs_remove_bin_file(np, prop);
+ __of_sysfs_remove_bin_file(np, prop, false);
}
void __of_update_property_sysfs(struct device_node *np, struct property *newprop,
@@ -108,7 +111,7 @@ void __of_update_property_sysfs(struct device_node *np, struct property *newprop
return;
if (oldprop)
- __of_sysfs_remove_bin_file(np, oldprop);
+ __of_sysfs_remove_bin_file(np, oldprop, false);
__of_add_property_sysfs(np, newprop);
}
@@ -157,7 +160,7 @@ void __of_detach_node_sysfs(struct device_node *np)
/* only remove properties if on sysfs */
if (of_node_is_attached(np)) {
for_each_property_of_node(np, pp)
- __of_sysfs_remove_bin_file(np, pp);
+ __of_sysfs_remove_bin_file(np, pp, false);
kobject_del(&np->kobj);
}
diff --git a/drivers/of/of_private.h b/drivers/of/of_private.h
index 75e67b8bb826..fff157c63907 100644
--- a/drivers/of/of_private.h
+++ b/drivers/of/of_private.h
@@ -134,7 +134,7 @@ extern int __of_update_property(struct device_node *np,
extern void __of_detach_node(struct device_node *np);
extern void __of_sysfs_remove_bin_file(struct device_node *np,
- struct property *prop);
+ struct property *prop, bool selfremove);
/* illegal phandle value (set when unresolved) */
#define OF_PHANDLE_ILLEGAL 0xdeadbeef
--
2.33.0
next prev parent reply other threads:[~2021-10-07 0:10 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-07 0:09 [PATCH 0/9] Dynamic DT device nodes Zev Weiss
2021-10-07 0:09 ` [PATCH 1/9] sysfs: add sysfs_remove_bin_file_self() function Zev Weiss
2021-10-07 5:23 ` Greg Kroah-Hartman
2021-10-07 5:58 ` Zev Weiss
2021-10-07 6:12 ` Greg Kroah-Hartman
2021-10-07 6:55 ` Zev Weiss
2021-10-07 0:09 ` [PATCH 2/9] sysfs: add growable flag to struct bin_attribute Zev Weiss
2021-10-07 0:09 ` [PATCH 3/9] lib/string: add sysfs_buf_streq() Zev Weiss
2021-10-07 0:09 ` Zev Weiss [this message]
2021-10-07 5:25 ` [PATCH 4/9] of: add self parameter to __of_sysfs_remove_bin_file() Greg Kroah-Hartman
2021-10-07 0:09 ` [PATCH 5/9] of: add self parameter to of_update_property() Zev Weiss
2021-10-07 5:26 ` Greg Kroah-Hartman
2021-10-07 0:09 ` [PATCH 6/9] of: add support for 'dynamic' DT property Zev Weiss
2021-10-08 18:51 ` Frank Rowand
2021-10-08 19:19 ` Frank Rowand
2021-10-11 13:58 ` Frank Rowand
2021-10-11 14:46 ` Frank Rowand
2021-10-11 17:35 ` Zev Weiss
2021-10-07 0:09 ` [PATCH 7/9] of: make OF_DYNAMIC selectable independently of OF_UNITTEST Zev Weiss
2021-10-08 19:01 ` Frank Rowand
2021-10-07 0:09 ` [PATCH 8/9] dt-bindings: document new 'dynamic' common property Zev Weiss
2021-10-07 5:26 ` Greg Kroah-Hartman
2021-10-07 6:03 ` Zev Weiss
2021-10-07 0:09 ` [PATCH 9/9] ARM: dts: aspeed: Add e3c246d4i BIOS flash device Zev Weiss
2021-10-07 2:46 ` [PATCH 0/9] Dynamic DT device nodes Florian Fainelli
2021-10-07 5:44 ` Zev Weiss
2021-10-07 7:04 ` Andy Shevchenko
2021-10-07 9:05 ` Zev Weiss
2021-10-07 10:31 ` Greg Kroah-Hartman
2021-10-07 15:41 ` Zev Weiss
2021-10-07 20:03 ` Rob Herring
2021-10-08 5:41 ` Greg Kroah-Hartman
2021-10-08 19:43 ` Frank Rowand
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=20211007000954.30621-5-zev@bewilderbeest.net \
--to=zev@bewilderbeest.net \
--cc=devicetree@vger.kernel.org \
--cc=frowand.list@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=jk@codeconstruct.com.au \
--cc=joel@jms.id.au \
--cc=linux-kernel@vger.kernel.org \
--cc=openbmc@lists.ozlabs.org \
--cc=robh+dt@kernel.org \
/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®