[PATCH] ide: remove never changing FANCY_STATUS_DUMPS define

From: Alan Cox <alan@redhat.com>

Extracted from 2.6.8.1-ac1 by me.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index 6fe62957cf7cae34f22581fdc80b9e5168c7846e..42e65df1f9cf29963d581c69f235e76ccf3448b0 100644 (file)
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -638,7 +638,6 @@ static u8 idedisk_dump_status (ide_drive_t *drive, const char *msg, u8 stat)
 
        local_irq_set(flags);
        printk("%s: %s: status=0x%02x", drive->name, msg, stat);
-#if FANCY_STATUS_DUMPS
        printk(" { ");
        if (stat & BUSY_STAT)
                printk("Busy ");
@@ -652,12 +651,10 @@ static u8 idedisk_dump_status (ide_drive_t *drive, const char *msg, u8 stat)
                if (stat & ERR_STAT)    printk("Error ");
        }
        printk("}");
-#endif /* FANCY_STATUS_DUMPS */
        printk("\n");
        if ((stat & (BUSY_STAT|ERR_STAT)) == ERR_STAT) {
                err = hwif->INB(IDE_ERROR_REG);
                printk("%s: %s: error=0x%02x", drive->name, msg, err);
-#if FANCY_STATUS_DUMPS
                printk(" { ");
                if (err & ABRT_ERR)     printk("DriveStatusError ");
                if (err & ICRC_ERR)
@@ -700,7 +697,6 @@ static u8 idedisk_dump_status (ide_drive_t *drive, const char *msg, u8 stat)
                                        (unsigned long long)HWGROUP(drive)->rq->sector);
                }
        }
-#endif /* FANCY_STATUS_DUMPS */
        printk("\n");
        {
                struct request *rq;

diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index b7c47d235e91bdecf5fb50538c23c93329e2321d..63d586f26db6120e578b77243c7270534f77d6e9 100644 (file)
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -1096,7 +1096,6 @@ static ide_startstop_t reset_pollfunc (ide_drive_t *drive)
                        drive->failures = 0;
                } else {
                        drive->failures++;
-#if FANCY_STATUS_DUMPS
                        printk("master: ");
                        switch (tmp & 0x7f) {
                                case 1: printk("passed");
@@ -1114,9 +1113,6 @@ static ide_startstop_t reset_pollfunc (ide_drive_t *drive)
                        if (tmp & 0x80)
                                printk("; slave: failed");
                        printk("\n");
-#else
-                       printk("failed\n");
-#endif /* FANCY_STATUS_DUMPS */
                }
        }
        hwgroup->poll_timeout = 0;      /* done polling */

diff --git a/drivers/ide/ide-lib.c b/drivers/ide/ide-lib.c
index 073c3fb82db3524d6ac52a97f521cf1145c7c001..b2fa5eccdcad483f8df2218fbf2bf48269d63bb4 100644 (file)
--- a/drivers/ide/ide-lib.c
+++ b/drivers/ide/ide-lib.c
@@ -465,7 +465,6 @@ byte ide_dump_atapi_status (ide_drive_t *drive, const char *msg, byte stat)
        status.all = stat;
        local_irq_set(flags);
        printk("%s: %s: status=0x%02x", drive->name, msg, stat);
-#if FANCY_STATUS_DUMPS
        printk(" { ");
        if (status.b.bsy)
                printk("Busy ");
@@ -479,19 +478,16 @@ byte ide_dump_atapi_status (ide_drive_t *drive, const char *msg, byte stat)
                if (status.b.check)     printk("Error ");
        }
        printk("}");
-#endif /* FANCY_STATUS_DUMPS */
        printk("\n");
        if ((status.all & (status.b.bsy|status.b.check)) == status.b.check) {
                error.all = HWIF(drive)->INB(IDE_ERROR_REG);
                printk("%s: %s: error=0x%02x", drive->name, msg, error.all);
-#if FANCY_STATUS_DUMPS
                if (error.b.ili)        printk("IllegalLengthIndication ");
                if (error.b.eom)        printk("EndOfMedia ");
                if (error.b.abrt)       printk("Aborted Command ");
                if (error.b.mcr)        printk("MediaChangeRequested ");
                if (error.b.sense_key)  printk("LastFailedSense 0x%02x ",
                                                error.b.sense_key);
-#endif /* FANCY_STATUS_DUMPS */
                printk("\n");
        }
        local_irq_restore(flags);

diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 4ffa3537c573773a520d35e6c5040296d5dab099..190b2e28f54ecdfbca6f36c109572490784759f7 100644 (file)
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -390,7 +390,6 @@ u8 ide_dump_status (ide_drive_t *drive, const char *msg, u8 stat)
 
        local_irq_set(flags);
        printk(KERN_WARNING "%s: %s: status=0x%02x", drive->name, msg, stat);
-#if FANCY_STATUS_DUMPS
        printk(" { ");
        if (stat & BUSY_STAT) {
                printk("Busy ");
@@ -404,12 +403,10 @@ u8 ide_dump_status (ide_drive_t *drive, const char *msg, u8 stat)
                if (stat & ERR_STAT)    printk("Error ");
        }
        printk("}");
-#endif /* FANCY_STATUS_DUMPS */
        printk("\n");
        if ((stat & (BUSY_STAT|ERR_STAT)) == ERR_STAT) {
                err = hwif->INB(IDE_ERROR_REG);
                printk("%s: %s: error=0x%02x", drive->name, msg, err);
-#if FANCY_STATUS_DUMPS
                if (drive->media == ide_disk) {
                        printk(" { ");
                        if (err & ABRT_ERR)     printk("DriveStatusError ");
@@ -453,7 +450,6 @@ u8 ide_dump_status (ide_drive_t *drive, const char *msg, u8 stat)
                                        printk(", sector=%llu", (unsigned long long)HWGROUP(drive)->rq->sector);
                        }
                }
-#endif /* FANCY_STATUS_DUMPS */
                printk("\n");
        }
        {

diff --git a/include/linux/ide.h b/include/linux/ide.h
index 9367900121642aafdae7784295ff40a62aa8cb83..f7884a313f499dbb65eb96d58c5db9339a9ad31a 100644 (file)
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -51,9 +51,6 @@
 #ifndef OK_TO_RESET_CONTROLLER         /* 1 needed for good error recovery */
 #define OK_TO_RESET_CONTROLLER 1       /* 0 for use with AH2372A/B interface */
 #endif
-#ifndef FANCY_STATUS_DUMPS             /* 1 for human-readable drive errors */
-#define FANCY_STATUS_DUMPS     1       /* 0 to reduce kernel size */
-#endif
 
 #ifdef CONFIG_BLK_DEV_CMD640
 #if 0  /* change to 1 when debugging cmd640 problems */