system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-23 04:49:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

IDE: Coding Style fixes to drivers/ide/pci/opti621.c

Browse source 
Compile tested.

[bart: some fixes, md5sum checked]

Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Paolo Ciarrocchi 2008-04-26 17:36:41 +02:00 committed by Bartlomiej Zolnierkiewicz
parent 177b8fe9a5
commit 4eb68a256d
1 changed files with 30 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
drivers/ide/pci/opti621.c
View file

@ -218,19 +218,24 @@ static void compute_clocks(int pio, pio_clocks_t *clks)
clks->data_time = cmpt_clk(data_pls, bus_speed); clks->data_time = cmpt_clk(data_pls, bus_speed);
clks->recovery_time = cmpt_clk(ide_pio_timings[pio].cycle_time clks->recovery_time = cmpt_clk(ide_pio_timings[pio].cycle_time
- adr_setup-data_pls, bus_speed); - adr_setup-data_pls, bus_speed);
if (clks->address_time<1) clks->address_time = 1; if (clks->address_time < 1)
if (clks->address_time>4) clks->address_time = 4; clks->address_time = 1;
if (clks->data_time<1) clks->data_time = 1; if (clks->address_time > 4)
if (clks->data_time>16) clks->data_time = 16; clks->address_time = 4;
if (clks->recovery_time<2) clks->recovery_time = 2; if (clks->data_time < 1)
if (clks->recovery_time>17) clks->recovery_time = 17; clks->data_time = 1;
if (clks->data_time > 16)
clks->data_time = 16;
if (clks->recovery_time < 2)
clks->recovery_time = 2;
if (clks->recovery_time > 17)
clks->recovery_time = 17;
} else { } else {
clks->address_time = 1; clks->address_time = 1;
clks->data_time = 1; clks->data_time = 1;
clks->recovery_time = 2; clks->recovery_time = 2;
/* minimal values */ /* minimal values */
} }
} }
static void opti621_set_pio_mode(ide_drive_t *drive, const u8 pio) static void opti621_set_pio_mode(ide_drive_t *drive, const u8 pio)
@ -324,7 +329,7 @@ static void __devinit opti621_port_init_devs(ide_hwif_t *hwif)
/* /*
* init_hwif_opti621() is called once for each hwif found at boot. * init_hwif_opti621() is called once for each hwif found at boot.
*/ */
static void __devinit init_hwif_opti621 (ide_hwif_t *hwif) static void __devinit init_hwif_opti621(ide_hwif_t *hwif)
{ {
hwif->port_init_devs = opti621_port_init_devs; hwif->port_init_devs = opti621_port_init_devs;
hwif->set_pio_mode = &opti621_set_pio_mode; hwif->set_pio_mode = &opti621_set_pio_mode;
@ -334,15 +339,15 @@ static const struct ide_port_info opti621_chipsets[] __devinitdata = {
{ /* 0 */ { /* 0 */
.name = "OPTI621", .name = "OPTI621",
.init_hwif = init_hwif_opti621, .init_hwif = init_hwif_opti621,
.enablebits = {{0x45,0x80,0x00}, {0x40,0x08,0x00}}, .enablebits = { {0x45, 0x80, 0x00}, {0x40, 0x08, 0x00} },
.host_flags = IDE_HFLAG_TRUST_BIOS_FOR_DMA, .host_flags = IDE_HFLAG_TRUST_BIOS_FOR_DMA,
.pio_mask = ATA_PIO3, .pio_mask = ATA_PIO3,
.swdma_mask = ATA_SWDMA2, .swdma_mask = ATA_SWDMA2,
.mwdma_mask = ATA_MWDMA2, .mwdma_mask = ATA_MWDMA2,
},{ /* 1 */ }, { /* 1 */
.name = "OPTI621X", .name = "OPTI621X",
.init_hwif = init_hwif_opti621, .init_hwif = init_hwif_opti621,
.enablebits = {{0x45,0x80,0x00}, {0x40,0x08,0x00}}, .enablebits = { {0x45, 0x80, 0x00}, {0x40, 0x08, 0x00} },
.host_flags = IDE_HFLAG_TRUST_BIOS_FOR_DMA, .host_flags = IDE_HFLAG_TRUST_BIOS_FOR_DMA,
.pio_mask = ATA_PIO3, .pio_mask = ATA_PIO3,
.swdma_mask = ATA_SWDMA2, .swdma_mask = ATA_SWDMA2,