From: frowand.list@gmail.com
To: Rob Herring <robh+dt@kernel.org>,
Pantelis Antoniou <pantelis.antoniou@konsulko.com>,
Michael Ellerman <mpe@ellerman.id.au>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>, Alan Tull <atull@kernel.org>,
Moritz Fischer <mdf@kernel.org>
Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
devicetree@vger.kernel.org, linux-fpga@vger.kernel.org
Subject: [PATCH v2 07/18] of: dynamic: change type of of_{at,de}tach_node() to void
Date: Fri, 12 Oct 2018 21:53:27 -0700 [thread overview]
Message-ID: <1539406418-18162-8-git-send-email-frowand.list@gmail.com> (raw)
In-Reply-To: <1539406418-18162-1-git-send-email-frowand.list@gmail.com>
From: Frank Rowand <frank.rowand@sony.com>
of_attach_node() and of_detach_node() always return zero, so
their return value is meaningless. Change their type to void
and fix all callers to ignore return value.
Signed-off-by: Frank Rowand <frank.rowand@sony.com>
---
arch/powerpc/platforms/pseries/dlpar.c | 13 ++-----------
arch/powerpc/platforms/pseries/reconfig.c | 6 +-----
drivers/of/dynamic.c | 9 ++-------
include/linux/of.h | 4 ++--
4 files changed, 7 insertions(+), 25 deletions(-)
diff --git a/arch/powerpc/platforms/pseries/dlpar.c b/arch/powerpc/platforms/pseries/dlpar.c
index e3010b14aea5..0027eea94a8b 100644
--- a/arch/powerpc/platforms/pseries/dlpar.c
+++ b/arch/powerpc/platforms/pseries/dlpar.c
@@ -244,15 +244,9 @@ struct device_node *dlpar_configure_connector(__be32 drc_index,
int dlpar_attach_node(struct device_node *dn, struct device_node *parent)
{
- int rc;
-
dn->parent = parent;
- rc = of_attach_node(dn);
- if (rc) {
- printk(KERN_ERR "Failed to add device node %pOF\n", dn);
- return rc;
- }
+ of_attach_node(dn);
return 0;
}
@@ -260,7 +254,6 @@ int dlpar_attach_node(struct device_node *dn, struct device_node *parent)
int dlpar_detach_node(struct device_node *dn)
{
struct device_node *child;
- int rc;
child = of_get_next_child(dn, NULL);
while (child) {
@@ -268,9 +261,7 @@ int dlpar_detach_node(struct device_node *dn)
child = of_get_next_child(dn, child);
}
- rc = of_detach_node(dn);
- if (rc)
- return rc;
+ of_detach_node(dn);
of_node_put(dn);
diff --git a/arch/powerpc/platforms/pseries/reconfig.c b/arch/powerpc/platforms/pseries/reconfig.c
index 0e0208117e77..0b72098da454 100644
--- a/arch/powerpc/platforms/pseries/reconfig.c
+++ b/arch/powerpc/platforms/pseries/reconfig.c
@@ -47,11 +47,7 @@ static int pSeries_reconfig_add_node(const char *path, struct property *proplist
goto out_err;
}
- err = of_attach_node(np);
- if (err) {
- printk(KERN_ERR "Failed to add device node %s\n", path);
- goto out_err;
- }
+ of_attach_node(np);
of_node_put(np->parent);
diff --git a/drivers/of/dynamic.c b/drivers/of/dynamic.c
index 275c0d7e2268..5f7c99b9de0d 100644
--- a/drivers/of/dynamic.c
+++ b/drivers/of/dynamic.c
@@ -224,7 +224,7 @@ static void __of_attach_node(struct device_node *np)
/**
* of_attach_node() - Plug a device node into the tree and global list.
*/
-int of_attach_node(struct device_node *np)
+void of_attach_node(struct device_node *np)
{
struct of_reconfig_data rd;
unsigned long flags;
@@ -241,8 +241,6 @@ int of_attach_node(struct device_node *np)
mutex_unlock(&of_mutex);
of_reconfig_notify(OF_RECONFIG_ATTACH_NODE, &rd);
-
- return 0;
}
void __of_detach_node(struct device_node *np)
@@ -273,11 +271,10 @@ void __of_detach_node(struct device_node *np)
/**
* of_detach_node() - "Unplug" a node from the device tree.
*/
-int of_detach_node(struct device_node *np)
+void of_detach_node(struct device_node *np)
{
struct of_reconfig_data rd;
unsigned long flags;
- int rc = 0;
memset(&rd, 0, sizeof(rd));
rd.dn = np;
@@ -291,8 +288,6 @@ int of_detach_node(struct device_node *np)
mutex_unlock(&of_mutex);
of_reconfig_notify(OF_RECONFIG_DETACH_NODE, &rd);
-
- return rc;
}
EXPORT_SYMBOL_GPL(of_detach_node);
diff --git a/include/linux/of.h b/include/linux/of.h
index aa1dafaec6ae..72c593455019 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -406,8 +406,8 @@ extern int of_phandle_iterator_args(struct of_phandle_iterator *it,
#define OF_RECONFIG_REMOVE_PROPERTY 0x0004
#define OF_RECONFIG_UPDATE_PROPERTY 0x0005
-extern int of_attach_node(struct device_node *);
-extern int of_detach_node(struct device_node *);
+extern void of_attach_node(struct device_node *np);
+extern void of_detach_node(struct device_node *np);
#define of_match_ptr(_ptr) (_ptr)
--
Frank Rowand <frank.rowand@sony.com>
next prev parent reply other threads:[~2018-10-13 4:55 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-13 4:53 [PATCH v2 00/18] of: overlay: validation checks, subsequent fixes frowand.list
2018-10-13 4:53 ` [PATCH v2 01/18] of: overlay: add tests to validate kfrees from overlay removal frowand.list
2018-10-13 4:53 ` [PATCH v2 02/18] of: overlay: add missing of_node_put() after add new node to changeset frowand.list
2018-10-13 4:53 ` [PATCH v2 03/18] of: overlay: add missing of_node_get() in __of_attach_node_sysfs frowand.list
2018-10-13 4:53 ` [PATCH v2 04/18] powerpc/pseries: add of_node_put() in dlpar_detach_node() frowand.list
2018-10-13 4:53 ` [PATCH v2 05/18] of: overlay: use prop add changeset entry for property in new nodes frowand.list
2018-10-13 4:53 ` [PATCH v2 06/18] of: overlay: do not duplicate properties from overlay for " frowand.list
2018-10-13 4:53 ` frowand.list [this message]
2018-10-13 4:53 ` [PATCH v2 08/18] of: overlay: reorder fields in struct fragment frowand.list
2018-10-13 4:53 ` [PATCH v2 09/18] of: overlay: validate overlay properties #address-cells and #size-cells frowand.list
2018-10-13 4:53 ` [PATCH v2 10/18] of: overlay: make all pr_debug() and pr_err() messages unique frowand.list
2018-10-13 4:53 ` [PATCH v2 11/18] of: overlay: test case of two fragments adding same node frowand.list
2018-10-13 4:53 ` [PATCH v2 12/18] of: overlay: check prevents multiple fragments add or delete " frowand.list
2018-10-13 12:51 ` Joe Perches
2018-10-13 18:21 ` Frank Rowand
2018-10-15 0:29 ` Frank Rowand
2018-10-13 4:53 ` [PATCH v2 13/18] of: overlay: check prevents multiple fragments touching same property frowand.list
2018-10-13 4:53 ` [PATCH v2 14/18] of: unittest: remove unused of_unittest_apply_overlay() argument frowand.list
2018-10-13 4:53 ` [PATCH v2 15/18] of: overlay: set node fields from properties when add new overlay node frowand.list
2018-10-13 4:53 ` [PATCH v2 16/18] of: unittest: allow base devicetree to have symbol metadata frowand.list
2018-10-13 4:53 ` [PATCH v2 17/18] of: unittest: find overlays[] entry by name instead of index frowand.list
2018-10-13 4:53 ` [PATCH v2 18/18] of: unittest: initialize args before calling of_*parse_*() frowand.list
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=1539406418-18162-8-git-send-email-frowand.list@gmail.com \
--to=frowand.list@gmail.com \
--cc=atull@kernel.org \
--cc=benh@kernel.crashing.org \
--cc=devicetree@vger.kernel.org \
--cc=linux-fpga@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mdf@kernel.org \
--cc=mpe@ellerman.id.au \
--cc=pantelis.antoniou@konsulko.com \
--cc=paulus@samba.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;
as well as URLs for NNTP newsgroup(s).