diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-08-24 03:19:22 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-08-24 03:19:22 -0400 |
commit | cca3974e48607c3775dc73b544a5700b2e37c21a (patch) | |
tree | 0777d6121ba199af0aad196eb5a693510ec8e62e /drivers/ata/sata_uli.c | |
parent | 54a86bfc3d4601be9c36cd4e8a1bdc580c98fa6a (diff) |
libata: Grand renaming.
The biggest change is that ata_host_set is renamed to ata_host.
* ata_host_set => ata_host
* ata_probe_ent->host_flags => ata_probe_ent->port_flags
* ata_probe_ent->host_set_flags => ata_probe_ent->_host_flags
* ata_host_stats => ata_port_stats
* ata_port->host => ata_port->scsi_host
* ata_port->host_set => ata_port->host
* ata_port_info->host_flags => ata_port_info->flags
* ata_(.*)host_set(.*)\(\) => ata_\1host\2()
The leading underscore in ata_probe_ent->_host_flags is to avoid
reusing ->host_flags for different purpose. Currently, the only user
of the field is libata-bmdma.c and probe_ent itself is scheduled to be
removed.
ata_port->host is reused for different purpose but this field is used
inside libata core proper and of different type.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata/sata_uli.c')
-rw-r--r-- | drivers/ata/sata_uli.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ata/sata_uli.c b/drivers/ata/sata_uli.c index 654aae2b25c5..8fc6e800011a 100644 --- a/drivers/ata/sata_uli.c +++ b/drivers/ata/sata_uli.c | |||
@@ -128,7 +128,7 @@ static const struct ata_port_operations uli_ops = { | |||
128 | 128 | ||
129 | static struct ata_port_info uli_port_info = { | 129 | static struct ata_port_info uli_port_info = { |
130 | .sht = &uli_sht, | 130 | .sht = &uli_sht, |
131 | .host_flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY, | 131 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY, |
132 | .pio_mask = 0x1f, /* pio0-4 */ | 132 | .pio_mask = 0x1f, /* pio0-4 */ |
133 | .udma_mask = 0x7f, /* udma0-6 */ | 133 | .udma_mask = 0x7f, /* udma0-6 */ |
134 | .port_ops = &uli_ops, | 134 | .port_ops = &uli_ops, |
@@ -143,13 +143,13 @@ MODULE_VERSION(DRV_VERSION); | |||
143 | 143 | ||
144 | static unsigned int get_scr_cfg_addr(struct ata_port *ap, unsigned int sc_reg) | 144 | static unsigned int get_scr_cfg_addr(struct ata_port *ap, unsigned int sc_reg) |
145 | { | 145 | { |
146 | struct uli_priv *hpriv = ap->host_set->private_data; | 146 | struct uli_priv *hpriv = ap->host->private_data; |
147 | return hpriv->scr_cfg_addr[ap->port_no] + (4 * sc_reg); | 147 | return hpriv->scr_cfg_addr[ap->port_no] + (4 * sc_reg); |
148 | } | 148 | } |
149 | 149 | ||
150 | static u32 uli_scr_cfg_read (struct ata_port *ap, unsigned int sc_reg) | 150 | static u32 uli_scr_cfg_read (struct ata_port *ap, unsigned int sc_reg) |
151 | { | 151 | { |
152 | struct pci_dev *pdev = to_pci_dev(ap->host_set->dev); | 152 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); |
153 | unsigned int cfg_addr = get_scr_cfg_addr(ap, sc_reg); | 153 | unsigned int cfg_addr = get_scr_cfg_addr(ap, sc_reg); |
154 | u32 val; | 154 | u32 val; |
155 | 155 | ||
@@ -159,7 +159,7 @@ static u32 uli_scr_cfg_read (struct ata_port *ap, unsigned int sc_reg) | |||
159 | 159 | ||
160 | static void uli_scr_cfg_write (struct ata_port *ap, unsigned int scr, u32 val) | 160 | static void uli_scr_cfg_write (struct ata_port *ap, unsigned int scr, u32 val) |
161 | { | 161 | { |
162 | struct pci_dev *pdev = to_pci_dev(ap->host_set->dev); | 162 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); |
163 | unsigned int cfg_addr = get_scr_cfg_addr(ap, scr); | 163 | unsigned int cfg_addr = get_scr_cfg_addr(ap, scr); |
164 | 164 | ||
165 | pci_write_config_dword(pdev, cfg_addr, val); | 165 | pci_write_config_dword(pdev, cfg_addr, val); |