| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Sun, 3 Sep 2023 16:42:57 +0100
From: Biju Das <biju.das.jz@...renesas.com>
To: Laurent Pinchart <laurent.pinchart@...asonboard.com>
Cc: Biju Das <biju.das.jz@...renesas.com>,
Liam Girdwood <lgirdwood@...il.com>,
Mark Brown <broonie@...nel.org>, linux-kernel@...r.kernel.org,
Biju Das <biju.das.au@...il.com>,
Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
Subject: [PATCH v2] regulator: max20086: Make similar OF and ID table
Make similar OF and ID table to extend support for ID match using
i2c_match_data(). Currently it works only for OF match tables as the
driver_data is wrong for ID match.
While at it, drop blank lines before MODULE_DEVICE_TABLE* and remove
trailing comma in the terminator entry for OF/ID table.
Signed-off-by: Biju Das <biju.das.jz@...renesas.com>
---
Note:
This patch is only compile tested.
v1->v2:
* Removed trailing comma in the terminator entry for OF/ID table.
---
drivers/regulator/max20086-regulator.c | 65 ++++++++++++--------------
1 file changed, 31 insertions(+), 34 deletions(-)
diff --git a/drivers/regulator/max20086-regulator.c b/drivers/regulator/max20086-regulator.c
index 32f47b896fd1..59eb23d467ec 100644
--- a/drivers/regulator/max20086-regulator.c
+++ b/drivers/regulator/max20086-regulator.c
@@ -223,7 +223,7 @@ static int max20086_i2c_probe(struct i2c_client *i2c)
return -ENOMEM;
chip->dev = &i2c->dev;
- chip->info = device_get_match_data(chip->dev);
+ chip->info = i2c_get_match_data(i2c);
i2c_set_clientdata(i2c, chip);
@@ -275,45 +275,42 @@ static int max20086_i2c_probe(struct i2c_client *i2c)
return 0;
}
-static const struct i2c_device_id max20086_i2c_id[] = {
- { "max20086" },
- { "max20087" },
- { "max20088" },
- { "max20089" },
- { /* Sentinel */ },
+static const struct max20086_chip_info max20086_chip_info = {
+ .id = MAX20086_DEVICE_ID_MAX20086,
+ .num_outputs = 4,
+};
+
+static const struct max20086_chip_info max20087_chip_info = {
+ .id = MAX20086_DEVICE_ID_MAX20087,
+ .num_outputs = 4,
+};
+
+static const struct max20086_chip_info max20088_chip_info = {
+ .id = MAX20086_DEVICE_ID_MAX20088,
+ .num_outputs = 2,
+};
+
+static const struct max20086_chip_info max20089_chip_info = {
+ .id = MAX20086_DEVICE_ID_MAX20089,
+ .num_outputs = 2,
};
+static const struct i2c_device_id max20086_i2c_id[] = {
+ { "max20086", (kernel_ulong_t)&max20086_chip_info },
+ { "max20087", (kernel_ulong_t)&max20087_chip_info },
+ { "max20088", (kernel_ulong_t)&max20088_chip_info },
+ { "max20089", (kernel_ulong_t)&max20089_chip_info },
+ { /* Sentinel */ }
+};
MODULE_DEVICE_TABLE(i2c, max20086_i2c_id);
static const struct of_device_id max20086_dt_ids[] __maybe_unused = {
- {
- .compatible = "maxim,max20086",
- .data = &(const struct max20086_chip_info) {
- .id = MAX20086_DEVICE_ID_MAX20086,
- .num_outputs = 4,
- }
- }, {
- .compatible = "maxim,max20087",
- .data = &(const struct max20086_chip_info) {
- .id = MAX20086_DEVICE_ID_MAX20087,
- .num_outputs = 4,
- }
- }, {
- .compatible = "maxim,max20088",
- .data = &(const struct max20086_chip_info) {
- .id = MAX20086_DEVICE_ID_MAX20088,
- .num_outputs = 2,
- }
- }, {
- .compatible = "maxim,max20089",
- .data = &(const struct max20086_chip_info) {
- .id = MAX20086_DEVICE_ID_MAX20089,
- .num_outputs = 2,
- }
- },
- { /* Sentinel */ },
+ { .compatible = "maxim,max20086", .data = &max20086_chip_info },
+ { .compatible = "maxim,max20087", .data = &max20087_chip_info },
+ { .compatible = "maxim,max20088", .data = &max20088_chip_info },
+ { .compatible = "maxim,max20089", .data = &max20089_chip_info },
+ { /* Sentinel */ }
};
-
MODULE_DEVICE_TABLE(of, max20086_dt_ids);
static struct i2c_driver max20086_regulator_driver = {
--
2.25.1
Powered by blists - more mailing lists