ide: add ->read_status method

* Remove ide_read_status() inline helper.

* Add ->read_status method for reading ATA Status register
  and use it instead of ->INB.

While at it:

* Don't use HWGROUP() macro.

There should be no functional changes caused by this patch.

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

1 files changed, 1 insertions, 7 deletions

diff --git a/include/linux/ide.h b/include/linux/ide.h
index d77c1994d0e3..a23ae25d7da8 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -490,6 +490,7 @@ typedef struct hwif_s {
         const struct ide_dma_ops        *dma_ops;
 
         void    (*exec_command)(struct hwif_s *, u8);
+        u8      (*read_status)(struct hwif_s *);
         u8      (*read_sff_dma_status)(struct hwif_s *);
 
         void (*tf_load)(ide_drive_t *, struct ide_task_s *);
@@ -1362,13 +1363,6 @@ static inline void ide_set_irq(ide_drive_t *drive, int on)
                        hwif->io_ports.ctl_addr);
 }
 
-static inline u8 ide_read_status(ide_drive_t *drive)
-{
-        ide_hwif_t *hwif = drive->hwif;
-
-        return hwif->INB(hwif->io_ports.status_addr);
-}
-
 static inline u8 ide_read_altstatus(ide_drive_t *drive)
 {
         ide_hwif_t *hwif = drive->hwif;