|
@@ -882,21 +882,16 @@ static const struct ide_dma_ops scc_dma_ops = {
|
|
.dma_sff_read_status = scc_dma_sff_read_status,
|
|
.dma_sff_read_status = scc_dma_sff_read_status,
|
|
};
|
|
};
|
|
|
|
|
|
-#define DECLARE_SCC_DEV(name_str) \
|
|
|
|
- { \
|
|
|
|
- .name = name_str, \
|
|
|
|
- .init_iops = init_iops_scc, \
|
|
|
|
- .init_dma = scc_init_dma, \
|
|
|
|
- .init_hwif = init_hwif_scc, \
|
|
|
|
- .tp_ops = &scc_tp_ops, \
|
|
|
|
- .port_ops = &scc_port_ops, \
|
|
|
|
- .dma_ops = &scc_dma_ops, \
|
|
|
|
- .host_flags = IDE_HFLAG_SINGLE, \
|
|
|
|
- .pio_mask = ATA_PIO4, \
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
-static const struct ide_port_info scc_chipsets[] __devinitdata = {
|
|
|
|
- /* 0 */ DECLARE_SCC_DEV("sccIDE"),
|
|
|
|
|
|
+static const struct ide_port_info scc_chipset __devinitdata = {
|
|
|
|
+ .name = "sccIDE",
|
|
|
|
+ .init_iops = init_iops_scc,
|
|
|
|
+ .init_dma = scc_init_dma,
|
|
|
|
+ .init_hwif = init_hwif_scc,
|
|
|
|
+ .tp_ops = &scc_tp_ops,
|
|
|
|
+ .port_ops = &scc_port_ops,
|
|
|
|
+ .dma_ops = &scc_dma_ops,
|
|
|
|
+ .host_flags = IDE_HFLAG_SINGLE,
|
|
|
|
+ .pio_mask = ATA_PIO4,
|
|
};
|
|
};
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -910,7 +905,7 @@ static const struct ide_port_info scc_chipsets[] __devinitdata = {
|
|
|
|
|
|
static int __devinit scc_init_one(struct pci_dev *dev, const struct pci_device_id *id)
|
|
static int __devinit scc_init_one(struct pci_dev *dev, const struct pci_device_id *id)
|
|
{
|
|
{
|
|
- return init_setup_scc(dev, &scc_chipsets[id->driver_data]);
|
|
|
|
|
|
+ return init_setup_scc(dev, &scc_chipset);
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|