aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-07-24 22:53:32 +0200
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-07-24 22:53:32 +0200
commit04ba6e739e9c0623c25f94b191fd20dfbd1b26e3 (patch)
treec0483be2a08ac244626b64abe29d38fecb87a455 /drivers/ide
parent29f1ca920cb8d65b979f7edf2fc7d11095461306 (diff)
downloadkernel_samsung_crespo-04ba6e739e9c0623c25f94b191fd20dfbd1b26e3.zip
kernel_samsung_crespo-04ba6e739e9c0623c25f94b191fd20dfbd1b26e3.tar.gz
kernel_samsung_crespo-04ba6e739e9c0623c25f94b191fd20dfbd1b26e3.tar.bz2
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 4ce5db9..a3d8959 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 = {
.cable_detect = it821x_cable_detect,
};
-#define DECLARE_ITE_DEV(name_str) \
- { \
- .name = name_str, \
- .init_chipset = init_chipset_it821x, \
- .init_hwif = init_hwif_it821x, \
- .port_ops = &it821x_port_ops, \
- .pio_mask = ATA_PIO4, \
- }
-
-static const struct ide_port_info it821x_chipsets[] __devinitdata = {
- /* 0 */ DECLARE_ITE_DEV("IT8212"),
+static const struct ide_port_info it821x_chipset __devinitdata = {
+ .name = "IT821X",
+ .init_chipset = init_chipset_it821x,
+ .init_hwif = init_hwif_it821x,
+ .port_ops = &it821x_port_ops,
+ .pio_mask = ATA_PIO4,
};
/**
@@ -661,7 +656,7 @@ static int __devinit it821x_init_one(struct pci_dev *dev, const struct pci_devic
return -ENOMEM;
}
- rc = ide_pci_init_one(dev, &it821x_chipsets[id->driver_data], itdevs);
+ rc = ide_pci_init_one(dev, &it821x_chipset, itdevs);
if (rc)
kfree(itdevs);