From: Stephen Boyd <swboyd@chromium.org>
To: Rob Herring <robh@kernel.org>
Cc: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Arnd Bergmann <arnd@arndb.de>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Richard Leitner <richard.leitner@skidata.com>,
Rob Herring <robh+dt@kernel.org>,
Frank Rowand <frowand.list@gmail.com>,
linux-usb@vger.kernel.org
Subject: [PATCH v2 4/6] usb: usb251xb: Use of_device_get_match_data()
Date: Fri, 22 Jan 2021 19:44:26 -0800 [thread overview]
Message-ID: <20210123034428.2841052-5-swboyd@chromium.org> (raw)
In-Reply-To: <20210123034428.2841052-1-swboyd@chromium.org>
Use the more modern API here instead of using of_match_device() and
avoid casting away const from the returned pointer by pushing the const
type through to the users. This nicely avoids referencing the match
table when it is undefined with configurations where CONFIG_OF=n and
avoids const issues.
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Richard Leitner <richard.leitner@skidata.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Frank Rowand <frowand.list@gmail.com>
Cc: <linux-usb@vger.kernel.org>
---
Please ack so Rob can apply.
drivers/usb/misc/usb251xb.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/drivers/usb/misc/usb251xb.c b/drivers/usb/misc/usb251xb.c
index 29fe5771c21b..507deef1f709 100644
--- a/drivers/usb/misc/usb251xb.c
+++ b/drivers/usb/misc/usb251xb.c
@@ -396,7 +396,7 @@ static void usb251xb_get_ports_field(struct usb251xb *hub,
}
static int usb251xb_get_ofdata(struct usb251xb *hub,
- struct usb251xb_data *data)
+ const struct usb251xb_data *data)
{
struct device *dev = hub->dev;
struct device_node *np = dev->of_node;
@@ -630,7 +630,7 @@ static const struct of_device_id usb251xb_of_match[] = {
MODULE_DEVICE_TABLE(of, usb251xb_of_match);
#else /* CONFIG_OF */
static int usb251xb_get_ofdata(struct usb251xb *hub,
- struct usb251xb_data *data)
+ const struct usb251xb_data *data)
{
return 0;
}
@@ -647,13 +647,11 @@ static int usb251xb_probe(struct usb251xb *hub)
{
struct device *dev = hub->dev;
struct device_node *np = dev->of_node;
- const struct of_device_id *of_id = of_match_device(usb251xb_of_match,
- dev);
+ const struct usb251xb_data *usb_data = of_device_get_match_data(dev);
int err;
- if (np && of_id) {
- err = usb251xb_get_ofdata(hub,
- (struct usb251xb_data *)of_id->data);
+ if (np && usb_data) {
+ err = usb251xb_get_ofdata(hub, usb_data);
if (err) {
dev_err(dev, "failed to get ofdata: %d\n", err);
return err;
--
https://chromeos.dev
next prev parent reply other threads:[~2021-01-23 3:46 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-23 3:44 [PATCH v2 0/6] Stop NULLifying match pointer in of_match_device() Stephen Boyd
2021-01-23 3:44 ` [PATCH v2 1/6] media: renesas-ceu: Use of_device_get_match_data() Stephen Boyd
2021-01-25 8:30 ` Geert Uytterhoeven
2021-01-23 3:44 ` [PATCH v2 2/6] drivers: net: davinci_mdio: " Stephen Boyd
2021-01-26 13:11 ` Grygorii Strashko
2021-01-23 3:44 ` [PATCH v2 3/6] serial: stm32: " Stephen Boyd
2021-01-23 3:44 ` Stephen Boyd [this message]
2021-01-23 3:44 ` [PATCH v2 5/6] hwmon: (lm70) Avoid undefined reference to match table Stephen Boyd
2021-01-23 6:09 ` Guenter Roeck
2021-01-26 18:30 ` Rob Herring
2021-01-23 3:44 ` [PATCH v2 6/6] of/device: Don't NULLify match table in of_match_device() with CONFIG_OF=n Stephen Boyd
2021-01-25 8:33 ` Geert Uytterhoeven
2021-01-25 9:46 ` Arnd Bergmann
2021-01-26 18:21 ` [PATCH v2 0/6] Stop NULLifying match pointer in of_match_device() Rob Herring
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=20210123034428.2841052-5-swboyd@chromium.org \
--to=swboyd@chromium.org \
--cc=arnd@arndb.de \
--cc=devicetree@vger.kernel.org \
--cc=frowand.list@gmail.com \
--cc=geert@linux-m68k.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=richard.leitner@skidata.com \
--cc=robh+dt@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 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).