Skip to content

Commit

Permalink
it821x: remove DECLARE_ITE_DEV() macro
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Bartlomiej Zolnierkiewicz committed Jul 24, 2008
1 parent 29f1ca9 commit 04ba6e7
Showing 1 changed file with 7 additions and 12 deletions.
19 changes: 7 additions & 12 deletions drivers/ide/pci/it821x.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};

/**
Expand All @@ -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);

Expand Down

0 comments on commit 04ba6e7

Please sign in to comment.