summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-10-11 00:39:24 +0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-10-11 00:39:24 +0400
commita2cdee5a9a93360165d0576bbc7e9ccb3127afee (patch)
tree0a8b381c5224a12c837cb9376d256fa00f7e50e8
parent7c199a5496d0579d388636ee34a954e2e566d2fb (diff)
downloadlinux-a2cdee5a9a93360165d0576bbc7e9ccb3127afee.tar.xz
ide: remove IDE_CHIPSET_* macros
They just obfuscate the code. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
-rw-r--r--drivers/ide/ide-probe.c3
-rw-r--r--include/linux/ide.h4
2 files changed, 2 insertions, 5 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index a27c0398b153..8cfce50c71e4 100644
--- 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 2ad8548135d2..a9206c463d7d 100644
--- 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;