From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 45FFBC43603 for ; Mon, 16 Dec 2019 18:19:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1BC7B20717 for ; Mon, 16 Dec 2019 18:19:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576520367; bh=x/c0dywphSDx6W1FtBK+6NpMrfdCQI/RLiuODgV6fn8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=VPzi/rNIBXMe1ecM2Kue5Ltym9ZZOS3xKhO/e/UNFKzU0wgiEqc0mxLjdPDloG88l BFM5kHrrxpgDsM2mSFQ/7Xn3hGuhDdlX0xuwM9TbJ+6toq3Hy0myPrqVeGPNpKkY2e TRc7+eLSJNVnj9I2d0ynvecMI2yry+DdYZACWXx4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731784AbfLPST0 (ORCPT ); Mon, 16 Dec 2019 13:19:26 -0500 Received: from mail.kernel.org ([198.145.29.99]:47420 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731758AbfLPSTW (ORCPT ); Mon, 16 Dec 2019 13:19:22 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 36F8C207FF; Mon, 16 Dec 2019 18:19:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576520361; bh=x/c0dywphSDx6W1FtBK+6NpMrfdCQI/RLiuODgV6fn8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0a3VefTXTCO8Ccia+gGSrmqx9QIItwkvTOK/l386gcxHYfUuElScC1IzRTaqVHEYg LNCcEs8DbMVm/EXUN8FN/xPZ6lpFa0qOs6z8Rrb771F4rN6Rzm287Z+FuJQkrl2K6g mU+IvHlLkEPAEeftAdBH0k6XCrit5bgZketX/hjA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, kbuild test robot , Andy Shevchenko , Mika Westerberg , "Rafael J. Wysocki" Subject: [PATCH 5.4 122/177] ACPI / utils: Move acpi_dev_get_first_match_dev() under CONFIG_ACPI Date: Mon, 16 Dec 2019 18:49:38 +0100 Message-Id: <20191216174843.437264371@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191216174811.158424118@linuxfoundation.org> References: <20191216174811.158424118@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andy Shevchenko commit a814dcc269830c9dbb8a83731cfc6fc5dd787f8d upstream. We have a stub defined for the acpi_dev_get_first_match_dev() in acpi.h for the case when CONFIG_ACPI=n. Moreover, acpi_dev_put(), counterpart function, is already placed under CONFIG_ACPI. Thus, move acpi_dev_get_first_match_dev() under CONFIG_ACPI as well. Fixes: 817b4d64da03 ("ACPI / utils: Introduce acpi_dev_get_first_match_dev() helper") Reported-by: kbuild test robot Signed-off-by: Andy Shevchenko Reviewed-by: Mika Westerberg Cc: 5.2+ # 5.2+ Signed-off-by: Rafael J. Wysocki Signed-off-by: Greg Kroah-Hartman --- include/acpi/acpi_bus.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -78,9 +78,6 @@ acpi_evaluate_dsm_typed(acpi_handle hand bool acpi_dev_found(const char *hid); bool acpi_dev_present(const char *hid, const char *uid, s64 hrv); -struct acpi_device * -acpi_dev_get_first_match_dev(const char *hid, const char *uid, s64 hrv); - #ifdef CONFIG_ACPI #include @@ -683,6 +680,9 @@ static inline bool acpi_device_can_power adev->power.states[ACPI_STATE_D3_HOT].flags.explicit_set); } +struct acpi_device * +acpi_dev_get_first_match_dev(const char *hid, const char *uid, s64 hrv); + static inline void acpi_dev_put(struct acpi_device *adev) { put_device(&adev->dev);