On 12/18/2014 3:17 AM, Arnd Bergmann wrote:
On Wednesday 17 December 2014 17:16:35 Suravee Suthikulpanit wrote:
+#ifdef CONFIG_ATA_ACPI +#include <linux/acpi.h> +#endif #include "ahci.h"
static const struct ata_port_info ahci_port_info = { @@ -71,6 +74,10 @@ static const struct of_device_id ahci_of_match[] = { }; MODULE_DEVICE_TABLE(of, ahci_of_match);
+#ifdef CONFIG_ATA_ACPI +static const struct acpi_device_cls ahci_cls = {0x01, 0x06, 0x01}; +#endif
- static struct platform_driver ahci_driver = { .probe = ahci_probe, .remove = ata_platform_remove_one,
@@ -78,6 +85,9 @@ static struct platform_driver ahci_driver = { .name = "ahci", .owner = THIS_MODULE, .of_match_table = ahci_of_match, +#ifdef CONFIG_ATA_ACPI
.acpi_cls = &ahci_cls,+#endif .pm = &ahci_pm_ops,
It would be better to leave out the various #ifdef here, in particular the one around the header file inclusion.
Arnd
Right. I'll get rid of them. Also, I noticed that I should have declared acpi_match_device_cls() in include/linux/acpi.h as "inline" for when building w/o ACPI to avoid warning messages.
Thanks,
Suravee