diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2011-10-13 11:44:22 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2011-10-14 13:25:17 -0400 |
commit | 4780c0b25e3f9d77122fb03ca000d3aa53992677 (patch) | |
tree | 41a56695ef46d1e72958b8b0d75709f4cc3d108e /drivers | |
parent | 11e872a3e1e93ba00e5ec04a74c4d2fe3e14e708 (diff) |
pata_it8213: fix register naming used in it8213_set_piomode()
Rename 'idetm_port' and 'idetm_data' variables to 'master_port'
and 'master_data' respectively to match register naming used in
it8213_set_dmamode() and in ata_piix.c.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/ata/pata_it8213.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/ata/pata_it8213.c b/drivers/ata/pata_it8213.c index 4f0f7795a7a1..cf9164d79f11 100644 --- a/drivers/ata/pata_it8213.c +++ b/drivers/ata/pata_it8213.c | |||
@@ -76,8 +76,8 @@ static void it8213_set_piomode (struct ata_port *ap, struct ata_device *adev) | |||
76 | { | 76 | { |
77 | unsigned int pio = adev->pio_mode - XFER_PIO_0; | 77 | unsigned int pio = adev->pio_mode - XFER_PIO_0; |
78 | struct pci_dev *dev = to_pci_dev(ap->host->dev); | 78 | struct pci_dev *dev = to_pci_dev(ap->host->dev); |
79 | unsigned int idetm_port= ap->port_no ? 0x42 : 0x40; | 79 | unsigned int master_port = ap->port_no ? 0x42 : 0x40; |
80 | u16 idetm_data; | 80 | u16 master_data; |
81 | int control = 0; | 81 | int control = 0; |
82 | 82 | ||
83 | /* | 83 | /* |
@@ -100,19 +100,19 @@ static void it8213_set_piomode (struct ata_port *ap, struct ata_device *adev) | |||
100 | if (adev->class != ATA_DEV_ATA) | 100 | if (adev->class != ATA_DEV_ATA) |
101 | control |= 4; /* PPE */ | 101 | control |= 4; /* PPE */ |
102 | 102 | ||
103 | pci_read_config_word(dev, idetm_port, &idetm_data); | 103 | pci_read_config_word(dev, master_port, &master_data); |
104 | 104 | ||
105 | /* Set PPE, IE, and TIME as appropriate */ | 105 | /* Set PPE, IE, and TIME as appropriate */ |
106 | if (adev->devno == 0) { | 106 | if (adev->devno == 0) { |
107 | idetm_data &= 0xCCF0; | 107 | master_data &= 0xCCF0; |
108 | idetm_data |= control; | 108 | master_data |= control; |
109 | idetm_data |= (timings[pio][0] << 12) | | 109 | master_data |= (timings[pio][0] << 12) | |
110 | (timings[pio][1] << 8); | 110 | (timings[pio][1] << 8); |
111 | } else { | 111 | } else { |
112 | u8 slave_data; | 112 | u8 slave_data; |
113 | 113 | ||
114 | idetm_data &= 0xFF0F; | 114 | master_data &= 0xFF0F; |
115 | idetm_data |= (control << 4); | 115 | master_data |= (control << 4); |
116 | 116 | ||
117 | /* Slave timing in separate register */ | 117 | /* Slave timing in separate register */ |
118 | pci_read_config_byte(dev, 0x44, &slave_data); | 118 | pci_read_config_byte(dev, 0x44, &slave_data); |
@@ -121,8 +121,8 @@ static void it8213_set_piomode (struct ata_port *ap, struct ata_device *adev) | |||
121 | pci_write_config_byte(dev, 0x44, slave_data); | 121 | pci_write_config_byte(dev, 0x44, slave_data); |
122 | } | 122 | } |
123 | 123 | ||
124 | idetm_data |= 0x4000; /* Ensure SITRE is set */ | 124 | master_data |= 0x4000; /* Ensure SITRE is set */ |
125 | pci_write_config_word(dev, idetm_port, idetm_data); | 125 | pci_write_config_word(dev, master_port, master_data); |
126 | } | 126 | } |
127 | 127 | ||
128 | /** | 128 | /** |