[ide] remove dead CMD640 debugging from ide-probe.c

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

diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index dd9229190f3f4dd682a0e77386c236caddd3f197..61c72a700014b8d5419d543a10a136bafd4d38f0 100644 (file)
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -389,15 +389,6 @@ static int try_to_identify (ide_drive_t *drive, u8 cmd)
                                 */
                                printk("%s: IRQ probe failed (0x%lx)\n",
                                        drive->name, cookie);
-#ifdef CONFIG_BLK_DEV_CMD640
-#ifdef CMD640_DUMP_REGS
-                               if (hwif->chipset == ide_cmd640) {
-                                       printk("%s: Hmmm.. probably a driver "
-                                               "problem.\n", drive->name);
-                                       CMD640_DUMP_REGS;
-                               }
-#endif /* CMD640_DUMP_REGS */
-#endif /* CONFIG_BLK_DEV_CMD640 */
                        }
                }
        }

diff --git a/drivers/ide/pci/cmd640.c b/drivers/ide/pci/cmd640.c
index 0eac8ee64d2ec7f466873fbf8b1fdfc2fc9e12b6..92a2b7caed582292149d3e30d5665a38a82cbc70 100644 (file)
--- a/drivers/ide/pci/cmd640.c
+++ b/drivers/ide/pci/cmd640.c
@@ -101,6 +101,8 @@
 #undef REALLY_SLOW_IO          /* most systems can safely undef this */
 #define CMD640_PREFETCH_MASKS 1
 
+//#define CMD640_DUMP_REGS
+
 #include <linux/config.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
@@ -748,7 +750,7 @@ int __init ide_probe_for_cmd640x (void)
        put_cmd640_reg(0x5b, 0);
 
 #ifdef CMD640_DUMP_REGS
-       CMD640_DUMP_REGS;
+       cmd640_dump_regs();
 #endif
 
        /*
@@ -870,7 +872,7 @@ int __init ide_probe_for_cmd640x (void)
        }
 
 #ifdef CMD640_DUMP_REGS
-       CMD640_DUMP_REGS;
+       cmd640_dump_regs();
 #endif
        return 1;
 }

diff --git a/include/linux/ide.h b/include/linux/ide.h
index 590f4ed1069e6f2850d429b704725bdfab6ab0fa..f6a39379ada93e77f68f9cd52db9f69445d976fa 100644 (file)
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -52,13 +52,6 @@
 #define OK_TO_RESET_CONTROLLER 1       /* 0 for use with AH2372A/B interface */
 #endif
 
-#ifdef CONFIG_BLK_DEV_CMD640
-#if 0  /* change to 1 when debugging cmd640 problems */
-void cmd640_dump_regs (void);
-#define CMD640_DUMP_REGS cmd640_dump_regs() /* for debugging cmd640 chipset */
-#endif
-#endif  /* CONFIG_BLK_DEV_CMD640 */
-
 #ifndef DISABLE_IRQ_NOSYNC
 #define DISABLE_IRQ_NOSYNC     0
 #endif