From patchwork Fri Jun 14 17:54:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suzuki K Poulose X-Patchwork-Id: 166901 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp2353293ilk; Fri, 14 Jun 2019 10:55:49 -0700 (PDT) X-Google-Smtp-Source: APXvYqw1xwRWKwaULyXR2amviihoaIXVbe5JVB+b7LAQ6bmRfidqTm7e44vKpUIk7Tpu50JwNzPJ X-Received: by 2002:a63:cc4e:: with SMTP id q14mr36516742pgi.84.1560534948903; Fri, 14 Jun 2019 10:55:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560534948; cv=none; d=google.com; s=arc-20160816; b=wix992diHY2aDrdAn3I3dJ9SHMPSqXMJ7FdtTp+XUwajCIAXiTB2/fszMGietYCCs3 eWYAXJh01M+0s0LBUAlztFXUaR2SM5uIXHhY+7TOUdxVin5xA/6c9RNjM1V+/MoIE2bs 96usDQHVb9OJpszj3rYwmQK+WI0Kak9+abbpQKp3WE0+YAxHTbXgD6BSqCuzA7bxwRiV d06LfOf5v96iByMTYrqUeaCOi/bKJsEFl7s4CrJnZ5wDefzEYliuvNZX3Od6P3WBvqlk 6HczTwPq2EUHMBYeTDamvFE1QVk9L9xmBqBol8RNLWA1JZOaTwMMSSo371dJ/jOvX379 B0lA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=WQXkzum2t7zXlAlYFaVqaHaPQwSrqAnXUZrLxpCchOo=; b=on2FYEkaKic9I0PAZAM7gmS4XRFPhvSvovIMmeVqckOS4GiUSBIErkiIPm7yTKQ9bE UmGWMfxUouVBUl0gn53lxHVo1sJoh4I6V/pe/D/06zVKtjWs+os11XA1VSueqdPxMBTs tjOFnd5kj8xSGAT1ta0gYAw+8+jJY9KrFrGVO0GNm2poXva7XSQDYSkIQJFOCCaSWFuq tPG8NpOFadrby8/u5NcDHM0v1UXRO7mxyVbcjuC4/2Xw9a6r1djKPdPiE/v9IZ2EGpml hxCwDVuizYcjs9zQQZ0vng/hmFdwwgY1SkKtJUD4EAIqr6ESUZT5iY2TYIjevifk+Uqc cPzg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v204si3133934pgb.80.2019.06.14.10.55.48; Fri, 14 Jun 2019 10:55:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727686AbfFNRz1 (ORCPT + 17 others); Fri, 14 Jun 2019 13:55:27 -0400 Received: from foss.arm.com ([217.140.110.172]:39656 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727655AbfFNRzY (ORCPT ); Fri, 14 Jun 2019 13:55:24 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B8A45D6E; Fri, 14 Jun 2019 10:55:23 -0700 (PDT) Received: from en101.cambridge.arm.com (en101.cambridge.arm.com [10.1.196.93]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 9AF603F718; Fri, 14 Jun 2019 10:55:22 -0700 (PDT) From: Suzuki K Poulose To: linux-kernel@vger.kernel.org Cc: gregkh@linuxfoundation.org, rafael@kernel.org, suzuki.poulose@arm.com, Mika Westerberg , Wolfram Sang , linux-i2c@vger.kernel.org, Mark Brown Subject: [PATCH v2 21/28] drivers: Introduce bus_find_device_by_acpi_dev() helper Date: Fri, 14 Jun 2019 18:54:16 +0100 Message-Id: <1560534863-15115-22-git-send-email-suzuki.poulose@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1560534863-15115-1-git-send-email-suzuki.poulose@arm.com> References: <1560534863-15115-1-git-send-email-suzuki.poulose@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add a wrapper to bus_find_device() to search for a device by the ACPI COMPANION device, reusing the generic match function. Also convert the existing users to make use of the new helper. Cc: Mika Westerberg Cc: Wolfram Sang Cc: linux-i2c@vger.kernel.org Cc: Mark Brown Cc: Greg Kroah-Hartman Cc: "Rafael J. Wysocki" Signed-off-by: Suzuki K Poulose --- drivers/i2c/i2c-core-acpi.c | 8 +------- drivers/spi/spi.c | 8 +------- include/linux/device.h | 22 ++++++++++++++++++++++ 3 files changed, 24 insertions(+), 14 deletions(-) -- 2.7.4 diff --git a/drivers/i2c/i2c-core-acpi.c b/drivers/i2c/i2c-core-acpi.c index 8af35f11..7c6435c 100644 --- a/drivers/i2c/i2c-core-acpi.c +++ b/drivers/i2c/i2c-core-acpi.c @@ -328,11 +328,6 @@ static int i2c_acpi_find_match_adapter(struct device *dev, const void *data) return ACPI_HANDLE(dev) == (acpi_handle)data; } -static int i2c_acpi_find_match_device(struct device *dev, const void *data) -{ - return ACPI_COMPANION(dev) == data; -} - static struct i2c_adapter *i2c_acpi_find_adapter_by_handle(acpi_handle handle) { struct device *dev; @@ -346,8 +341,7 @@ static struct i2c_client *i2c_acpi_find_client_by_adev(struct acpi_device *adev) { struct device *dev; - dev = bus_find_device(&i2c_bus_type, NULL, adev, - i2c_acpi_find_match_device); + dev = bus_find_device_by_acpi_dev(&i2c_bus_type, adev); return dev ? i2c_verify_client(dev) : NULL; } diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index cc4d83e..8737d69 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -3627,11 +3627,6 @@ static int spi_acpi_controller_match(struct device *dev, const void *data) return ACPI_COMPANION(dev->parent) == data; } -static int spi_acpi_device_match(struct device *dev, const void *data) -{ - return ACPI_COMPANION(dev) == data; -} - static struct spi_controller *acpi_spi_find_controller_by_adev(struct acpi_device *adev) { struct device *dev; @@ -3651,8 +3646,7 @@ static struct spi_device *acpi_spi_find_device_by_adev(struct acpi_device *adev) { struct device *dev; - dev = bus_find_device(&spi_bus_type, NULL, adev, spi_acpi_device_match); - + dev = bus_find_device_by_acpi_dev(&spi_bus_type, adev); return dev ? to_spi_device(dev) : NULL; } diff --git a/include/linux/device.h b/include/linux/device.h index 1c137ab..6768e2b 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -235,6 +235,28 @@ bus_find_next_device(struct bus_type *bus,struct device *cur) return bus_find_device(bus, cur, NULL, device_match_any); } +#ifdef CONFIG_ACPI +struct acpi_device; + +/** + * bus_find_device_by_acpi_dev : device iterator for locating a particular device + * matching the ACPI COMPANION device. + * @bus: bus type + * @adev: ACPI COMPANION device to match. + */ +static inline struct device * +bus_find_device_by_acpi_dev(struct bus_type *bus, const struct acpi_device *adev) +{ + return bus_find_device(bus, NULL, adev, device_match_acpi_dev); +} +#else +static inline struct device * +bus_find_device_by_acpi_dev(struct bus_type *bus, const void *adev) +{ + return NULL; +} +#endif + struct device *subsys_find_device_by_id(struct bus_type *bus, unsigned int id, struct device *hint); int bus_for_each_drv(struct bus_type *bus, struct device_driver *start,