ide: remove 'byte' typedef

Just use u8 instead, also s/__u8/u8/ in ide-cd.h while at it.

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

4 files changed, 18 insertions, 18 deletions

diff --git a/drivers/ide/ide-cd.h b/drivers/ide/ide-cd.h
index bf676b262181..d5ae036af00c 100644
--- a/drivers/ide/ide-cd.h
+++ b/drivers/ide/ide-cd.h
@@ -33,33 +33,33 @@
 
 /* Structure of a MSF cdrom address. */
 struct atapi_msf {
-        byte reserved;
-        byte minute;
-        byte second;
-        byte frame;
+        u8 reserved;
+        u8 minute;
+        u8 second;
+        u8 frame;
 };
 
 /* Space to hold the disk TOC. */
 #define MAX_TRACKS 99
 struct atapi_toc_header {
         unsigned short toc_length;
-        byte first_track;
-        byte last_track;
+        u8 first_track;
+        u8 last_track;
 };
 
 struct atapi_toc_entry {
-        byte reserved1;
+        u8 reserved1;
 #if defined(__BIG_ENDIAN_BITFIELD)
-        __u8 adr     : 4;
-        __u8 control : 4;
+        u8 adr     : 4;
+        u8 control : 4;
 #elif defined(__LITTLE_ENDIAN_BITFIELD)
-        __u8 control : 4;
-        __u8 adr     : 4;
+        u8 control : 4;
+        u8 adr     : 4;
 #else
 #error "Please fix <asm/byteorder.h>"
 #endif
-        byte track;
-        byte reserved2;
+        u8 track;
+        u8 reserved2;
         union {
                 unsigned lba;
                 struct atapi_msf msf;
diff --git a/drivers/ide/it821x.c b/drivers/ide/it821x.c
index ef004089761b..a34f3e19b4a4 100644
--- a/drivers/ide/it821x.c
+++ b/drivers/ide/it821x.c
@@ -279,7 +279,7 @@ static void it821x_set_pio_mode(ide_drive_t *drive, const u8 pio)
  *      the shared MWDMA/PIO timing register.
  */
 
-static void it821x_tune_mwdma (ide_drive_t *drive, byte mode_wanted)
+static void it821x_tune_mwdma(ide_drive_t *drive, u8 mode_wanted)
 {
         ide_hwif_t *hwif = drive->hwif;
         struct pci_dev *dev = to_pci_dev(hwif->dev);
@@ -316,7 +316,7 @@ static void it821x_tune_mwdma (ide_drive_t *drive, byte mode_wanted)
  *      controller when doing UDMA modes in pass through.
  */
 
-static void it821x_tune_udma (ide_drive_t *drive, byte mode_wanted)
+static void it821x_tune_udma(ide_drive_t *drive, u8 mode_wanted)
 {
         ide_hwif_t *hwif = drive->hwif;
         struct pci_dev *dev = to_pci_dev(hwif->dev);
diff --git a/drivers/ide/qd65xx.h b/drivers/ide/qd65xx.h
index c83dea85e621..6636f9665d16 100644
--- a/drivers/ide/qd65xx.h
+++ b/drivers/ide/qd65xx.h
@@ -31,8 +31,8 @@
 
 #define QD_CONFIG(hwif)         ((hwif)->config_data & 0x00ff)
 
-#define QD_TIMING(drive)        (byte)(((drive)->drive_data) & 0x00ff)
-#define QD_TIMREG(drive)        (byte)((((drive)->drive_data) & 0xff00) >> 8)
+#define QD_TIMING(drive)        (u8)(((drive)->drive_data) & 0x00ff)
+#define QD_TIMREG(drive)        (u8)((((drive)->drive_data) & 0xff00) >> 8)
 
 #define QD6500_DEF_DATA         ((QD_TIM1_PORT<<8) | (QD_ID3 ? 0x0c : 0x08))
 #define QD6580_DEF_DATA         ((QD_TIM1_PORT<<8) | (QD_ID3 ? 0x0a : 0x00))
diff --git a/drivers/ide/sc1200.c b/drivers/ide/sc1200.c
index 6f68fe984bfb..1cf477aaae36 100644
--- a/drivers/ide/sc1200.c
+++ b/drivers/ide/sc1200.c
@@ -172,7 +172,7 @@ static int sc1200_dma_end(ide_drive_t *drive)
 {
         ide_hwif_t *hwif = drive->hwif;
         unsigned long dma_base = hwif->dma_base;
-        byte dma_stat;
+        u8 dma_stat;
 
         dma_stat = inb(dma_base+2);             /* get DMA status */