diff options
| author | Jeff Garzik <jeff@garzik.org> | 2008-04-29 17:47:34 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2008-04-29 17:47:34 -0400 |
| commit | f7e989301b6c232dec5489e94ee7741c85cb11ba (patch) | |
| tree | c92a575b14714ae2f57edb6b5f5e0df5b409b453 | |
| parent | 22b5e7a74280deae560c20ee1a9b502b35181327 (diff) | |
| download | linux-f7e989301b6c232dec5489e94ee7741c85cb11ba.tar.gz linux-f7e989301b6c232dec5489e94ee7741c85cb11ba.tar.bz2 linux-f7e989301b6c232dec5489e94ee7741c85cb11ba.zip | |
[libata] linux/libata.h: reorganize ata_device struct members a bit
Put the big stuff at the end, to prepare for upcoming changes (and
also hopefully achieve nicer packing of remaining members).
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
| -rw-r--r-- | include/linux/libata.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h index 395a523d8c30..d1dfe872ee30 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -548,11 +548,6 @@ struct ata_device { u64 n_sectors; /* size of device, if ATA */ unsigned int class; /* ATA_DEV_xxx */ - union { - u16 id[ATA_ID_WORDS]; /* IDENTIFY xxx DEVICE data */ - u32 gscr[SATA_PMP_GSCR_DWORDS]; /* PMP GSCR block */ - }; - u8 pio_mode; u8 dma_mode; u8 xfer_mode; @@ -574,8 +569,13 @@ struct ata_device { u16 sectors; /* Number of sectors per track */ /* error history */ - struct ata_ering ering; int spdn_cnt; + struct ata_ering ering; + + union { + u16 id[ATA_ID_WORDS]; /* IDENTIFY xxx DEVICE data */ + u32 gscr[SATA_PMP_GSCR_DWORDS]; /* PMP GSCR block */ + }; }; /* Offset into struct ata_device. Fields above it are maintained |