From patchwork Thu Apr 4 19:21:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 1919936 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=OKzMYws+; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2604:1380:45d1:ec00::1; helo=ny.mirrors.kernel.org; envelope-from=linux-ide+bounces-1187-incoming=patchwork.ozlabs.org@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org [IPv6:2604:1380:45d1:ec00::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4V9Wh03jXKz1yYP for ; Fri, 5 Apr 2024 06:21:36 +1100 (AEDT) Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 7FF681C2285E for ; Thu, 4 Apr 2024 19:21:34 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B42DF134730; Thu, 4 Apr 2024 19:21:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="OKzMYws+" X-Original-To: linux-ide@vger.kernel.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.13]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9FE74134416; Thu, 4 Apr 2024 19:21:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.13 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712258477; cv=none; b=K18TwGKlqFn6JrrQXbViK2T3W0MEQlfqx+d63yEhVYNHkOOARJygr5GLnI9vjO7zgTmAsEdnqaQXh7L8v8sWjh8Mx2L+1DSArEHwIvRhGZFoufjblvenyOOiWjJwSudIYAHjIshzFahHDX+ldKgHqteYAuvp8f6JtJiu6PElr7I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712258477; c=relaxed/simple; bh=3xUa2jqh2u39W0T4E+6RUSmeJpuQ7opgooePMFTToJI=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=LOMVBAUNMxsExgE0SWO6E/hLxke/T3ISYKd5zHiyxdpTHTgdZyI4Abnr2gJD9xxrCv2AxIyFXTS5fY2zyLAWXPqDMggneSydL6Jc37GRt5Twv2Av7CFGQOZe5z9ILQInuLIPgJUP9efa28/09LqOrhB8xpS7TfmPlSgS0OF53QI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=OKzMYws+; arc=none smtp.client-ip=198.175.65.13 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1712258476; x=1743794476; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=3xUa2jqh2u39W0T4E+6RUSmeJpuQ7opgooePMFTToJI=; b=OKzMYws+VHM+mxn/KRRS+RYeqh1ErX6a834YSAuR6OS6XVxYDMwBoE1K KKzVLKkHAUqHH6/WJKmUYUDH41froqe7CnlI3jGh48xODVa+oG/8vC6aj KS7jjEIlFxMG9potHz5kcDh1ohLFDmapRDhVAHHWoe62BAWxnkJGkxUAM VtYBRfctKNzSvqVv/Rk9J7B43EbXxxV7/gRxgEPhAQRR2YibBsANNzWAc cbB4AsLHp2aEKvDHWJ7oGQOyepVj+SLTUCt5/27uFyLwWtyi60t9oCq/t 2+DapfDLYL9zqWXHo5oVrQjXLQ4txF+W0HW5VxfbZgSl2g4cTQoCTWgVm A==; X-CSE-ConnectionGUID: YDxCdoA0S3WxJ6VcR9OE+Q== X-CSE-MsgGUID: N+cW49vpRRaR5t6trc8Aqw== X-IronPort-AV: E=McAfee;i="6600,9927,11034"; a="18710359" X-IronPort-AV: E=Sophos;i="6.07,180,1708416000"; d="scan'208";a="18710359" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orvoesa105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Apr 2024 12:21:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,11034"; a="937087028" X-IronPort-AV: E=Sophos;i="6.07,179,1708416000"; d="scan'208";a="937087028" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 04 Apr 2024 12:21:13 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 406B63E5; Thu, 4 Apr 2024 22:21:12 +0300 (EEST) From: Andy Shevchenko To: "Martin K. Petersen" , Damien Le Moal , Hannes Reinecke , linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Niklas Cassel , Andy Shevchenko Subject: [PATCH v1 1/1] ata: libata: Move inclusion to where it belongs Date: Thu, 4 Apr 2024 22:21:11 +0300 Message-ID: <20240404192111.3580578-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1.gbec44491f096 Precedence: bulk X-Mailing-List: linux-ide@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Replace rather heavy acpi.h inclusion by a simple forward declaration in the public header. Update the local one to include acpi.h as some of the code requires it. Signed-off-by: Andy Shevchenko --- drivers/ata/libata.h | 3 +++ include/linux/libata.h | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h index 5c685bb1939e..29e9387eb249 100644 --- a/drivers/ata/libata.h +++ b/drivers/ata/libata.h @@ -90,6 +90,9 @@ extern unsigned int ata_read_log_page(struct ata_device *dev, u8 log, #define to_ata_port(d) container_of(d, struct ata_port, tdev) /* libata-acpi.c */ + +#include + #ifdef CONFIG_ATA_ACPI extern unsigned int ata_acpi_gtf_filter; extern void ata_acpi_dissociate(struct ata_host *host); diff --git a/include/linux/libata.h b/include/linux/libata.h index 66937b787cca..68b969de410f 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include @@ -660,6 +659,10 @@ struct ata_cpr_log { struct ata_cpr cpr[] __counted_by(nr_cpr); }; +#ifdef CONFIG_ATA_ACPI +union acpi_object; +#endif + struct ata_device { struct ata_link *link; unsigned int devno; /* 0 or 1 */