Skip to content

Commit 465e548

Browse files
andy-shevalexandrebelloni
authored andcommitted
i3c: master: Drop duplicate check before calling OF APIs
OF APIs are usually NULL-aware and returns an error in case when device node is not present or supported. We already have a check for the returned value, no need to check for the parameter. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by: Frank Li <Frank.Li@nxp.com> Link: https://lore.kernel.org/r/20250321193044.457649-1-andriy.shevchenko@linux.intel.com Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
1 parent e8d2d28 commit 465e548

File tree

1 file changed

+6
-12
lines changed

1 file changed

+6
-12
lines changed

drivers/i3c/master.c

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2276,7 +2276,7 @@ static int of_i3c_master_add_dev(struct i3c_master_controller *master,
22762276
u32 reg[3];
22772277
int ret;
22782278

2279-
if (!master || !node)
2279+
if (!master)
22802280
return -EINVAL;
22812281

22822282
ret = of_property_read_u32_array(node, "reg", reg, ARRAY_SIZE(reg));
@@ -2369,14 +2369,10 @@ static u8 i3c_master_i2c_get_lvr(struct i2c_client *client)
23692369
{
23702370
/* Fall back to no spike filters and FM bus mode. */
23712371
u8 lvr = I3C_LVR_I2C_INDEX(2) | I3C_LVR_I2C_FM_MODE;
2372+
u32 reg[3];
23722373

2373-
if (client->dev.of_node) {
2374-
u32 reg[3];
2375-
2376-
if (!of_property_read_u32_array(client->dev.of_node, "reg",
2377-
reg, ARRAY_SIZE(reg)))
2378-
lvr = reg[2];
2379-
}
2374+
if (!of_property_read_u32_array(client->dev.of_node, "reg", reg, ARRAY_SIZE(reg)))
2375+
lvr = reg[2];
23802376

23812377
return lvr;
23822378
}
@@ -2486,7 +2482,7 @@ static int i3c_master_i2c_adapter_init(struct i3c_master_controller *master)
24862482
struct i2c_adapter *adap = i3c_master_to_i2c_adapter(master);
24872483
struct i2c_dev_desc *i2cdev;
24882484
struct i2c_dev_boardinfo *i2cboardinfo;
2489-
int ret, id = -ENODEV;
2485+
int ret, id;
24902486

24912487
adap->dev.parent = master->dev.parent;
24922488
adap->owner = master->dev.parent->driver->owner;
@@ -2497,9 +2493,7 @@ static int i3c_master_i2c_adapter_init(struct i3c_master_controller *master)
24972493
adap->timeout = 1000;
24982494
adap->retries = 3;
24992495

2500-
if (master->dev.of_node)
2501-
id = of_alias_get_id(master->dev.of_node, "i2c");
2502-
2496+
id = of_alias_get_id(master->dev.of_node, "i2c");
25032497
if (id >= 0) {
25042498
adap->nr = id;
25052499
ret = i2c_add_numbered_adapter(adap);

0 commit comments

Comments
 (0)