Commit 4780c0b2 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Jeff Garzik
Browse files

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: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 11e872a3

drivers/ata/pata_it8213.c

+10 −10
Original line number Diff line number Diff line
@@ -76,8 +76,8 @@ static void it8213_set_piomode (struct ata_port *ap, struct ata_device *adev) 
{

	unsigned int pio	= adev->pio_mode - XFER_PIO_0;

	struct pci_dev *dev	= to_pci_dev(ap->host->dev);

	unsigned int idetm_port= ap->port_no ? 0x42 : 0x40;

	u16 idetm_data;

	unsigned int master_port = ap->port_no ? 0x42 : 0x40;

	u16 master_data;

	int control = 0;



	/*
@@ -100,19 +100,19 @@ static void it8213_set_piomode (struct ata_port *ap, struct ata_device *adev) 
	if (adev->class != ATA_DEV_ATA)

		control |= 4;	/* PPE */



	pci_read_config_word(dev, idetm_port, &idetm_data);

	pci_read_config_word(dev, master_port, &master_data);



	/* Set PPE, IE, and TIME as appropriate */

	if (adev->devno == 0) {

		idetm_data &= 0xCCF0;

		idetm_data |= control;

		idetm_data |= (timings[pio][0] << 12) |

		master_data &= 0xCCF0;

		master_data |= control;

		master_data |= (timings[pio][0] << 12) |

			(timings[pio][1] << 8);

	} else {

		u8 slave_data;



		idetm_data &= 0xFF0F;

		idetm_data |= (control << 4);

		master_data &= 0xFF0F;

		master_data |= (control << 4);



		/* Slave timing in separate register */

		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) 
		pci_write_config_byte(dev, 0x44, slave_data);

	}



	idetm_data |= 0x4000;	/* Ensure SITRE is set */

	pci_write_config_word(dev, idetm_port, idetm_data);

	master_data |= 0x4000;	/* Ensure SITRE is set */

	pci_write_config_word(dev, master_port, master_data);

}



/**

CRA Git | Maintained and supported by SUSTech CRA and CCSE