hw/ide.c: tidy up ide_utterly_broken checks

Some previous merge seems to have harmlessly duplicated some of these,
and one of the comments needed fixing too.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/hw/ide.c b/hw/ide.c
index 494c7ae6e4a0cceaa0df74579ff3511096e9c0ea..bf97d69179ea0ce4a1df16e866f2b184332f438c 100644 (file)
--- a/hw/ide.c
+++ b/hw/ide.c
@@ -1119,8 +1119,6 @@ static void ide_read_dma_cb(void *opaque, int ret)
 
     if (!s->bs) return; /* ouch! (see ide_flush_cb) */
 
-    if (!s->bs) return; /* yikes */
-
     n = s->io_buffer_size >> 9;
     sector_num = ide_get_sector(s);
     if (n > 0) {
@@ -1247,8 +1245,6 @@ static void ide_write_dma_cb(void *opaque, int ret)
 
     if (!s->bs) return; /* ouch! (see ide_flush_cb) */
 
-    if (!s->bs) return; /* yikes */
-
     n = s->io_buffer_size >> 9;
     sector_num = ide_get_sector(s);
     if (n > 0) {
@@ -1308,7 +1304,7 @@ static void ide_flush_cb(void *opaque, int ret)
 {
     IDEState *s = opaque;
 
-    if (!s->bs) return; /* ouch! (see ide_flush_cb) */
+    if (!s->bs) return; /* ouch! (see below) */
 
     if (ret) {
         /* We are completely doomed.  The IDE spec does not permit us
@@ -1556,8 +1552,6 @@ static void ide_atapi_cmd_read_dma_cb(void *opaque, int ret)
 
     if (!s->bs) return; /* ouch! (see ide_flush_cb) */
 
-    if (!s->bs) return; /* yikes */
-
     if (ret < 0) {
         ide_atapi_io_error(s, ret);
         goto eot;
@@ -2224,8 +2218,6 @@ static void cdrom_change_cb(void *opaque)
 
     if (!s->bs) return; /* ouch! (see ide_flush_cb) */
 
-    if (!s->bs) return; /* yikes */
-
     /* XXX: send interrupt too */
     bdrv_get_geometry(s->bs, &nb_sectors);
     s->nb_sectors = nb_sectors;