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

Commit 07633b5d authored by Harvey Harrison's avatar Harvey Harrison Committed by Jeff Garzik
Browse files

ata: remove FIT() macro 



Use the kernel-provided clamp_val() macro.

FIT was always applied to a member of struct ata_timing (unsigned short)
and two constants.  clamp_val will not cast to short anymore.

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: Tejun Heo <htejun@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 06aaca3f

drivers/ata/pata_ali.c

+5 −5
Original line number Diff line number Diff line
@@ -177,11 +177,11 @@ static void ali_program_modes(struct ata_port *ap, struct ata_device *adev, stru 
	u8 udma;



	if (t != NULL) {

		t->setup = FIT(t->setup, 1, 8) & 7;

		t->act8b = FIT(t->act8b, 1, 8) & 7;

		t->rec8b = FIT(t->rec8b, 1, 16) & 15;

		t->active = FIT(t->active, 1, 8) & 7;

		t->recover = FIT(t->recover, 1, 16) & 15;

		t->setup = clamp_val(t->setup, 1, 8) & 7;

		t->act8b = clamp_val(t->act8b, 1, 8) & 7;

		t->rec8b = clamp_val(t->rec8b, 1, 16) & 15;

		t->active = clamp_val(t->active, 1, 8) & 7;

		t->recover = clamp_val(t->recover, 1, 16) & 15;



		pci_write_config_byte(pdev, cas, t->setup);

		pci_write_config_byte(pdev, cbt, (t->act8b << 4) | t->rec8b);

drivers/ata/pata_amd.c

+7 −7
Original line number Diff line number Diff line
@@ -84,32 +84,32 @@ static void timing_setup(struct ata_port *ap, struct ata_device *adev, int offse 


	/* Configure the address set up timing */

	pci_read_config_byte(pdev, offset + 0x0C, &t);

	t = (t & ~(3 << ((3 - dn) << 1))) | ((FIT(at.setup, 1, 4) - 1) << ((3 - dn) << 1));

	t = (t & ~(3 << ((3 - dn) << 1))) | ((clamp_val(at.setup, 1, 4) - 1) << ((3 - dn) << 1));

	pci_write_config_byte(pdev, offset + 0x0C , t);



	/* Configure the 8bit I/O timing */

	pci_write_config_byte(pdev, offset + 0x0E + (1 - (dn >> 1)),

		((FIT(at.act8b, 1, 16) - 1) << 4) | (FIT(at.rec8b, 1, 16) - 1));

		((clamp_val(at.act8b, 1, 16) - 1) << 4) | (clamp_val(at.rec8b, 1, 16) - 1));



	/* Drive timing */

	pci_write_config_byte(pdev, offset + 0x08 + (3 - dn),

		((FIT(at.active, 1, 16) - 1) << 4) | (FIT(at.recover, 1, 16) - 1));

		((clamp_val(at.active, 1, 16) - 1) << 4) | (clamp_val(at.recover, 1, 16) - 1));



	switch (clock) {

		case 1:

		t = at.udma ? (0xc0 | (FIT(at.udma, 2, 5) - 2)) : 0x03;

		t = at.udma ? (0xc0 | (clamp_val(at.udma, 2, 5) - 2)) : 0x03;

		break;



		case 2:

		t = at.udma ? (0xc0 | amd_cyc2udma[FIT(at.udma, 2, 10)]) : 0x03;

		t = at.udma ? (0xc0 | amd_cyc2udma[clamp_val(at.udma, 2, 10)]) : 0x03;

		break;



		case 3:

		t = at.udma ? (0xc0 | amd_cyc2udma[FIT(at.udma, 1, 10)]) : 0x03;

		t = at.udma ? (0xc0 | amd_cyc2udma[clamp_val(at.udma, 1, 10)]) : 0x03;

		break;



		case 4:

		t = at.udma ? (0xc0 | amd_cyc2udma[FIT(at.udma, 1, 15)]) : 0x03;

		t = at.udma ? (0xc0 | amd_cyc2udma[clamp_val(at.udma, 1, 15)]) : 0x03;

		break;



		default:

drivers/ata/pata_cypress.c

+4 −4
Original line number Diff line number Diff line
@@ -62,14 +62,14 @@ static void cy82c693_set_piomode(struct ata_port *ap, struct ata_device *adev) 
		return;

	}



	time_16 = FIT(t.recover, 0, 15) | (FIT(t.active, 0, 15) << 4);

	time_8 = FIT(t.act8b, 0, 15) | (FIT(t.rec8b, 0, 15) << 4);

	time_16 = clamp_val(t.recover, 0, 15) | (clamp_val(t.active, 0, 15) << 4);

	time_8 = clamp_val(t.act8b, 0, 15) | (clamp_val(t.rec8b, 0, 15) << 4);



	if (adev->devno == 0) {

		pci_read_config_dword(pdev, CY82_IDE_ADDRSETUP, &addr);



		addr &= ~0x0F;	/* Mask bits */

		addr |= FIT(t.setup, 0, 15);

		addr |= clamp_val(t.setup, 0, 15);



		pci_write_config_dword(pdev, CY82_IDE_ADDRSETUP, addr);

		pci_write_config_byte(pdev, CY82_IDE_MASTER_IOR, time_16);
@@ -79,7 +79,7 @@ static void cy82c693_set_piomode(struct ata_port *ap, struct ata_device *adev) 
		pci_read_config_dword(pdev, CY82_IDE_ADDRSETUP, &addr);



		addr &= ~0xF0;	/* Mask bits */

		addr |= (FIT(t.setup, 0, 15) << 4);

		addr |= (clamp_val(t.setup, 0, 15) << 4);



		pci_write_config_dword(pdev, CY82_IDE_ADDRSETUP, addr);

		pci_write_config_byte(pdev, CY82_IDE_SLAVE_IOR, time_16);

drivers/ata/pata_legacy.c

+25 −25
Original line number Diff line number Diff line
@@ -343,8 +343,8 @@ static void ht6560a_set_piomode(struct ata_port *ap, struct ata_device *adev) 
	/* Get the timing data in cycles. For now play safe at 50Mhz */

	ata_timing_compute(adev, adev->pio_mode, &t, 20000, 1000);



	active = FIT(t.active, 2, 15);

	recover = FIT(t.recover, 4, 15);

	active = clamp_val(t.active, 2, 15);

	recover = clamp_val(t.recover, 4, 15);



	inb(0x3E6);

	inb(0x3E6);
@@ -377,8 +377,8 @@ static void ht6560b_set_piomode(struct ata_port *ap, struct ata_device *adev) 
	/* Get the timing data in cycles. For now play safe at 50Mhz */

	ata_timing_compute(adev, adev->pio_mode, &t, 20000, 1000);



	active = FIT(t.active, 2, 15);

	recover = FIT(t.recover, 2, 16);

	active = clamp_val(t.active, 2, 15);

	recover = clamp_val(t.recover, 2, 16);

	recover &= 0x15;



	inb(0x3E6);
@@ -462,9 +462,9 @@ static void opti82c611a_set_piomode(struct ata_port *ap, 
		ata_timing_merge(&t, &tp, &t, ATA_TIMING_SETUP);

	}



	active = FIT(t.active, 2, 17) - 2;

	recover = FIT(t.recover, 1, 16) - 1;

	setup = FIT(t.setup, 1, 4) - 1;

	active = clamp_val(t.active, 2, 17) - 2;

	recover = clamp_val(t.recover, 1, 16) - 1;

	setup = clamp_val(t.setup, 1, 4) - 1;



	/* Select the right timing bank for write timing */

	rc = ioread8(ap->ioaddr.lbal_addr);
@@ -541,9 +541,9 @@ static void opti82c46x_set_piomode(struct ata_port *ap, struct ata_device *adev) 
		ata_timing_merge(&t, &tp, &t, ATA_TIMING_SETUP);

	}



	active = FIT(t.active, 2, 17) - 2;

	recover = FIT(t.recover, 1, 16) - 1;

	setup = FIT(t.setup, 1, 4) - 1;

	active = clamp_val(t.active, 2, 17) - 2;

	recover = clamp_val(t.recover, 1, 16) - 1;

	setup = clamp_val(t.setup, 1, 4) - 1;



	/* Select the right timing bank for write timing */

	rc = ioread8(ap->ioaddr.lbal_addr);
@@ -624,11 +624,11 @@ static void qdi6500_set_piomode(struct ata_port *ap, struct ata_device *adev) 
	ata_timing_compute(adev, adev->pio_mode, &t, 30303, 1000);



	if (ld_qdi->fast) {

		active = 8 - FIT(t.active, 1, 8);

		recovery = 18 - FIT(t.recover, 3, 18);

		active = 8 - clamp_val(t.active, 1, 8);

		recovery = 18 - clamp_val(t.recover, 3, 18);

	} else {

		active = 9 - FIT(t.active, 2, 9);

		recovery = 15 - FIT(t.recover, 0, 15);

		active = 9 - clamp_val(t.active, 2, 9);

		recovery = 15 - clamp_val(t.recover, 0, 15);

	}

	timing = (recovery << 4) | active | 0x08;
@@ -658,11 +658,11 @@ static void qdi6580dp_set_piomode(struct ata_port *ap, struct ata_device *adev) 
	ata_timing_compute(adev, adev->pio_mode, &t, 30303, 1000);



	if (ld_qdi->fast) {

		active = 8 - FIT(t.active, 1, 8);

		recovery = 18 - FIT(t.recover, 3, 18);

		active = 8 - clamp_val(t.active, 1, 8);

		recovery = 18 - clamp_val(t.recover, 3, 18);

	} else {

		active = 9 - FIT(t.active, 2, 9);

		recovery = 15 - FIT(t.recover, 0, 15);

		active = 9 - clamp_val(t.active, 2, 9);

		recovery = 15 - clamp_val(t.recover, 0, 15);

	}

	timing = (recovery << 4) | active | 0x08;
@@ -695,11 +695,11 @@ static void qdi6580_set_piomode(struct ata_port *ap, struct ata_device *adev) 
	ata_timing_compute(adev, adev->pio_mode, &t, 30303, 1000);



	if (ld_qdi->fast) {

		active = 8 - FIT(t.active, 1, 8);

		recovery = 18 - FIT(t.recover, 3, 18);

		active = 8 - clamp_val(t.active, 1, 8);

		recovery = 18 - clamp_val(t.recover, 3, 18);

	} else {

		active = 9 - FIT(t.active, 2, 9);

		recovery = 15 - FIT(t.recover, 0, 15);

		active = 9 - clamp_val(t.active, 2, 9);

		recovery = 15 - clamp_val(t.recover, 0, 15);

	}

	timing = (recovery << 4) | active | 0x08;

	ld_qdi->clock[adev->devno] = timing;
@@ -830,8 +830,8 @@ static void winbond_set_piomode(struct ata_port *ap, struct ata_device *adev) 
	else

		ata_timing_compute(adev, adev->pio_mode, &t, 30303, 1000);



	active = (FIT(t.active, 3, 17) - 1) & 0x0F;

	recovery = (FIT(t.recover, 1, 15) + 1) & 0x0F;

	active = (clamp_val(t.active, 3, 17) - 1) & 0x0F;

	recovery = (clamp_val(t.recover, 1, 15) + 1) & 0x0F;

	timing = (active << 4) | recovery;

	winbond_writecfg(ld_winbond->timing, timing, reg);
@@ -842,7 +842,7 @@ static void winbond_set_piomode(struct ata_port *ap, struct ata_device *adev) 
		reg |= 0x08;	/* FIFO off */

	if (!ata_pio_need_iordy(adev))

		reg |= 0x02;	/* IORDY off */

	reg |= (FIT(t.setup, 0, 3) << 6);

	reg |= (clamp_val(t.setup, 0, 3) << 6);

	winbond_writecfg(ld_winbond->timing, timing + 1, reg);

}

drivers/ata/pata_ns87410.c

+3 −3
Original line number Diff line number Diff line
@@ -91,9 +91,9 @@ static void ns87410_set_piomode(struct ata_port *ap, struct ata_device *adev) 
		return;

	}



	at.active = FIT(at.active, 2, 16) - 2;

	at.setup = FIT(at.setup, 1, 4) - 1;

	at.recover = FIT(at.recover, 1, 12) - 1;

	at.active = clamp_val(at.active, 2, 16) - 2;

	at.setup = clamp_val(at.setup, 1, 4) - 1;

	at.recover = clamp_val(at.recover, 1, 12) - 1;



	idetcr = (at.setup << 6) | (recoverbits[at.recover] << 3) | activebits[at.active];