summaryrefslogtreecommitdiff
path: root/drivers/platform
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2018-11-28 14:45:26 +0300
committerAndy Shevchenko <andriy.shevchenko@linux.intel.com>2018-12-03 22:40:02 +0300
commit09e568f783efbd40c60d2118be0a1b0aa6e35177 (patch)
treed039f42ee0771778e4f3966c7281373543b8ef75 /drivers/platform
parent2dea645ffc21f927067e8e35147985887b1a843d (diff)
downloadlinux-09e568f783efbd40c60d2118be0a1b0aa6e35177.tar.xz
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: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Diffstat (limited to 'drivers/platform')
-rw-r--r--drivers/platform/x86/intel_cht_int33fe.c24
1 files changed, 5 insertions, 19 deletions
diff --git a/drivers/platform/x86/intel_cht_int33fe.c b/drivers/platform/x86/intel_cht_int33fe.c
index 367d6e304ade..616b8853a91f 100644
--- a/drivers/platform/x86/intel_cht_int33fe.c
+++ b/drivers/platform/x86/intel_cht_int33fe.c
@@ -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);