Merge branch 'devel-stable' into devel

[firefly-linux-kernel-4.4.55.git] / drivers / ide / jmicron.c

diff --git a/drivers/ide/jmicron.c b/drivers/ide/jmicron.c
index bf2be6431b204d0a593b898a58ce4286a0e3f48b..74c2c4a6d909703b6c9cf7a605967f60cfda0149 100644 (file)
--- a/drivers/ide/jmicron.c
+++ b/drivers/ide/jmicron.c
@@ -80,19 +80,19 @@ static u8 jmicron_cable_detect(ide_hwif_t *hwif)
        return ATA_CBL_PATA80;
 }
 
-static void jmicron_set_pio_mode(ide_drive_t *drive, const u8 pio)
+static void jmicron_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)
 {
 }
 
 /**
  *     jmicron_set_dma_mode    -       set host controller for DMA mode
+ *     @hwif: port
  *     @drive: drive
- *     @mode: DMA mode
  *
  *     As the JMicron snoops for timings we don't need to do anything here.
  */
 
-static void jmicron_set_dma_mode(ide_drive_t *drive, const u8 mode)
+static void jmicron_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive)
 {
 }