Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+3 -7
+3 -7
drivers/platform/x86/i2c-multi-instantiate.c
··· 72 72 board_info.irq = ret; 73 73 } 74 74 multi->clients[i] = i2c_acpi_new_device(dev, i, &board_info); 75 - if (IS_ERR(multi->clients[i])) 75 + if (IS_ERR(multi->clients[i])) { 76 76 ret = PTR_ERR(multi->clients[i]); 77 - else if (!multi->clients[i]) 78 - ret = -EPROBE_DEFER; /* Wait for i2c-adapter to load */ 79 - else 80 - ret = 0; 81 - if (ret) { 82 - dev_err(dev, "Error creating i2c-client, idx %d\n", i); 77 + if (ret != -EPROBE_DEFER) 78 + dev_err(dev, "Error creating i2c-client, idx %d\n", i); 83 79 goto error; 84 80 } 85 81 }