From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
"Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>,
Raul E Rangel <rrangel@chromium.org>,
Wolfram Sang <wsa@kernel.org>,
linux-kernel@vger.kernel.org, linux-i2c@vger.kernel.org,
linux-usb@vger.kernel.org
Cc: Robin van der Gracht <robin@protonic.nl>,
Miguel Ojeda <ojeda@kernel.org>,
Heikki Krogerus <heikki.krogerus@linux.intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Subject: [PATCH v1 3/3] i2c: Unexport i2c_of_match_device()
Date: Tue, 21 Feb 2023 15:33:07 +0200 [thread overview]
Message-ID: <20230221133307.20287-4-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20230221133307.20287-1-andriy.shevchenko@linux.intel.com>
i2c_of_match_device() is not used anymore outside of I²C framework,
unexport it.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/i2c/i2c-core-of.c | 1 -
drivers/i2c/i2c-core.h | 9 +++++++++
include/linux/i2c.h | 11 -----------
3 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/drivers/i2c/i2c-core-of.c b/drivers/i2c/i2c-core-of.c
index bce6b796e04c..29102c882635 100644
--- a/drivers/i2c/i2c-core-of.c
+++ b/drivers/i2c/i2c-core-of.c
@@ -157,7 +157,6 @@ const struct of_device_id
return i2c_of_match_device_sysfs(matches, client);
}
-EXPORT_SYMBOL_GPL(i2c_of_match_device);
#if IS_ENABLED(CONFIG_OF_DYNAMIC)
static int of_i2c_notify(struct notifier_block *nb, unsigned long action,
diff --git a/drivers/i2c/i2c-core.h b/drivers/i2c/i2c-core.h
index 1247e6e6e975..3e22a0645e2f 100644
--- a/drivers/i2c/i2c-core.h
+++ b/drivers/i2c/i2c-core.h
@@ -82,8 +82,17 @@ static inline void i2c_acpi_remove_space_handler(struct i2c_adapter *adapter) {
#ifdef CONFIG_OF
void of_i2c_register_devices(struct i2c_adapter *adap);
+const struct of_device_id *i2c_of_match_device(const struct of_device_id *matches,
+ struct i2c_client *client);
+
#else
static inline void of_i2c_register_devices(struct i2c_adapter *adap) { }
+static inline
+const struct of_device_id *i2c_of_match_device(const struct of_device_id *matches,
+ struct i2c_client *client)
+{
+ return NULL;
+}
#endif
extern struct notifier_block i2c_of_notifier;
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 500404d85141..17b2cbb40a55 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -993,10 +993,6 @@ static inline struct i2c_adapter *of_get_i2c_adapter_by_node(struct device_node
return i2c_get_adapter_by_fwnode(of_fwnode_handle(node));
}
-const struct of_device_id
-*i2c_of_match_device(const struct of_device_id *matches,
- struct i2c_client *client);
-
int of_i2c_get_board_info(struct device *dev, struct device_node *node,
struct i2c_board_info *info);
@@ -1017,13 +1013,6 @@ static inline struct i2c_adapter *of_get_i2c_adapter_by_node(struct device_node
return NULL;
}
-static inline const struct of_device_id
-*i2c_of_match_device(const struct of_device_id *matches,
- struct i2c_client *client)
-{
- return NULL;
-}
-
static inline int of_i2c_get_board_info(struct device *dev,
struct device_node *node,
struct i2c_board_info *info)
--
2.39.1
next prev parent reply other threads:[~2023-02-21 13:32 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-21 13:33 [PATCH v1 0/3] i2c: stop using i2c_of_match_device() Andy Shevchenko
2023-02-21 13:33 ` [PATCH v1 1/3] usb: typec: stusb160x: Make use of device_get_match_data() Andy Shevchenko
2023-02-21 13:53 ` Heikki Krogerus
2023-02-21 13:33 ` [PATCH v1 2/3] auxdisplay: ht16k33: " Andy Shevchenko
2023-02-21 13:40 ` Andy Shevchenko
2023-02-21 16:10 ` Robin van der Gracht
2023-02-21 17:48 ` Andy Shevchenko
2023-02-22 16:46 ` Robin van der Gracht
2023-02-22 17:01 ` Andy Shevchenko
2023-02-22 17:20 ` Andy Shevchenko
2023-02-22 18:46 ` Krzysztof Kozlowski
2023-02-22 19:11 ` Andy Shevchenko
2023-02-23 9:55 ` Geert Uytterhoeven
2023-02-23 11:53 ` Andy Shevchenko
2023-02-23 8:19 ` Robin van der Gracht
2023-02-21 13:33 ` Andy Shevchenko [this message]
2023-02-23 13:50 ` [PATCH v1 0/3] i2c: stop using i2c_of_match_device() 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=20230221133307.20287-4-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=heikki.krogerus@linux.intel.com \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=ojeda@kernel.org \
--cc=rmk+kernel@armlinux.org.uk \
--cc=robin@protonic.nl \
--cc=rrangel@chromium.org \
--cc=wsa@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).