Commit eb50c84f authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds

[PATCH] IDE iops clean ups

IDE I/O operations clean ups:
  - Kill warning about void return type not being ignored
  - Fix comment: Q40/Q60 also has a byte-swapped IDE interface
parent e12f1e5c
...@@ -155,7 +155,7 @@ static void ide_outl (u32 val, unsigned long port) ...@@ -155,7 +155,7 @@ static void ide_outl (u32 val, unsigned long port)
static void ide_outsl (unsigned long port, void *addr, u32 count) static void ide_outsl (unsigned long port, void *addr, u32 count)
{ {
return outsl(port, addr, count); outsl(port, addr, count);
} }
void default_hwif_iops (ide_hwif_t *hwif) void default_hwif_iops (ide_hwif_t *hwif)
...@@ -391,7 +391,7 @@ void atapi_input_bytes (ide_drive_t *drive, void *buffer, u32 bytecount) ...@@ -391,7 +391,7 @@ void atapi_input_bytes (ide_drive_t *drive, void *buffer, u32 bytecount)
insw_swapw(IDE_DATA_REG, buffer, bytecount / 2); insw_swapw(IDE_DATA_REG, buffer, bytecount / 2);
return; return;
} }
#endif /* CONFIG_ATARI */ #endif /* CONFIG_ATARI || CONFIG_Q40 */
hwif->ata_input_data(drive, buffer, bytecount / 4); hwif->ata_input_data(drive, buffer, bytecount / 4);
if ((bytecount & 0x03) >= 2) if ((bytecount & 0x03) >= 2)
hwif->INSW(IDE_DATA_REG, ((u8 *)buffer)+(bytecount & ~0x03), 1); hwif->INSW(IDE_DATA_REG, ((u8 *)buffer)+(bytecount & ~0x03), 1);
...@@ -410,7 +410,7 @@ void atapi_output_bytes (ide_drive_t *drive, void *buffer, u32 bytecount) ...@@ -410,7 +410,7 @@ void atapi_output_bytes (ide_drive_t *drive, void *buffer, u32 bytecount)
outsw_swapw(IDE_DATA_REG, buffer, bytecount / 2); outsw_swapw(IDE_DATA_REG, buffer, bytecount / 2);
return; return;
} }
#endif /* CONFIG_ATARI */ #endif /* CONFIG_ATARI || CONFIG_Q40 */
hwif->ata_output_data(drive, buffer, bytecount / 4); hwif->ata_output_data(drive, buffer, bytecount / 4);
if ((bytecount & 0x03) >= 2) if ((bytecount & 0x03) >= 2)
hwif->OUTSW(IDE_DATA_REG, ((u8*)buffer)+(bytecount & ~0x03), 1); hwif->OUTSW(IDE_DATA_REG, ((u8*)buffer)+(bytecount & ~0x03), 1);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment