In the ahci_ceva_probe() error path instead of returning -EINVAL for all of_property_read_u8_array() failure types return the actual error code. It removes the redundant -EINVAL assignment at multiple places and improves the error handling path. Reported-by: Markus Elfring <Markus.Elfring@xxxxxx> Closes: https://lore.kernel.org/all/9427c0fd-f48a-4104-ac7e-2929be3562af@xxxxxx/ Signed-off-by: Radhey Shyam Pandey <radhey.shyam.pandey@xxxxxxx> --- drivers/ata/ahci_ceva.c | 48 ++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/drivers/ata/ahci_ceva.c b/drivers/ata/ahci_ceva.c index 11a2c199a7c2..b54ee80c068f 100644 --- a/drivers/ata/ahci_ceva.c +++ b/drivers/ata/ahci_ceva.c @@ -274,62 +274,62 @@ static int ceva_ahci_probe(struct platform_device *pdev) cevapriv->flags = CEVA_FLAG_BROKEN_GEN2; /* Read OOB timing value for COMINIT from device-tree */ - if (of_property_read_u8_array(np, "ceva,p0-cominit-params", - (u8 *)&cevapriv->pp2c[0], 4) < 0) { + rc = of_property_read_u8_array(np, "ceva,p0-cominit-params", + (u8 *)&cevapriv->pp2c[0], 4); + if (rc < 0) { dev_warn(dev, "ceva,p0-cominit-params property not defined\n"); - rc = -EINVAL; goto disable_resources; } - if (of_property_read_u8_array(np, "ceva,p1-cominit-params", - (u8 *)&cevapriv->pp2c[1], 4) < 0) { + rc = of_property_read_u8_array(np, "ceva,p1-cominit-params", + (u8 *)&cevapriv->pp2c[1], 4); + if (rc < 0) { dev_warn(dev, "ceva,p1-cominit-params property not defined\n"); - rc = -EINVAL; goto disable_resources; } /* Read OOB timing value for COMWAKE from device-tree*/ - if (of_property_read_u8_array(np, "ceva,p0-comwake-params", - (u8 *)&cevapriv->pp3c[0], 4) < 0) { + rc = of_property_read_u8_array(np, "ceva,p0-comwake-params", + (u8 *)&cevapriv->pp3c[0], 4); + if (rc < 0) { dev_warn(dev, "ceva,p0-comwake-params property not defined\n"); - rc = -EINVAL; goto disable_resources; } - if (of_property_read_u8_array(np, "ceva,p1-comwake-params", - (u8 *)&cevapriv->pp3c[1], 4) < 0) { + rc = of_property_read_u8_array(np, "ceva,p1-comwake-params", + (u8 *)&cevapriv->pp3c[1], 4); + if (rc < 0) { dev_warn(dev, "ceva,p1-comwake-params property not defined\n"); - rc = -EINVAL; goto disable_resources; } /* Read phy BURST timing value from device-tree */ - if (of_property_read_u8_array(np, "ceva,p0-burst-params", - (u8 *)&cevapriv->pp4c[0], 4) < 0) { + rc = of_property_read_u8_array(np, "ceva,p0-burst-params", + (u8 *)&cevapriv->pp4c[0], 4); + if (rc < 0) { dev_warn(dev, "ceva,p0-burst-params property not defined\n"); - rc = -EINVAL; goto disable_resources; } - if (of_property_read_u8_array(np, "ceva,p1-burst-params", - (u8 *)&cevapriv->pp4c[1], 4) < 0) { + rc = of_property_read_u8_array(np, "ceva,p1-burst-params", + (u8 *)&cevapriv->pp4c[1], 4); + if (rc < 0) { dev_warn(dev, "ceva,p1-burst-params property not defined\n"); - rc = -EINVAL; goto disable_resources; } /* Read phy RETRY interval timing value from device-tree */ - if (of_property_read_u16_array(np, "ceva,p0-retry-params", - (u16 *)&cevapriv->pp5c[0], 2) < 0) { + rc = of_property_read_u16_array(np, "ceva,p0-retry-params", + (u16 *)&cevapriv->pp5c[0], 2); + if (rc < 0) { dev_warn(dev, "ceva,p0-retry-params property not defined\n"); - rc = -EINVAL; goto disable_resources; } - if (of_property_read_u16_array(np, "ceva,p1-retry-params", - (u16 *)&cevapriv->pp5c[1], 2) < 0) { + rc = of_property_read_u16_array(np, "ceva,p1-retry-params", + (u16 *)&cevapriv->pp5c[1], 2); + if (rc < 0) { dev_warn(dev, "ceva,p1-retry-params property not defined\n"); - rc = -EINVAL; goto disable_resources; } -- 2.34.1
