diff options
author | Tejun Heo <htejun@gmail.com> | 2006-05-31 05:27:57 -0400 |
---|---|---|
committer | Tejun Heo <htejun@gmail.com> | 2006-05-31 05:27:57 -0400 |
commit | 135da34573f6d3bab2976a75063f7232a4311a74 (patch) | |
tree | 7650320dc0136bbd4b2df640f9f8300eb87c4abb /drivers/scsi | |
parent | cbe88fbc72d9e1aa4a6f994cb6e19fa08ae5a0ba (diff) |
[PATCH] sata_sil24: rename PORT_PRB to PORT_LRAM and add PORT_LRAM_SLOT_SZ
PORT_PRB is a misnomer as the area also contains other stuff. Rename
it to PORT_LRAM and add PORT_LRAM_SLOT_SZ.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/sata_sil24.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/scsi/sata_sil24.c b/drivers/scsi/sata_sil24.c index 26d7c54c175e..a39e8d0332c6 100644 --- a/drivers/scsi/sata_sil24.c +++ b/drivers/scsi/sata_sil24.c | |||
@@ -98,7 +98,9 @@ enum { | |||
98 | * (8192 bytes @ +0x0000, +0x2000, +0x4000 and +0x6000 @ BAR2) | 98 | * (8192 bytes @ +0x0000, +0x2000, +0x4000 and +0x6000 @ BAR2) |
99 | */ | 99 | */ |
100 | PORT_REGS_SIZE = 0x2000, | 100 | PORT_REGS_SIZE = 0x2000, |
101 | PORT_PRB = 0x0000, /* (32 bytes PRB + 16 bytes SGEs * 6) * 31 (3968 bytes) */ | 101 | |
102 | PORT_LRAM = 0x0000, /* 31 LRAM slots and PM regs */ | ||
103 | PORT_LRAM_SLOT_SZ = 0x0080, /* 32 bytes PRB + 2 SGE, ACT... */ | ||
102 | 104 | ||
103 | PORT_PM = 0x0f80, /* 8 bytes PM * 16 (128 bytes) */ | 105 | PORT_PM = 0x0f80, /* 8 bytes PM * 16 (128 bytes) */ |
104 | /* 32 bit regs */ | 106 | /* 32 bit regs */ |
@@ -1103,7 +1105,7 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
1103 | void __iomem *port = port_base + i * PORT_REGS_SIZE; | 1105 | void __iomem *port = port_base + i * PORT_REGS_SIZE; |
1104 | unsigned long portu = (unsigned long)port; | 1106 | unsigned long portu = (unsigned long)port; |
1105 | 1107 | ||
1106 | probe_ent->port[i].cmd_addr = portu + PORT_PRB; | 1108 | probe_ent->port[i].cmd_addr = portu; |
1107 | probe_ent->port[i].scr_addr = portu + PORT_SCONTROL; | 1109 | probe_ent->port[i].scr_addr = portu + PORT_SCONTROL; |
1108 | 1110 | ||
1109 | ata_std_ports(&probe_ent->port[i]); | 1111 | ata_std_ports(&probe_ent->port[i]); |