ide: remove IDE_CHIPSET_* macros

They just obfuscate the code.

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

diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index a27c0398b1533093245043b41813ecca4708ea7f..8cfce50c71e4ec110c257e0ddf595e1c37465f29 100644 (file)
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -1105,7 +1105,8 @@ static int init_irq (ide_hwif_t *hwif)
                sa = IRQF_SHARED;
 #endif /* __mc68000__ */
 
-               if (IDE_CHIPSET_IS_PCI(hwif->chipset))
+               if (hwif->chipset == ide_pci || hwif->chipset == ide_cmd646 ||
+                   hwif->chipset == ide_ali14xx)
                        sa = IRQF_SHARED;
 
                if (io_ports->ctl_addr)

diff --git a/include/linux/ide.h b/include/linux/ide.h
index 2ad8548135d24e5ffac6581a02c1c56afec978b2..a9206c463d7d920c2c8c52e1d2e1884c8ffa478a 100644 (file)
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -473,10 +473,6 @@ typedef struct ide_drive_s ide_drive_t;
 
 #define to_ide_device(dev)container_of(dev, ide_drive_t, gendev)
 
-#define IDE_CHIPSET_PCI_MASK   \
-    ((1<<ide_pci)|(1<<ide_cmd646)|(1<<ide_ali14xx))
-#define IDE_CHIPSET_IS_PCI(c)  ((IDE_CHIPSET_PCI_MASK >> (c)) & 1)
-
 struct ide_task_s;
 struct ide_port_info;