hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

platform/x86: i2c-multi-instantiate: Get rid of obsolete conditional 

Now, when i2c_acpi_new_device() never returns NULL, there is no point to check
for it. Besides that, i2c_acpi_new_device() returns -EPROBE_DEFER directly and
caller doesn't need to guess is better.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Andy Shevchenko 2018-11-28 13:45:27 +02:00
parent 09e568f783
commit 79dd67306f
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/platform/x86/i2c-multi-instantiate.c
View File

@ -72,14 +72,10 @@ static int i2c_multi_inst_probe(struct platform_device *pdev)
board_info.irq = ret; board_info.irq = ret;
} }
multi->clients[i] = i2c_acpi_new_device(dev, i, &board_info); multi->clients[i] = i2c_acpi_new_device(dev, i, &board_info);
if (IS_ERR(multi->clients[i])) if (IS_ERR(multi->clients[i])) {
ret = PTR_ERR(multi->clients[i]); ret = PTR_ERR(multi->clients[i]);
else if (!multi->clients[i]) if (ret != -EPROBE_DEFER)
ret = -EPROBE_DEFER; /* Wait for i2c-adapter to load */ dev_err(dev, "Error creating i2c-client, idx %d\n", i);
else
ret = 0;
if (ret) {
dev_err(dev, "Error creating i2c-client, idx %d\n", i);
goto error; goto error;
} }
} }