ide: remove drive->driveid

* Factor out HDIO_[OBSOLETE,GET]_IDENTITY ioctls handling
  to ide_get_identity_ioctl().

* Use temporary buffer in ide_get_identity_ioctl() instead
  of accessing drive->id directly.

* Add ide_id_to_hd_driveid() inline to convert raw id into
  struct hd_driveid format (needed on big-endian).

* Use ide_id_to_hd_driveid() in ide_get_identity_ioctl(),
  cleanup ide_fix_driveid() and switch ide to use use raw id.

* Remove no longer needed drive->driveid.

  This leaves us with 3 users of struct hd_driveid in tree:
  - arch/um/drivers/ubd_kern.c
  - drivers/block/xsysace.c
  - drivers/usb/storage/isd200.c

While at it:

* Use ata_id_u{32,64}() and ata_id_has_{dma,lba,iordy}() macros.

There should be no functional changes caused by this patch.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 11 insertions, 11 deletions

diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index b4f8ca106639..1bb4b2c0e2f4 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -87,20 +87,20 @@ static void ide_disk_init_chs(ide_drive_t *drive)
 
 static void ide_disk_init_mult_count(ide_drive_t *drive)
 {
-        struct hd_driveid *id = drive->driveid;
+        u16 *id = drive->id;
+        u8 max_multsect = id[ATA_ID_MAX_MULTSECT] & 0xff;
 
-        if (id->max_multsect) {
+        if (max_multsect) {
 #ifdef CONFIG_IDEDISK_MULTI_MODE
-                if ((id->max_multsect / 2) > 1) {
-                        id->multsect = id->max_multsect;
-                        id->multsect_valid = 1;
-                } else {
-                        id->multsect = 0;
-                        id->multsect_valid = 0;
-                }
-                drive->mult_req = id->multsect;
+                if ((max_multsect / 2) > 1)
+                        id[ATA_ID_MULTSECT] = max_multsect | 0x100;
+                else
+                        id[ATA_ID_MULTSECT] &= ~0x1ff;
+
+                drive->mult_req = id[ATA_ID_MULTSECT] & 0xff;
 #endif
-                if ((id->multsect_valid & 1) && id->multsect)
+                if ((id[ATA_ID_MULTSECT] & 0x100) &&
+                    (id[ATA_ID_MULTSECT] & 0xff))
                         drive->special.b.set_multmode = 1;
         }
 }