ide: sanitize handling of IDE_HFLAG_NO_SET_MODE host flag

* Check for IDE_HFLAG_NO_SET_MODE host flag in ide_set_pio(),
  ide_set_[pio,dma]_mode(), ide_set_xfer_rate() and set_pio_mode().

* Remove no longer needed IDE_HFLAG_NO_SET_MODE host flag checking
  from ide_tune_dma().

* Remove superfluous ->set_pio_mode checking from do_special().

This is a part of preparations for adding 'struct ide_port_ops'.

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

diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index aaece2c06c9d505be905cdf437095496e13eb0a8..8757e5ef6c95ad977de487c7c0793467cccbc6ab 100644 (file)
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -706,9 +706,6 @@ static int ide_tune_dma(ide_drive_t *drive)
        if (!speed)
                return 0;
 
-       if (hwif->host_flags & IDE_HFLAG_NO_SET_MODE)
-               return 1;
-
        if (ide_set_dma_mode(drive, speed))
                return 0;
 

diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 31e5afadb7e9d9762eadda85721ddbf45e740a51..51d181ee9cf7332a40deaabd4a403955bcf3825c 100644 (file)
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -726,10 +726,6 @@ static ide_startstop_t do_special (ide_drive_t *drive)
                s->b.set_tune = 0;
 
                if (set_pio_mode_abuse(drive->hwif, req_pio)) {
-
-                       if (hwif->set_pio_mode == NULL)
-                               return ide_stopped;
-
                        /*
                         * take ide_lock for drive->[no_]unmask/[no_]io_32bit
                         */

diff --git a/drivers/ide/ide-lib.c b/drivers/ide/ide-lib.c
index fa4c194b5ede14b89cdfa26bb52f8159f52c9933..c859de77aa8fef8e37ce4ae4b05e866a5f7a355d 100644 (file)
--- a/drivers/ide/ide-lib.c
+++ b/drivers/ide/ide-lib.c
@@ -290,7 +290,8 @@ void ide_set_pio(ide_drive_t *drive, u8 req_pio)
        ide_hwif_t *hwif = drive->hwif;
        u8 host_pio, pio;
 
-       if (hwif->set_pio_mode == NULL)
+       if (hwif->set_pio_mode == NULL ||
+           (hwif->host_flags & IDE_HFLAG_NO_SET_MODE))
                return;
 
        BUG_ON(hwif->pio_mask == 0x00);
@@ -343,6 +344,9 @@ int ide_set_pio_mode(ide_drive_t *drive, const u8 mode)
 {
        ide_hwif_t *hwif = drive->hwif;
 
+       if (hwif->host_flags & IDE_HFLAG_NO_SET_MODE)
+               return 0;
+
        if (hwif->set_pio_mode == NULL)
                return -1;
 
@@ -370,6 +374,9 @@ int ide_set_dma_mode(ide_drive_t *drive, const u8 mode)
 {
        ide_hwif_t *hwif = drive->hwif;
 
+       if (hwif->host_flags & IDE_HFLAG_NO_SET_MODE)
+               return 0;
+
        if (hwif->set_dma_mode == NULL)
                return -1;
 
@@ -400,7 +407,8 @@ int ide_set_xfer_rate(ide_drive_t *drive, u8 rate)
 {
        ide_hwif_t *hwif = drive->hwif;
 
-       if (hwif->set_dma_mode == NULL)
+       if (hwif->set_dma_mode == NULL ||
+           (hwif->host_flags & IDE_HFLAG_NO_SET_MODE))
                return -1;
 
        rate = ide_rate_filter(drive, rate);

diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index f04b53cb023f96ef6db0f728d93c906ed5f6cb12..d868ca44d03376168ab08143ecc4adb93f2cfae0 100644 (file)
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -584,11 +584,13 @@ out:
 int set_pio_mode(ide_drive_t *drive, int arg)
 {
        struct request rq;
+       ide_hwif_t *hwif = drive->hwif;
 
        if (arg < 0 || arg > 255)
                return -EINVAL;
 
-       if (drive->hwif->set_pio_mode == NULL)
+       if (hwif->set_pio_mode == NULL ||
+           (hwif->host_flags & IDE_HFLAG_NO_SET_MODE))
                return -ENOSYS;
 
        if (drive->special.b.set_tune)