Commit 79dd6730 authored by Andy Shevchenko's avatar Andy Shevchenko
Browse files

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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
parent 09e568f7

drivers/platform/x86/i2c-multi-instantiate.c

+3 −7
Original line number Diff line number Diff line
@@ -72,13 +72,9 @@ static int i2c_multi_inst_probe(struct platform_device *pdev) 
			board_info.irq = ret;

		}

		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]);

		else if (!multi->clients[i])

			ret = -EPROBE_DEFER; /* Wait for i2c-adapter to load */

		else

			ret = 0;

		if (ret) {

			if (ret != -EPROBE_DEFER)

				dev_err(dev, "Error creating i2c-client, idx %d\n", i);

			goto error;

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE