From patchwork Fri Jun 29 08:19:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolaus Voss X-Patchwork-Id: 10496367 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 C66706022E for ; Fri, 29 Jun 2018 11:25:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B7CC8298C4 for ; Fri, 29 Jun 2018 11:25:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AB607298C9; Fri, 29 Jun 2018 11:25:51 +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=ham 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 5325C298C4 for ; Fri, 29 Jun 2018 11:25:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935810AbeF2LPe (ORCPT ); Fri, 29 Jun 2018 07:15:34 -0400 Received: from mail.steuer-voss.de ([85.183.69.95]:51594 "EHLO mail.steuer-voss.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935467AbeF2LPd (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 DEA9141BDB; Fri, 29 Jun 2018 13:05:34 +0200 (CEST) Message-Id: In-Reply-To: References: From: Nikolaus Voss Date: Fri, 29 Jun 2018 10:19:58 +0200 Subject: [PATCH 2/3] IIO: st_sensors_i2c.c: Don't print error on failed ACPI match 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 If there is a ACPI node for a i2c device but HID/CID doesn't match, there could still be a ACPI_DT_NAMESPACE_HID / PRP0001 HID entry which is matched against the i2c device ID table, so don't print an error message. Signed-off-by: Nikolaus Voss --- drivers/iio/common/st_sensors/st_sensors_i2c.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/iio/common/st_sensors/st_sensors_i2c.c b/drivers/iio/common/st_sensors/st_sensors_i2c.c index b81e48e9f27e..0c1a77f9b08c 100644 --- a/drivers/iio/common/st_sensors/st_sensors_i2c.c +++ b/drivers/iio/common/st_sensors/st_sensors_i2c.c @@ -87,10 +87,9 @@ int st_sensors_match_acpi_device(struct device *dev) if (ACPI_HANDLE(dev)) { acpi_id = acpi_match_device(dev->driver->acpi_match_table, dev); - if (!acpi_id) { - dev_err(dev, "No driver data\n"); + if (!acpi_id) return -EINVAL; - } + driver_data = acpi_id->driver_data; } return driver_data;