Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad4ba7dc authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

pdc202xx_new: move PIO programming code to pdcnew_set_pio_mode() 



* Move PIO programming code from pdcnew_set_mode() to pdcnew_set_pio_mode().

* Rename pdcnew_set_mode() to pdcnew_set_dma_mode().

There should be no functionality changes caused by this patch.

Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 3071a9d0

drivers/ide/pci/pdc202xx_new.c

+10 −16
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ static struct udma_timing { 
	{ 0x1a, 0x01, 0xcb },	/* UDMA mode 6 */

};



static void pdcnew_set_mode(ide_drive_t *drive, const u8 speed)

static void pdcnew_set_dma_mode(ide_drive_t *drive, const u8 speed)

{

	ide_hwif_t *hwif	= HWIF(drive);

	u8 adj			= (drive->dn & 1) ? 0x08 : 0x00;
@@ -177,7 +177,6 @@ static void pdcnew_set_mode(ide_drive_t *drive, const u8 speed) 
				set_indexed_reg(hwif, 0x12 + adj,

						udma_timings[mode].reg12);

				break;



			case XFER_MW_DMA_2:

			case XFER_MW_DMA_1:

			case XFER_MW_DMA_0:
@@ -186,18 +185,6 @@ static void pdcnew_set_mode(ide_drive_t *drive, const u8 speed) 
				set_indexed_reg(hwif, 0x0f + adj,

						mwdma_timings[mode].reg0f);

				break;

			case XFER_PIO_4:

			case XFER_PIO_3:

			case XFER_PIO_2:

			case XFER_PIO_1:

			case XFER_PIO_0:

				set_indexed_reg(hwif, 0x0c + adj,

						pio_timings[mode].reg0c);

				set_indexed_reg(hwif, 0x0d + adj,

						pio_timings[mode].reg0d);

				set_indexed_reg(hwif, 0x13 + adj,

						pio_timings[mode].reg13);

				break;

			default:

				printk(KERN_ERR "pdc202xx_new: "

				       "Unknown speed %d ignored\n", speed);
@@ -212,7 +199,14 @@ static void pdcnew_set_mode(ide_drive_t *drive, const u8 speed) 


static void pdcnew_set_pio_mode(ide_drive_t *drive, const u8 pio)

{

	pdcnew_set_mode(drive, XFER_PIO_0 + pio);

	ide_hwif_t *hwif = drive->hwif;

	u8 adj = (drive->dn & 1) ? 0x08 : 0x00;



	if (max_dma_rate(hwif->pci_dev) == 4) {

		set_indexed_reg(hwif, 0x0c + adj, pio_timings[pio].reg0c);

		set_indexed_reg(hwif, 0x0d + adj, pio_timings[pio].reg0d);

		set_indexed_reg(hwif, 0x13 + adj, pio_timings[pio].reg13);

	}

}



static u8 pdcnew_cable_detect(ide_hwif_t *hwif)
@@ -466,7 +460,7 @@ static unsigned int __devinit init_chipset_pdcnew(struct pci_dev *dev, const cha 
static void __devinit init_hwif_pdc202new(ide_hwif_t *hwif)

{

	hwif->set_pio_mode = &pdcnew_set_pio_mode;

	hwif->set_dma_mode = &pdcnew_set_mode;

	hwif->set_dma_mode = &pdcnew_set_dma_mode;



	hwif->quirkproc = &pdcnew_quirkproc;

	hwif->resetproc = &pdcnew_reset;