Re: linux-next: build failure after merge of the libata tree

Re: linux-next: build failure after merge of the libata tree

[Aaron Lu]

On 08/27/2013 10:50 AM, Stephen Rothwell wrote:
> Hi Tejun,
> 
> After merging the libata tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> In file included from drivers/ata/libata-pmp.c:14:0:
> drivers/ata/libata.h:136:1: error: unknown type name 'acpi_handle'
>  static inline acpi_handle ata_dev_acpi_handle(struct ata_device *dev) { return NULL; }
>  ^
> 
> And several others.
> 
> Caused by commit f1bc1e4c44b1 ("ata: acpi: rework the ata acpi bind
> support").  All the world does not have the ACPI include files
> included via some other path ... nor wants them, I suspect.

Sorry for the trouble, my bad.
Does the below patch fix the problem?

From: Aaron Lu <aaron.lu@intel.com>
Subject: [PATCH] ata: acpi: Remove ata_dev_acpi_handle stub in libata.h

The ata_dev_acpi_handle is defined in libata-acpi.c and the only
external user is libata-zpodd.c, which is built when CONFIG_ATA_ACPI
is set, so there is no need to make an empty stub function for
!CONFIG_ATA_ACPI case in libata.h. It also causes compile errors due to
acpi_handle is not defined when !CONFIG_ACPI. This patch fixes this
problem by removing the empty stub.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Aaron Lu <aaron.lu@intel.com>
---
 drivers/ata/libata.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
index 3e9cc95..eeeb778 100644
--- a/drivers/ata/libata.h
+++ b/drivers/ata/libata.h
@@ -133,7 +133,6 @@ static inline void ata_acpi_set_state(struct ata_port *ap,
 				      pm_message_t state) { }
 static inline void ata_acpi_bind_port(struct ata_port *ap) {}
 static inline void ata_acpi_bind_dev(struct ata_device *dev) {}
-static inline acpi_handle ata_dev_acpi_handle(struct ata_device *dev) { return NULL; }
 static inline void ata_scsi_acpi_bind(struct ata_device *dev) {}
 static inline void ata_scsi_acpi_unbind(struct ata_device *dev) {}
 #endif
-- 
1.8.3.2.10.g43d11f4

Thanks,
Aaron

> 
> I have used the libata tree from next-20130822 for today.
> 
> P.S. drivers/ata/libata.h seems to assume that a lot of other stuff is
> included that it does not include explicitly ...
> 

Re: linux-next: build failure after merge of the libata tree

[Tejun Heo]

On Tue, Aug 27, 2013 at 01:52:09PM +0800, Aaron Lu wrote:
> From: Aaron Lu <aaron.lu@intel.com>
> Subject: [PATCH] ata: acpi: Remove ata_dev_acpi_handle stub in libata.h
> 
> The ata_dev_acpi_handle is defined in libata-acpi.c and the only
> external user is libata-zpodd.c, which is built when CONFIG_ATA_ACPI
> is set, so there is no need to make an empty stub function for
> !CONFIG_ATA_ACPI case in libata.h. It also causes compile errors due to
> acpi_handle is not defined when !CONFIG_ACPI. This patch fixes this
> problem by removing the empty stub.
> 
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Aaron Lu <aaron.lu@intel.com>

Yeap, tested and works.  Applied to libata/for-3.12.  Thanks.

Stephen, sorry about the trouble.

-- 
tejun