Commit f782152b authored by Biju Das's avatar Biju Das Committed by Greg Kroah-Hartman

usb: typec: tcpci_rt1711h: Drop CONFIG_OF ifdeffery

Drop of_match_ptr() from rt1711h_of_match and get rid of ugly CONFIG_OF
ifdeffery. This slightly increases the size of rt1711h_of_match on non-OF
system and shouldn't be an issue.

It also allows, in case if needed, to enumerate this device via ACPI with
PRP0001 magic.
Signed-off-by: default avatarBiju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20230906080619.36930-6-biju.das.jz@bp.renesas.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 15ebb02a
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include <linux/bits.h> #include <linux/bits.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/mod_devicetable.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
...@@ -411,19 +412,17 @@ static const struct i2c_device_id rt1711h_id[] = { ...@@ -411,19 +412,17 @@ static const struct i2c_device_id rt1711h_id[] = {
}; };
MODULE_DEVICE_TABLE(i2c, rt1711h_id); MODULE_DEVICE_TABLE(i2c, rt1711h_id);
#ifdef CONFIG_OF
static const struct of_device_id rt1711h_of_match[] = { static const struct of_device_id rt1711h_of_match[] = {
{ .compatible = "richtek,rt1711h", .data = &rt1711h }, { .compatible = "richtek,rt1711h", .data = &rt1711h },
{ .compatible = "richtek,rt1715", .data = &rt1715 }, { .compatible = "richtek,rt1715", .data = &rt1715 },
{} {}
}; };
MODULE_DEVICE_TABLE(of, rt1711h_of_match); MODULE_DEVICE_TABLE(of, rt1711h_of_match);
#endif
static struct i2c_driver rt1711h_i2c_driver = { static struct i2c_driver rt1711h_i2c_driver = {
.driver = { .driver = {
.name = "rt1711h", .name = "rt1711h",
.of_match_table = of_match_ptr(rt1711h_of_match), .of_match_table = rt1711h_of_match,
}, },
.probe = rt1711h_probe, .probe = rt1711h_probe,
.remove = rt1711h_remove, .remove = rt1711h_remove,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment