[PATCH v2] disk/ahci.c: Use defines `GRUB_AHCI_HBA_PORT_CMD_SPIN_UP` and `GRUB_AHCI_HBA_PORT_CMD_POWER_ON`

[Paul Menzel]

Date: Thu, 28 May 2015 19:14:19 +0200

Instead of hard coding `2` and `4` use the macros defined already at the
top of the file. As a consequence, wrap the now too long line.
---
v2: Merge both patches.

 grub-core/disk/ahci.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/grub-core/disk/ahci.c b/grub-core/disk/ahci.c
index 7f75724..fa7aa88 100644
--- a/grub-core/disk/ahci.c
+++ b/grub-core/disk/ahci.c
@@ -552,7 +552,9 @@ grub_ahci_pciinit (grub_pci_device_t dev,
                      adevs[i]->hba->ports[adevs[i]->port].sata_error);
 
        adevs[i]->hba->ports[adevs[i]->port].command
-         = (adevs[i]->hba->ports[adevs[i]->port].command & 0x0fffffff) | (1 << 
28) | 2 | 4;
+         = (adevs[i]->hba->ports[adevs[i]->port].command & 0x0fffffff) | (1 << 
28)
+         | GRUB_AHCI_HBA_PORT_CMD_SPIN_UP
+         | GRUB_AHCI_HBA_PORT_CMD_POWER_ON;
 
        /*  struct grub_disk_ata_pass_through_parms parms2;
            grub_memset (&parms2, 0, sizeof (parms2));
-- 
2.1.4

signature.asc
Description: This is a digitally signed message part