aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-27 07:46:26 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-27 07:46:26 -0400
commit304ffd6d3a145901ac570b8afb6c9936a83c3392 (patch)
treea2fc2434854dcd017799fea068fea261576ae209 /drivers
parent15a453a955f89f6545118770c669b52e925368bd (diff)
scc_pata: remove DECLARE_SCC_DEV() macro (v2)
v2: scc_chipsets[] -> scc_chipset fix (spotted by Daniel K.). Cc: "Daniel K." <daniel@cluded.net> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ide/scc_pata.c27
1 files changed, 11 insertions, 16 deletions
diff --git a/drivers/ide/scc_pata.c b/drivers/ide/scc_pata.c
index 8d2314b6327c..540bc842f3ad 100644
--- a/drivers/ide/scc_pata.c
+++ b/drivers/ide/scc_pata.c
@@ -882,21 +882,16 @@ static const struct ide_dma_ops scc_dma_ops = {
882 .dma_sff_read_status = scc_dma_sff_read_status, 882 .dma_sff_read_status = scc_dma_sff_read_status,
883}; 883};
884 884
885#define DECLARE_SCC_DEV(name_str) \ 885static const struct ide_port_info scc_chipset __devinitdata = {
886 { \ 886 .name = "sccIDE",
887 .name = name_str, \ 887 .init_iops = init_iops_scc,
888 .init_iops = init_iops_scc, \ 888 .init_dma = scc_init_dma,
889 .init_dma = scc_init_dma, \ 889 .init_hwif = init_hwif_scc,
890 .init_hwif = init_hwif_scc, \ 890 .tp_ops = &scc_tp_ops,
891 .tp_ops = &scc_tp_ops, \ 891 .port_ops = &scc_port_ops,
892 .port_ops = &scc_port_ops, \ 892 .dma_ops = &scc_dma_ops,
893 .dma_ops = &scc_dma_ops, \ 893 .host_flags = IDE_HFLAG_SINGLE,
894 .host_flags = IDE_HFLAG_SINGLE, \ 894 .pio_mask = ATA_PIO4,
895 .pio_mask = ATA_PIO4, \
896 }
897
898static const struct ide_port_info scc_chipsets[] __devinitdata = {
899 /* 0 */ DECLARE_SCC_DEV("sccIDE"),
900}; 895};
901 896
902/** 897/**
@@ -910,7 +905,7 @@ static const struct ide_port_info scc_chipsets[] __devinitdata = {
910 905
911static int __devinit scc_init_one(struct pci_dev *dev, const struct pci_device_id *id) 906static int __devinit scc_init_one(struct pci_dev *dev, const struct pci_device_id *id)
912{ 907{
913 return init_setup_scc(dev, &scc_chipsets[id->driver_data]); 908 return init_setup_scc(dev, &scc_chipset);
914} 909}
915 910
916/** 911/**