From: Sakari Ailus <sakari.ailus@linux.intel.com>
To: Petr Mladek <pmladek@suse.com>,
linux-kernel@vger.kernel.org, rafael@kernel.org
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
linux-acpi@vger.kernel.org, devicetree@vger.kernel.org,
Rob Herring <robh@kernel.org>,
Heikki Krogerus <heikki.krogerus@linux.intel.com>,
Joe Perches <joe@perches.com>
Subject: [PATCH v6 10/12] lib/vsprintf: OF nodes are first and foremost, struct device_nodes
Date: Tue, 10 Sep 2019 11:47:05 +0300 [thread overview]
Message-ID: <20190910084707.18380-11-sakari.ailus@linux.intel.com> (raw)
In-Reply-To: <20190910084707.18380-1-sakari.ailus@linux.intel.com>
Factor out static kobject_string() function that simply calls
device_node_string(), and thus remove references to kobjects (as these are
struct device_node).
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Petr Mladek <pmladek@suse.com>
---
lib/vsprintf.c | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 7a0006e0c3896..9c5b398d4a512 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -1906,6 +1906,9 @@ char *device_node_string(char *buf, char *end, struct device_node *dn,
struct printf_spec str_spec = spec;
str_spec.field_width = -1;
+ if (fmt[0] != 'F')
+ return error_string(buf, end, "(%pO?)", spec);
+
if (!IS_ENABLED(CONFIG_OF))
return error_string(buf, end, "(%pOF?)", spec);
@@ -1979,17 +1982,6 @@ char *device_node_string(char *buf, char *end, struct device_node *dn,
return widen_string(buf, buf - buf_start, end, spec);
}
-static char *kobject_string(char *buf, char *end, void *ptr,
- struct printf_spec spec, const char *fmt)
-{
- switch (fmt[1]) {
- case 'F':
- return device_node_string(buf, end, ptr, spec, fmt + 1);
- }
-
- return error_string(buf, end, "(%pO?)", spec);
-}
-
/*
* Show a '%p' thing. A kernel extension is that the '%p' is followed
* by an extra set of alphanumeric characters that are extended format
@@ -2168,7 +2160,7 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
case 'G':
return flags_string(buf, end, ptr, spec, fmt);
case 'O':
- return kobject_string(buf, end, ptr, spec, fmt);
+ return device_node_string(buf, end, ptr, spec, fmt + 1);
case 'x':
return pointer_string(buf, end, ptr, spec);
}
--
2.20.1
next prev parent reply other threads:[~2019-09-10 8:47 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-10 8:46 [PATCH v6 00/12] Device property improvements, add %pfw format specifier Sakari Ailus
2019-09-10 8:46 ` [PATCH v6 01/12] tools lib traceevent: Convert remaining %p[fF] users to %p[sS] Sakari Ailus
2019-09-10 9:22 ` Andy Shevchenko
2019-09-10 11:18 ` Steven Rostedt
2019-09-10 17:18 ` Joe Perches
2019-09-10 18:26 ` Steven Rostedt
2019-09-10 18:42 ` Joe Perches
2019-09-10 19:03 ` Steven Rostedt
2019-09-10 19:44 ` Joe Perches
2019-09-16 11:41 ` Sakari Ailus
2019-09-16 14:37 ` Steven Rostedt
2019-09-18 13:08 ` Sakari Ailus
2019-09-10 8:46 ` [PATCH v6 02/12] software node: Get reference to parent swnode in get_parent op Sakari Ailus
2019-09-10 8:46 ` [PATCH v6 03/12] software node: Make argument to to_software_node const Sakari Ailus
2019-09-10 8:46 ` [PATCH v6 04/12] device property: Move fwnode_get_parent() up Sakari Ailus
2019-09-10 8:47 ` [PATCH v6 05/12] device property: Add functions for accessing node's parents Sakari Ailus
2019-09-10 8:47 ` [PATCH v6 06/12] device property: Add fwnode_get_name for returning the name of a node Sakari Ailus
2019-09-10 8:47 ` [PATCH v6 07/12] device property: Add a function to obtain a node's prefix Sakari Ailus
2019-09-10 8:47 ` [PATCH v6 08/12] lib/vsprintf: Remove support for %pF and %pf in favour of %pS and %ps Sakari Ailus
2019-09-10 8:47 ` [PATCH v6 09/12] lib/vsprintf: Make use of fwnode API to obtain node names and separators Sakari Ailus
2019-09-10 8:47 ` Sakari Ailus [this message]
2019-09-10 8:47 ` [PATCH v6 11/12] lib/vsprintf: Add %pfw conversion specifier for printing fwnode names Sakari Ailus
2019-09-10 10:21 ` Joe Perches
2019-09-18 13:11 ` Sakari Ailus
2019-09-10 8:47 ` [PATCH v6 12/12] lib/test_printf: Add tests for %pfw printk modifier Sakari Ailus
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=20190910084707.18380-11-sakari.ailus@linux.intel.com \
--to=sakari.ailus@linux.intel.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=devicetree@vger.kernel.org \
--cc=heikki.krogerus@linux.intel.com \
--cc=joe@perches.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pmladek@suse.com \
--cc=rafael@kernel.org \
--cc=robh@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.