From patchwork Fri Jun 29 08:10:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolaus Voss X-Patchwork-Id: 10496199 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 09E5660230 for ; Fri, 29 Jun 2018 11:16:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F0534298AC for ; Fri, 29 Jun 2018 11:16:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E22F2298BC; Fri, 29 Jun 2018 11:16:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 94BFA298AC for ; Fri, 29 Jun 2018 11:16:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935851AbeF2LPf (ORCPT ); Fri, 29 Jun 2018 07:15:35 -0400 Received: from mail.steuer-voss.de ([85.183.69.95]:51598 "EHLO mail.steuer-voss.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935740AbeF2LPd (ORCPT ); Fri, 29 Jun 2018 07:15:33 -0400 X-Virus-Scanned: Debian amavisd-new at mail.steuer-voss.de Received: by mail.steuer-voss.de (Postfix, from userid 1000) id D4DC941BD8; Fri, 29 Jun 2018 13:05:29 +0200 (CEST) Message-Id: In-Reply-To: References: From: Nikolaus Voss Date: Fri, 29 Jun 2018 10:10:10 +0200 Subject: [PATCH 1/3] IIO: st_accel_i2c.c: Use fallback if DT/ACPI enum failed To: Jonathan Cameron , Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler , Lorenzo Bianconi , Linus Walleij , Xiongfeng Wang Cc: linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Currently, the driver bails out if not explicitly referred to in DT or ACPI tables. This prevents fallback mechanisms from coming into effect, e.g. I2C device ID table match via DT or ACPI PRP0001 HID. However DT/ACPI enum should take precedence over the fallback, so evaluate that first. Signed-off-by: Nikolaus Voss --- drivers/iio/accel/st_accel_i2c.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/drivers/iio/accel/st_accel_i2c.c b/drivers/iio/accel/st_accel_i2c.c index 6bdec8c451e0..e360da407027 100644 --- a/drivers/iio/accel/st_accel_i2c.c +++ b/drivers/iio/accel/st_accel_i2c.c @@ -138,8 +138,7 @@ static const struct i2c_device_id st_accel_id_table[] = { }; MODULE_DEVICE_TABLE(i2c, st_accel_id_table); -static int st_accel_i2c_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int st_accel_i2c_probe(struct i2c_client *client) { struct iio_dev *indio_dev; struct st_sensor_data *adata; @@ -156,14 +155,18 @@ static int st_accel_i2c_probe(struct i2c_client *client, client->name, sizeof(client->name)); } else if (ACPI_HANDLE(&client->dev)) { ret = st_sensors_match_acpi_device(&client->dev); - if ((ret < 0) || (ret >= ST_ACCEL_MAX)) - return -ENODEV; - - strlcpy(client->name, st_accel_id_table[ret].name, + if ((ret >= 0) && (ret < ST_ACCEL_MAX)) + strlcpy(client->name, st_accel_id_table[ret].name, sizeof(client->name)); - } else if (!id) - return -ENODEV; + } + /* + * If OF and ACPI enumeration failed, there could still be platform + * information via fallback enumeration or explicit instantiation, so + * check if id table has been matched via client->name. + */ + if (!client->name) + return -ENODEV; st_sensors_i2c_configure(indio_dev, client, adata); @@ -187,7 +190,7 @@ static struct i2c_driver st_accel_driver = { .of_match_table = of_match_ptr(st_accel_of_match), .acpi_match_table = ACPI_PTR(st_accel_acpi_match), }, - .probe = st_accel_i2c_probe, + .probe_new = st_accel_i2c_probe, .remove = st_accel_i2c_remove, .id_table = st_accel_id_table, };