From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Sakari Ailus <sakari.ailus@linux.intel.com>,
Heikki Krogerus <heikki.krogerus@linux.intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Bjorn Andersson <andersson@kernel.org>,
Prashant Malani <pmalani@chromium.org>,
linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-usb@vger.kernel.org
Cc: Daniel Scally <djrscally@gmail.com>,
"Rafael J. Wysocki" <rafael@kernel.org>
Subject: [PATCH v2 1/5] device property: Keep dev_fwnode() and dev_fwnode_const() separate
Date: Wed, 28 Sep 2022 13:57:42 +0300 [thread overview]
Message-ID: <20220928105746.51208-2-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20220928105746.51208-1-andriy.shevchenko@linux.intel.com>
It's not fully correct to take a const parameter pointer to a struct
and return a non-const pointer to a member of that struct.
Instead, introduce a const version of the dev_fwnode() API which takes
and returns const pointers and use it where it's applicable.
Suggested-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Fixes: aade55c86033 ("device property: Add const qualifier to device_get_match_data() parameter")
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
drivers/base/property.c | 11 +++++++++--
include/linux/property.h | 3 ++-
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/drivers/base/property.c b/drivers/base/property.c
index 4d6278a84868..699f1b115e0a 100644
--- a/drivers/base/property.c
+++ b/drivers/base/property.c
@@ -17,13 +17,20 @@
#include <linux/property.h>
#include <linux/phy.h>
-struct fwnode_handle *dev_fwnode(const struct device *dev)
+struct fwnode_handle *dev_fwnode(struct device *dev)
{
return IS_ENABLED(CONFIG_OF) && dev->of_node ?
of_fwnode_handle(dev->of_node) : dev->fwnode;
}
EXPORT_SYMBOL_GPL(dev_fwnode);
+const struct fwnode_handle *dev_fwnode_const(const struct device *dev)
+{
+ return IS_ENABLED(CONFIG_OF) && dev->of_node ?
+ of_fwnode_handle(dev->of_node) : dev->fwnode;
+}
+EXPORT_SYMBOL_GPL(dev_fwnode_const);
+
/**
* device_property_present - check if a property of a device is present
* @dev: Device whose property is being checked
@@ -1202,7 +1209,7 @@ EXPORT_SYMBOL(fwnode_graph_parse_endpoint);
const void *device_get_match_data(const struct device *dev)
{
- return fwnode_call_ptr_op(dev_fwnode(dev), device_get_match_data, dev);
+ return fwnode_call_ptr_op(dev_fwnode_const(dev), device_get_match_data, dev);
}
EXPORT_SYMBOL_GPL(device_get_match_data);
diff --git a/include/linux/property.h b/include/linux/property.h
index 117cc200c656..ae5d7f8eccf4 100644
--- a/include/linux/property.h
+++ b/include/linux/property.h
@@ -32,7 +32,8 @@ enum dev_dma_attr {
DEV_DMA_COHERENT,
};
-struct fwnode_handle *dev_fwnode(const struct device *dev);
+struct fwnode_handle *dev_fwnode(struct device *dev);
+const struct fwnode_handle *dev_fwnode_const(const struct device *dev);
bool device_property_present(struct device *dev, const char *propname);
int device_property_read_u8_array(struct device *dev, const char *propname,
--
2.35.1
next prev parent reply other threads:[~2022-09-28 10:59 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-28 10:57 [PATCH v2 0/5] device property: Consitify a few APIs and correct dev_fwnode() Andy Shevchenko
2022-09-28 10:57 ` Andy Shevchenko [this message]
2022-09-28 11:05 ` [PATCH v2 1/5] device property: Keep dev_fwnode() and dev_fwnode_const() separate Greg Kroah-Hartman
2022-09-30 14:30 ` Sakari Ailus
2022-09-30 14:43 ` Greg Kroah-Hartman
2022-10-03 11:02 ` Sakari Ailus
2022-10-03 15:07 ` Greg Kroah-Hartman
2022-10-03 16:17 ` Greg Kroah-Hartman
2022-10-03 20:08 ` Sakari Ailus
2022-10-04 7:55 ` Greg Kroah-Hartman
2022-10-04 8:14 ` Andy Shevchenko
2022-10-04 8:24 ` Greg Kroah-Hartman
2022-10-04 8:25 ` Andy Shevchenko
2022-10-04 9:21 ` Andy Shevchenko
2022-10-04 9:15 ` Sakari Ailus
2022-10-03 11:54 ` Rafael J. Wysocki
2022-10-03 12:00 ` Sakari Ailus
2022-10-03 15:05 ` Greg Kroah-Hartman
2022-09-28 10:57 ` [PATCH v2 2/5] device property: Constify fwnode connection match APIs Andy Shevchenko
2022-09-28 10:57 ` [PATCH v2 3/5] device property: Constify parameter in fwnode_graph_is_endpoint() Andy Shevchenko
2022-09-28 10:57 ` [PATCH v2 4/5] device property: Constify device child node APIs Andy Shevchenko
2022-09-28 10:57 ` [PATCH v2 5/5] device property: Constify parameter in device_dma_supported() and device_get_dma_attr() Andy Shevchenko
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=20220928105746.51208-2-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=andersson@kernel.org \
--cc=djrscally@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=heikki.krogerus@linux.intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=pmalani@chromium.org \
--cc=rafael@kernel.org \
--cc=sakari.ailus@linux.intel.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;
as well as URLs for NNTP newsgroup(s).