From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Darren Hart <dvhart@infradead.org>,
platform-driver-x86@vger.kernel.org,
"Rafael J. Wysocki" <rjw@rjwysocki.net>,
linux-acpi@vger.kernel.org, Jonathan Cameron <jic23@kernel.org>,
Wolfram Sang <wsa@the-dreams.de>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
linux-i2c@vger.kernel.org, Hans de Goede <hdegoede@redhat.com>,
Heikki Krogerus <heikki.krogerus@linux.intel.com>,
linux-kernel@vger.kernel.org
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v1 02/15] platform/x86: intel_cht_int33fe: Accept errors of i2c_acpi_new_device()
Date: Tue, 20 Nov 2018 17:59:11 +0200 [thread overview]
Message-ID: <20181120155924.10773-3-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20181120155924.10773-1-andriy.shevchenko@linux.intel.com>
In the future i2c_acpi_new_device() will return error pointer in some cases.
Prepare i2c-multi-instantiate driver to support that.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/platform/x86/intel_cht_int33fe.c | 28 +++++++++++++++++++-----
1 file changed, 23 insertions(+), 5 deletions(-)
diff --git a/drivers/platform/x86/intel_cht_int33fe.c b/drivers/platform/x86/intel_cht_int33fe.c
index 431151d4e611..367d6e304ade 100644
--- a/drivers/platform/x86/intel_cht_int33fe.c
+++ b/drivers/platform/x86/intel_cht_int33fe.c
@@ -168,8 +168,14 @@ static int cht_int33fe_probe(struct platform_device *pdev)
board_info.dev_name = "max17047";
board_info.properties = max17047_props;
data->max17047 = i2c_acpi_new_device(dev, 1, &board_info);
- if (!data->max17047)
- return -EPROBE_DEFER; /* Wait for i2c-adapter to load */
+ 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;
}
data->connections[0].endpoint[0] = "port0";
@@ -194,7 +200,13 @@ 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 (!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));
@@ -202,7 +214,13 @@ static int cht_int33fe_probe(struct platform_device *pdev)
strlcpy(board_info.type, "pi3usb30532", I2C_NAME_SIZE);
data->pi3usb30532 = i2c_acpi_new_device(dev, 3, &board_info);
- if (!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);
@@ -217,7 +235,7 @@ static int cht_int33fe_probe(struct platform_device *pdev)
device_connections_remove(data->connections);
- return -EPROBE_DEFER; /* Wait for the i2c-adapter to load */
+ return ret;
}
static int cht_int33fe_remove(struct platform_device *pdev)
--
2.19.1
next prev parent reply other threads:[~2018-11-20 15:59 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-20 15:59 [PATCH v1 00/15] i2c-multi-instantiate: Adapt for INT3515 and alike Andy Shevchenko
2018-11-20 15:59 ` [PATCH v1 01/15] platform/x86: intel_cht_int33fe: Remove duplicate NULL check Andy Shevchenko
2018-11-20 15:59 ` Andy Shevchenko [this message]
2018-11-20 15:59 ` [PATCH v1 03/15] platform/x86: i2c-multi-instantiate: Accept errors of i2c_acpi_new_device() Andy Shevchenko
2018-11-20 15:59 ` [PATCH v1 04/15] platform/x86: i2c-mutli-instantiate: Defer probe when no adapter found Andy Shevchenko
2018-11-20 15:59 ` [PATCH v1 05/15] i2c: acpi: Return error pointers from i2c_acpi_new_device() Andy Shevchenko
2018-11-20 15:59 ` [PATCH v1 06/15] i2c: acpi: Assign fwnode for devices created via i2c_acpi_new_device() Andy Shevchenko
2018-11-21 11:44 ` Hans de Goede
2018-11-21 13:35 ` Andy Shevchenko
2018-11-21 14:15 ` Heikki Krogerus
2018-11-20 15:59 ` [PATCH v1 07/15] i2c: acpi: Use ACPI_FAILURE instead of !ACPI_SUCCESS Andy Shevchenko
2018-11-20 15:59 ` [PATCH v1 08/15] i2c: acpi: Introduce i2c_acpi_get_i2c_resource() helper Andy Shevchenko
2018-11-20 15:59 ` [PATCH v1 09/15] platform/x86: i2c-multi-instantiate: Count I2cSerialBus() resources Andy Shevchenko
2018-11-21 12:03 ` Hans de Goede
2018-11-26 14:32 ` Andy Shevchenko
2018-11-20 15:59 ` [PATCH v1 10/15] platform/x86: i2c-multi-instantiate: Distinguish IRQ resource type Andy Shevchenko
2018-11-20 15:59 ` [PATCH v1 11/15] platform/x86: i2c-multi-instantiate: Introduce IOAPIC IRQ support Andy Shevchenko
2018-11-20 15:59 ` [PATCH v1 12/15] platform/x86: i2c-multi-instantiate: Allow to have same slaves Andy Shevchenko
2018-11-20 15:59 ` [PATCH v1 13/15] ACPI / scan: Create platform device for INT3515 ACPI nodes Andy Shevchenko
2018-11-20 15:59 ` [PATCH v1 14/15] ACPI / scan: Create platform device for BOSC0200 " Andy Shevchenko
2018-11-21 12:29 ` Hans de Goede
2018-11-20 15:59 ` [PATCH v1 15/15] iio: inv_mpu6050: Use i2c_acpi_get_i2c_resource() helper Andy Shevchenko
2018-11-21 11:27 ` [PATCH v1 00/15] i2c-multi-instantiate: Adapt for INT3515 and alike Hans de Goede
2018-11-21 12:00 ` Hans de Goede
2018-11-26 14:55 ` Andy Shevchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181120155924.10773-3-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=dvhart@infradead.org \
--cc=hdegoede@redhat.com \
--cc=heikki.krogerus@linux.intel.com \
--cc=jic23@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mika.westerberg@linux.intel.com \
--cc=platform-driver-x86@vger.kernel.org \
--cc=rjw@rjwysocki.net \
--cc=wsa@the-dreams.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).