diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2010-01-18 12:15:18 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2010-03-01 14:58:45 -0500 |
commit | c754d9b6e04371fb398cdd2f5e77be895126be20 (patch) | |
tree | b3378fbeb098d408474a611433613714754e381e /drivers/ata | |
parent | 03a849e6ddb604ff6a220b78637ee8e122ffc796 (diff) |
pata_cmd64x: remove unused definitions
s/ARTIM2/ARTTIM23/ in cmd648_bmdma_stop() while at it
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata')
-rw-r--r-- | drivers/ata/pata_cmd64x.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/ata/pata_cmd64x.c b/drivers/ata/pata_cmd64x.c index 7bc00d5fa600..b40bf0f29975 100644 --- a/drivers/ata/pata_cmd64x.c +++ b/drivers/ata/pata_cmd64x.c | |||
@@ -41,10 +41,6 @@ | |||
41 | enum { | 41 | enum { |
42 | CFR = 0x50, | 42 | CFR = 0x50, |
43 | CFR_INTR_CH0 = 0x04, | 43 | CFR_INTR_CH0 = 0x04, |
44 | CNTRL = 0x51, | ||
45 | CNTRL_DIS_RA0 = 0x40, | ||
46 | CNTRL_DIS_RA1 = 0x80, | ||
47 | CNTRL_ENA_2ND = 0x08, | ||
48 | CMDTIM = 0x52, | 44 | CMDTIM = 0x52, |
49 | ARTTIM0 = 0x53, | 45 | ARTTIM0 = 0x53, |
50 | DRWTIM0 = 0x54, | 46 | DRWTIM0 = 0x54, |
@@ -54,9 +50,6 @@ enum { | |||
54 | ARTTIM23_DIS_RA2 = 0x04, | 50 | ARTTIM23_DIS_RA2 = 0x04, |
55 | ARTTIM23_DIS_RA3 = 0x08, | 51 | ARTTIM23_DIS_RA3 = 0x08, |
56 | ARTTIM23_INTR_CH1 = 0x10, | 52 | ARTTIM23_INTR_CH1 = 0x10, |
57 | ARTTIM2 = 0x57, | ||
58 | ARTTIM3 = 0x57, | ||
59 | DRWTIM23 = 0x58, | ||
60 | DRWTIM2 = 0x58, | 53 | DRWTIM2 = 0x58, |
61 | BRST = 0x59, | 54 | BRST = 0x59, |
62 | DRWTIM3 = 0x5b, | 55 | DRWTIM3 = 0x5b, |
@@ -64,14 +57,11 @@ enum { | |||
64 | MRDMODE = 0x71, | 57 | MRDMODE = 0x71, |
65 | MRDMODE_INTR_CH0 = 0x04, | 58 | MRDMODE_INTR_CH0 = 0x04, |
66 | MRDMODE_INTR_CH1 = 0x08, | 59 | MRDMODE_INTR_CH1 = 0x08, |
67 | MRDMODE_BLK_CH0 = 0x10, | ||
68 | MRDMODE_BLK_CH1 = 0x20, | ||
69 | BMIDESR0 = 0x72, | 60 | BMIDESR0 = 0x72, |
70 | UDIDETCR0 = 0x73, | 61 | UDIDETCR0 = 0x73, |
71 | DTPR0 = 0x74, | 62 | DTPR0 = 0x74, |
72 | BMIDECR1 = 0x78, | 63 | BMIDECR1 = 0x78, |
73 | BMIDECSR = 0x79, | 64 | BMIDECSR = 0x79, |
74 | BMIDESR1 = 0x7A, | ||
75 | UDIDETCR1 = 0x7B, | 65 | UDIDETCR1 = 0x7B, |
76 | DTPR1 = 0x7C | 66 | DTPR1 = 0x7C |
77 | }; | 67 | }; |
@@ -254,7 +244,7 @@ static void cmd648_bmdma_stop(struct ata_queued_cmd *qc) | |||
254 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); | 244 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); |
255 | u8 dma_intr; | 245 | u8 dma_intr; |
256 | int dma_mask = ap->port_no ? ARTTIM23_INTR_CH1 : CFR_INTR_CH0; | 246 | int dma_mask = ap->port_no ? ARTTIM23_INTR_CH1 : CFR_INTR_CH0; |
257 | int dma_reg = ap->port_no ? ARTTIM2 : CFR; | 247 | int dma_reg = ap->port_no ? ARTTIM23 : CFR; |
258 | 248 | ||
259 | ata_bmdma_stop(qc); | 249 | ata_bmdma_stop(qc); |
260 | 250 | ||