aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-07-24 16:53:32 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-07-24 16:53:32 -0400
commit04ba6e739e9c0623c25f94b191fd20dfbd1b26e3 (patch)
treec0483be2a08ac244626b64abe29d38fecb87a455 /drivers/ide
parent29f1ca920cb8d65b979f7edf2fc7d11095461306 (diff)
it821x: remove DECLARE_ITE_DEV() macro
While at it: * it821x_chipsets[] -> it821x_chipset. * Fix it821x_chipset's name field (as it is used for IT8211/8212). Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/pci/it821x.c19
1 files changed, 7 insertions, 12 deletions
diff --git a/drivers/ide/pci/it821x.c b/drivers/ide/pci/it821x.c
index 4ce5db98f89a..a3d8959436c5 100644
--- a/drivers/ide/pci/it821x.c
+++ b/drivers/ide/pci/it821x.c
@@ -628,17 +628,12 @@ static const struct ide_port_ops it821x_port_ops = {
628 .cable_detect = it821x_cable_detect, 628 .cable_detect = it821x_cable_detect,
629}; 629};
630 630
631#define DECLARE_ITE_DEV(name_str) \ 631static const struct ide_port_info it821x_chipset __devinitdata = {
632 { \ 632 .name = "IT821X",
633 .name = name_str, \ 633 .init_chipset = init_chipset_it821x,
634 .init_chipset = init_chipset_it821x, \ 634 .init_hwif = init_hwif_it821x,
635 .init_hwif = init_hwif_it821x, \ 635 .port_ops = &it821x_port_ops,
636 .port_ops = &it821x_port_ops, \ 636 .pio_mask = ATA_PIO4,
637 .pio_mask = ATA_PIO4, \
638 }
639
640static const struct ide_port_info it821x_chipsets[] __devinitdata = {
641 /* 0 */ DECLARE_ITE_DEV("IT8212"),
642}; 637};
643 638
644/** 639/**
@@ -661,7 +656,7 @@ static int __devinit it821x_init_one(struct pci_dev *dev, const struct pci_devic
661 return -ENOMEM; 656 return -ENOMEM;
662 } 657 }
663 658
664 rc = ide_pci_init_one(dev, &it821x_chipsets[id->driver_data], itdevs); 659 rc = ide_pci_init_one(dev, &it821x_chipset, itdevs);
665 if (rc) 660 if (rc)
666 kfree(itdevs); 661 kfree(itdevs);
667 662