Commit 09e568f7 authored by Andy Shevchenko's avatar Andy Shevchenko
Browse files

platform/x86: intel_cht_int33fe: 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 2dea645f

drivers/platform/x86/intel_cht_int33fe.c

+5 −19
Original line number Diff line number Diff line
@@ -169,13 +169,7 @@ static int cht_int33fe_probe(struct platform_device *pdev) 
		board_info.properties = max17047_props;

		data->max17047 = i2c_acpi_new_device(dev, 1, &board_info);

		if (IS_ERR(data->max17047))

			ret = PTR_ERR(data->max17047);

		else if (!data->max17047)

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

		else

			ret = 0;

		if (ret)

			return ret;

			return PTR_ERR(data->max17047);

	}



	data->connections[0].endpoint[0] = "port0";
@@ -200,28 +194,20 @@ static int cht_int33fe_probe(struct platform_device *pdev) 
	board_info.irq = fusb302_irq;



	data->fusb302 = i2c_acpi_new_device(dev, 2, &board_info);

	if (IS_ERR(data->fusb302))

	if (IS_ERR(data->fusb302)) {

		ret = PTR_ERR(data->fusb302);

	else if (!data->fusb302)

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

	else

		ret = 0;

	if (ret)

		goto out_unregister_max17047;

	}



	memset(&board_info, 0, sizeof(board_info));

	board_info.dev_name = "pi3usb30532";

	strlcpy(board_info.type, "pi3usb30532", I2C_NAME_SIZE);



	data->pi3usb30532 = i2c_acpi_new_device(dev, 3, &board_info);

	if (IS_ERR(data->pi3usb30532))

	if (IS_ERR(data->pi3usb30532)) {

		ret = PTR_ERR(data->pi3usb30532);

	else if (!data->pi3usb30532)

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

	else

		ret = 0;

	if (ret)

		goto out_unregister_fusb302;

	}



	platform_set_drvdata(pdev, data);

CRA Git | Maintained and supported by SUSTech CRA and CCSE